Merge pull request #1131 from alphagov/2122-fix-snagging-points

2122: Fixed snagging points

Author: richardbored

accessibility_monitoring_platform/apps/audits/templates/audits/forms/page_checks.html

@@ -49,7 +49,7 @@
             data-filter-string="{{ form.initial.wcag_definition }} {{ form.initial.wcag_definition.hint }} {{ form.initial.issue_identifier }}"
         >
             <div class="govuk-grid-column-full">
-                <hr class="amp-width-100 amp-margin-bottom-30">
+                <hr class="amp-width-100 amp-margin-bottom-40">
                 {% include 'common/form_hidden_fields.html' with hidden_fields=form.hidden_fields %}
                 {% include 'audits/helpers/amp_wcag_state_field.html' with field=form.check_result_state %}
                 {% include 'audits/helpers/check_result_matching_initial_errors.html' %}
@@ -62,7 +62,7 @@ <h2 class="govuk-heading-s amp-margin-bottom-5">Content guidance</h2>
                 </div>
                 {% include 'common/preview_markdown.html' with field_id=form.notes.auto_id %}
                 {% include 'audits/helpers/check_result_initial_notes_history.html' with check_result=form.initial.check_result %}
-                <div class="govuk-grid-row amp-margin-bottom-20 amp-margin-top-20">
+                <div class="govuk-grid-row amp-margin-bottom-0 amp-margin-top-20">
                     <div class="govuk-grid-column-full govuk-button-group">
                         ▼ &nbsp; <a href="#save-and-continue-buttons" class="govuk-link govuk-link--no-visited-state">Go to save and continue</a>
                         ▲ &nbsp; {% include 'common/back_to_top.html' %}

accessibility_monitoring_platform/apps/audits/templates/audits/helpers/test_summary.html

@@ -8,22 +8,37 @@
     <div class="govuk-grid-row">
         <br/>
         <div class="govuk-grid-column-full">
