Merge branch 'main' into 1928-develop-new-page-templates-in-code-to-sit-behind-the-log-in

app/templates/views/dashboard/dashboard.html

@@ -46,7 +46,7 @@
       <div id="activityChart">
         <div class="chart-header">
           <div class="chart-subtitle">{{ current_service.name }} - last 7 days</div>
-          <div class="chart-legend" aria-label="Legend"></div>
+          <div class="chart-legend" role="region" aria-label="Legend"></div>
         </div>
         <div class="chart-container" id="weeklyChart"></div>
         <table id="weeklyTable" class="usa-sr-only usa-table"></table>

app/templates/views/templates/template.html

@@ -63,24 +63,29 @@
           href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">See previous
           versions</a>
         </li>
+      </ul>
         {% endif %}
         {% if current_user.has_permissions('manage_templates') and user_has_template_permission %}
         {% if not template._template.archived %}
+        <ul class="usa-list usa-list--unstyled">
         <li>
           <a class="usa-link margin-right-3"
           href="{{ url_for('.delete_service_template', service_id=current_service.id, template_id=template.id) }}">Delete this
           template</a>
         </li>
+        </ul>
         {% endif %}
         {% if not template._template.redact_personalisation %}
+        <ul class="usa-list usa-list--unstyled">
         <li>
           <a class="usa-link" href="{{ url_for('.confirm_redact_template', service_id=current_service.id, template_id=template.id) }}">Hide all personalized and conditional content after sending</a> for increased privacy protection
         </li>
+        </ul>
         {% else %}
         <p class="hint">Personalization is hidden after sending</p>
       {% endif %}
     {% endif %}
-    </ul>
+
   </div>
 
   <!--<div class="">