-            <h2 class="govuk-heading-s">WCAG issues summary</h2>
-            <ul class="govuk-list govuk-list--bullet">
-                <li>Initial WCAG compliance decision: <b>{{ case.compliance.get_website_compliance_state_initial_display }}</b></li>
-                <li>Initial issues: {{ case.audit.failed_check_results.count }}</li>
-                <li>12-week WCAG compliance decision: <b>{{ case.compliance.get_website_compliance_state_12_week_display }}</b></li>
-                <li>
-                    Issues remaining at 12-weeks: {{ case.audit.unfixed_check_results.count }} issues
-                    {% if case.audit %}
-                        ({{ case.audit.percentage_wcag_issues_fixed }}% fixed)
-                    {% endif %}
-                </li>
-                <li>
-                    Pages removed at 12-weeks: {{ case.audit.missing_at_retest_pages.count }}
-                    ({{ case.audit.missing_at_retest_check_results.count }} issues)
-                </li>
-            </ul>
+
+            <table class="govuk-body">
+                <tr>
+                    <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Initial WCAG compliance decision</b></td>
+                    <td class="amp-padding-bottom-10">{{ case.compliance.get_website_compliance_state_initial_display }}</td>
+                </tr>
+                <tr>
+                    <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Initial issues</b></td>
+                    <td class="amp-padding-bottom-10">{{ case.audit.failed_check_results.count }}</td>
+                </tr>
+                <tr>
+                    <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>12-week WCAG compliance decision</b></td>
+                    <td class="amp-padding-bottom-10">{{ case.compliance.get_website_compliance_state_12_week_display }}</td>
+                </tr>
+                <tr>
+                    <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Issues remaining at 12-weeks</b></td>
+                    <td class="amp-padding-bottom-10"> 
+                        {{ case.audit.unfixed_check_results.count }} issues                
+                        {% if case.audit %}
+                            ({{ case.audit.percentage_wcag_issues_fixed }}% fixed)
+                        {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                    <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Pages removed at 12-weeks</b></td>
+                    <td class="amp-padding-bottom-10">                    
+                        {{ case.audit.missing_at_retest_pages.count }}
+                        ({{ case.audit.missing_at_retest_check_results.count }} issues)
+                    </td>
+                </tr>
+            </table>    
             <br/>
         </div>
     </div>
@@ -66,30 +81,56 @@ <h2 id="wcag-toc" class="govuk-heading-s">WCAG test contents</h2>
 {% if show_statement_summary %}
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-full">
-            <h2 class="govuk-heading-s">Statement issues summary</h2>
-            <ul class="govuk-list govuk-list--bullet">
+            <table class="govuk-body">
                 {% if case.compliance.statement_compliance_state_12_week == 'unknown' %}
-                    <li>Initial statement compliance: <b>{{ case.compliance.get_statement_compliance_state_initial_display }}</b></li>
+                    <tr>
+                        <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Initial statement compliance</b></td>
+                        <td class="amp-padding-bottom-10">{{ case.compliance.get_statement_compliance_state_initial_display }}</td>
+                    </tr>
                 {% endif %}
                 {% if case.audit.twelve_week_disproportionate_burden_claim == 'not-checked' %}
-                    <li>Initial disproportionate burden: <b>{{ case.audit.get_initial_disproportionate_burden_claim_display }}</b></li>
+                    <tr>
+                        <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Initial disproportionate burden</b></td>
+                        <td class="amp-padding-bottom-10">{{ case.audit.get_initial_disproportionate_burden_claim_display }}</td>
+                    </tr>
                 {% endif %}
                 {% if case.compliance.statement_compliance_state_12_week != 'unknown' %}
-                    <li>12-week statement compliance: <b>{{ case.compliance.get_statement_compliance_state_12_week_display }}</b></li>
+                    <tr>
+                        <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>12-week statement compliance</b></td>
+                        <td class="amp-padding-bottom-10">{{ case.compliance.get_statement_compliance_state_12_week_display }}</td>
+                    </tr>
                 {% endif %}
                 {% if case.audit.twelve_week_disproportionate_burden_claim != 'not-checked' %}
-                    <li>12-week disproportionate burden: <b>{{ case.audit.get_twelve_week_disproportionate_burden_claim_display }}</b></li>
+                    <tr>
+                        <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>12-week disproportionate burden</b></td>
+                        <td class="amp-padding-bottom-10">{{ case.audit.get_twelve_week_disproportionate_burden_claim_display }}</td>
+                    </tr>
                 {% endif %}
-                <li>
-                    {% if case.audit.accessibility_statement_found %}
-                        <a href="{{ case.audit.latest_statement_link }}" class="govuk-link govuk-link--no-visited-state" target="_blank">
-                            Accessibility Statement</a>
-                        added to case
-                    {% else %}
-                        No accessibility statement added
-                    {% endif %}
-                </li>
-            </ul>
+                <tr>
+                    <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>12-week WCAG compliance decision</b></td>
+                    <td class="amp-padding-bottom-10">{{ case.compliance.get_website_compliance_state_12_week_display }}</td>
+                </tr>
+                <tr>
+                    <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Issues remaining at 12-weeks</b></td>
+                    <td class="amp-padding-bottom-10"> 
+                        {{ case.audit.unfixed_check_results.count }} issues                
+                        {% if case.audit %}
+                            ({{ case.audit.percentage_wcag_issues_fixed }}% fixed)
+                        {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                    <td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top">
+                        {% if case.audit.accessibility_statement_found %}
+                            <a href="{{ case.audit.latest_statement_link }}" class="govuk-link govuk-link--no-visited-state" target="_blank">
+                                Accessibility Statement</a>
+                            added to case
+                        {% else %}
+                            No accessibility statement added
+                        {% endif %}
+                    </td>
+                </tr>
+            </table>    
             <br/>
             <h2 class="govuk-heading-s">Statement assessment contents</h2>
             <div class="amp-border-left">

accessibility_monitoring_platform/apps/audits/tests/test_views.py

@@ -3092,10 +3092,10 @@ def test_test_statement_summary_page_summary(url_name, admin_client):
     response: HttpResponse = admin_client.get(reverse(url_name, kwargs=audit_pk))
 
     assert response.status_code == 200
-    assertContains(response, "<li>Initial statement compliance: <b>")
-    assertContains(response, "<li>Initial disproportionate burden: <b>")
-    assertNotContains(response, "<li>12-week statement compliance: <b>")
-    assertNotContains(response, "<li>12-week disproportionate burden: <b>")
+    assertContains(response, "Initial statement compliance")
+    assertContains(response, "Initial disproportionate burden")
+    assertNotContains(response, "12-week statement compliance")
+    assertNotContains(response, "12-week disproportionate burden")
 
     audit.twelve_week_disproportionate_burden_claim = (
         Audit.DisproportionateBurden.ASSESSMENT
@@ -3109,10 +3109,10 @@ def test_test_statement_summary_page_summary(url_name, admin_client):
     response: HttpResponse = admin_client.get(reverse(url_name, kwargs=audit_pk))
 
     assert response.status_code == 200
-    assertNotContains(response, "<li>Initial statement compliance: <b>")
-    assertNotContains(response, "<li>Initial disproportionate burden: <b>")
-    assertContains(response, "<li>12-week statement compliance: <b>")
-    assertContains(response, "<li>12-week disproportionate burden: <b>")
+    assertNotContains(response, "Initial statement compliance")
+    assertNotContains(response, "Initial disproportionate burden")
+    assertContains(response, "12-week statement compliance")
+    assertContains(response, "12-week disproportionate burden")
 
 
 def test_create_equality_body_retest_redirects(admin_client):

accessibility_monitoring_platform/apps/cases/models.py

@@ -336,6 +336,11 @@ class RecommendationForEnforcement(models.TextChoices):
     )
     home_page_url = models.TextField(default="", blank=True)
     domain = models.TextField(default="", blank=True)
+
+    @property
+    def domain_clean(self):
+        return self.domain.replace("www.", "")
+
     organisation_name = models.TextField(default="", blank=True)
     psb_location = models.CharField(
         max_length=20,

accessibility_monitoring_platform/apps/common/sitemap.py

@@ -1415,7 +1415,7 @@ def __init__(self, type=PlatformPageGroup.Type.MOBILE_CASE_NAV, **kwargs):
                 url_name="simplified:edit-no-psb-response",
                 case_details_form_class=CaseNoPSBContactUpdateForm,
                 case_details_template_name="cases/details/details.html",
-                next_page_url_name="simplified:edit-enforcement-recommendation",
+                next_page_url_name="simplified:case-detail",
             ),
         ],
     ),

accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/10_reviewing_changes.html

@@ -23,7 +23,7 @@
                     <td class="govuk-table__cell amp-width-one-quarter">
                         <a href="{{ case.get_absolute_url }}" class="govuk-link">{{case.organisation_name|truncatechars:25}}</a>
                     </td>
-                    <td class="govuk-table__cell amp-width-one-quarter">{{case.domain|truncatechars:25}}</td>
+                    <td class="govuk-table__cell amp-width-one-quarter">{{case.domain_clean|truncatechars:25}}</td>
                     <td class="govuk-table__cell amp-width-one-quarter">
                         {% if filter == "all-cases" %}
                             {% if case.auditor %}

accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/11_final_decision_due.html

@@ -23,7 +23,7 @@
                     <td class="govuk-table__cell amp-width-one-quarter">
                         <a href="{{ case.get_absolute_url }}" class="govuk-link"> {{case.organisation_name|truncatechars:25}} </a>
                     </td>
-                    <td class="govuk-table__cell amp-width-one-quarter"> {{case.domain|truncatechars:25}} </td>
+                    <td class="govuk-table__cell amp-width-one-quarter"> {{case.domain_clean|truncatechars:25}} </td>
                     <td class="govuk-table__cell amp-width-one-quarter">
                         {% if filter == "all-cases" %}
                             {% if case.auditor %}
@@ -32,9 +32,7 @@
                                 No auditor
                             {% endif %}
                         {% else %}
-                            <a href="{% url 'simplified:edit-case-close' case.id %}" class="govuk-link">
-                                Closing the case
-                            </a>
+                            <a href="{% url 'simplified:edit-case-close' case.id %}" class="govuk-link">Closing the case</a>
                         {% endif %}
                         {% if case.reminder %}
                             |

accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/12_in_correspondence_with_equality_body.html

@@ -23,7 +23,7 @@
                     <td class="govuk-table__cell amp-width-one-quarter">
                         <a href="{{ case.get_absolute_url }}" class="govuk-link"> {{case.organisation_name|truncatechars:25}} </a>
                     </td>
-                    <td class="govuk-table__cell amp-width-one-quarter">{{case.domain|truncatechars:25}}</td>
+                    <td class="govuk-table__cell amp-width-one-quarter">{{case.domain_clean|truncatechars:25}}</td>
                     <td class="govuk-table__cell amp-width-one-quarter">
                         {% if filter == "all-cases" %}
                             {% if case.auditor %}

accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/13_reports_in_qa.html

@@ -22,7 +22,7 @@
                     <td class="govuk-table__cell amp-width-one-quarter">
                         <a href="{{ case.get_absolute_url }}" class="govuk-link">{{ case.organisation_name|truncatechars:25 }}</a>
                     </td>
-                    <td class="govuk-table__cell amp-width-one-quarter">{{ case.domain|truncatechars:25 }}</td>
+                    <td class="govuk-table__cell amp-width-one-quarter">{{ case.domain_clean|truncatechars:25 }}</td>
                     <td class="govuk-table__cell amp-width-one-quarter">
                         {% if filter == "all-cases" %}
                             {% if case.auditor %}