Skip to content

Commit 45701a4

Browse files
richardboredrichardbored
committed
Fixed snagging points
1 parent 41d960e commit 45701a4

23 files changed

Lines changed: 192 additions & 188 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
data-filter-string="{{ form.initial.wcag_definition }} {{ form.initial.wcag_definition.hint }} {{ form.initial.issue_identifier }}"
5050
>
5151
<div class="govuk-grid-column-full">
52-
<hr class="amp-width-100 amp-margin-bottom-30">
52+
<hr class="amp-width-100 amp-margin-bottom-40">
5353
{% include 'common/form_hidden_fields.html' with hidden_fields=form.hidden_fields %}
5454
{% include 'audits/helpers/amp_wcag_state_field.html' with field=form.check_result_state %}
5555
{% 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>
6262
</div>
6363
{% include 'common/preview_markdown.html' with field_id=form.notes.auto_id %}
6464
{% include 'audits/helpers/check_result_initial_notes_history.html' with check_result=form.initial.check_result %}
65-
<div class="govuk-grid-row amp-margin-bottom-20 amp-margin-top-20">
65+
<div class="govuk-grid-row amp-margin-bottom-0 amp-margin-top-20">
6666
<div class="govuk-grid-column-full govuk-button-group">
6767
▼ &nbsp; <a href="#save-and-continue-buttons" class="govuk-link govuk-link--no-visited-state">Go to save and continue</a>
6868
▲ &nbsp; {% include 'common/back_to_top.html' %}

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

Lines changed: 73 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,37 @@
88
<div class="govuk-grid-row">
99
<br/>
1010
<div class="govuk-grid-column-full">
11-
<h2 class="govuk-heading-s">WCAG issues summary</h2>
12-
<ul class="govuk-list govuk-list--bullet">
13-
<li>Initial WCAG compliance decision: <b>{{ case.compliance.get_website_compliance_state_initial_display }}</b></li>
14-
<li>Initial issues: {{ case.audit.failed_check_results.count }}</li>
15-
<li>12-week WCAG compliance decision: <b>{{ case.compliance.get_website_compliance_state_12_week_display }}</b></li>
16-
<li>
17-
Issues remaining at 12-weeks: {{ case.audit.unfixed_check_results.count }} issues
18-
{% if case.audit %}
19-
({{ case.audit.percentage_wcag_issues_fixed }}% fixed)
20-
{% endif %}
21-
</li>
22-
<li>
23-
Pages removed at 12-weeks: {{ case.audit.missing_at_retest_pages.count }}
24-
({{ case.audit.missing_at_retest_check_results.count }} issues)
25-
</li>
26-
</ul>
11+
12+
<table class="govuk-body">
13+
<tr>
14+
<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>
15+
<td class="amp-padding-bottom-10">{{ case.compliance.get_website_compliance_state_initial_display }}</td>
16+
</tr>
17+
<tr>
18+
<td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Initial issues</b></td>
19+
<td class="amp-padding-bottom-10">{{ case.audit.failed_check_results.count }}</td>
20+
</tr>
21+
<tr>
22+
<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>
23+
<td class="amp-padding-bottom-10">{{ case.compliance.get_website_compliance_state_12_week_display }}</td>
24+
</tr>
25+
<tr>
26+
<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>
27+
<td class="amp-padding-bottom-10">
28+
{{ case.audit.unfixed_check_results.count }} issues
29+
{% if case.audit %}
30+
({{ case.audit.percentage_wcag_issues_fixed }}% fixed)
31+
{% endif %}
32+
</td>
33+
</tr>
34+
<tr>
35+
<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>
36+
<td class="amp-padding-bottom-10">
37+
{{ case.audit.missing_at_retest_pages.count }}
38+
({{ case.audit.missing_at_retest_check_results.count }} issues)
39+
</td>
40+
</tr>
41+
</table>
2742
<br/>
2843
</div>
2944
</div>
@@ -66,30 +81,56 @@ <h2 id="wcag-toc" class="govuk-heading-s">WCAG test contents</h2>
6681
{% if show_statement_summary %}
6782
<div class="govuk-grid-row">
6883
<div class="govuk-grid-column-full">
69-
<h2 class="govuk-heading-s">Statement issues summary</h2>
70-
<ul class="govuk-list govuk-list--bullet">
84+
<table class="govuk-body">
7185
{% if case.compliance.statement_compliance_state_12_week == 'unknown' %}
72-
<li>Initial statement compliance: <b>{{ case.compliance.get_statement_compliance_state_initial_display }}</b></li>
86+
<tr>
87+
<td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Initial statement compliance</b></td>
88+
<td class="amp-padding-bottom-10">{{ case.compliance.get_statement_compliance_state_initial_display }}</td>
89+
</tr>
7390
{% endif %}
7491
{% if case.audit.twelve_week_disproportionate_burden_claim == 'not-checked' %}
75-
<li>Initial disproportionate burden: <b>{{ case.audit.get_initial_disproportionate_burden_claim_display }}</b></li>
92+
<tr>
93+
<td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top"><b>Initial disproportionate burden</b></td>
94+
<td class="amp-padding-bottom-10">{{ case.audit.get_initial_disproportionate_burden_claim_display }}</td>
95+
</tr>
7696
{% endif %}
7797
{% if case.compliance.statement_compliance_state_12_week != 'unknown' %}
78-
<li>12-week statement compliance: <b>{{ case.compliance.get_statement_compliance_state_12_week_display }}</b></li>
98+
<tr>
99+
<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>
100+
<td class="amp-padding-bottom-10">{{ case.compliance.get_statement_compliance_state_12_week_display }}</td>
101+
</tr>
79102
{% endif %}
80103
{% if case.audit.twelve_week_disproportionate_burden_claim != 'not-checked' %}
81-
<li>12-week disproportionate burden: <b>{{ case.audit.get_twelve_week_disproportionate_burden_claim_display }}</b></li>
104+
<tr>
105+
<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>
106+
<td class="amp-padding-bottom-10">{{ case.audit.get_twelve_week_disproportionate_burden_claim_display }}</td>
107+
</tr>
82108
{% endif %}
83-
<li>
84-
{% if case.audit.accessibility_statement_found %}
85-
<a href="{{ case.audit.latest_statement_link }}" class="govuk-link govuk-link--no-visited-state" target="_blank">
86-
Accessibility Statement</a>
87-
added to case
88-
{% else %}
89-
No accessibility statement added
90-
{% endif %}
91-
</li>
92-
</ul>
109+
<tr>
110+
<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>
111+
<td class="amp-padding-bottom-10">{{ case.compliance.get_website_compliance_state_12_week_display }}</td>
112+
</tr>
113+
<tr>
114+
<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>
115+
<td class="amp-padding-bottom-10">
116+
{{ case.audit.unfixed_check_results.count }} issues
117+
{% if case.audit %}
118+
({{ case.audit.percentage_wcag_issues_fixed }}% fixed)
119+
{% endif %}
120+
</td>
121+
</tr>
122+
<tr>
123+
<td class="amp-padding-bottom-10 amp-padding-right-25 amp-min-width-180 amp-vertically-align-top">
124+
{% if case.audit.accessibility_statement_found %}
125+
<a href="{{ case.audit.latest_statement_link }}" class="govuk-link govuk-link--no-visited-state" target="_blank">
126+
Accessibility Statement</a>
127+
added to case
128+
{% else %}
129+
No accessibility statement added
130+
{% endif %}
131+
</td>
132+
</tr>
133+
</table>
93134
<br/>
94135
<h2 class="govuk-heading-s">Statement assessment contents</h2>
95136
<div class="amp-border-left">

‎accessibility_monitoring_platform/apps/audits/tests/test_views.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3092,10 +3092,10 @@ def test_test_statement_summary_page_summary(url_name, admin_client):
30923092
response: HttpResponse = admin_client.get(reverse(url_name, kwargs=audit_pk))
30933093

30943094
assert response.status_code == 200
3095-
assertContains(response, "<li>Initial statement compliance: <b>")
3096-
assertContains(response, "<li>Initial disproportionate burden: <b>")
3097-
assertNotContains(response, "<li>12-week statement compliance: <b>")
3098-
assertNotContains(response, "<li>12-week disproportionate burden: <b>")
3095+
assertContains(response, "Initial statement compliance")
3096+
assertContains(response, "Initial disproportionate burden")
3097+
assertNotContains(response, "12-week statement compliance")
3098+
assertNotContains(response, "12-week disproportionate burden")
30993099

31003100
audit.twelve_week_disproportionate_burden_claim = (
31013101
Audit.DisproportionateBurden.ASSESSMENT
@@ -3109,10 +3109,10 @@ def test_test_statement_summary_page_summary(url_name, admin_client):
31093109
response: HttpResponse = admin_client.get(reverse(url_name, kwargs=audit_pk))
31103110

31113111
assert response.status_code == 200
3112-
assertNotContains(response, "<li>Initial statement compliance: <b>")
3113-
assertNotContains(response, "<li>Initial disproportionate burden: <b>")
3114-
assertContains(response, "<li>12-week statement compliance: <b>")
3115-
assertContains(response, "<li>12-week disproportionate burden: <b>")
3112+
assertNotContains(response, "Initial statement compliance")
3113+
assertNotContains(response, "Initial disproportionate burden")
3114+
assertContains(response, "12-week statement compliance")
3115+
assertContains(response, "12-week disproportionate burden")
31163116

31173117

31183118
def test_create_equality_body_retest_redirects(admin_client):

‎accessibility_monitoring_platform/apps/cases/models.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,11 @@ class RecommendationForEnforcement(models.TextChoices):
336336
)
337337
home_page_url = models.TextField(default="", blank=True)
338338
domain = models.TextField(default="", blank=True)
339+
340+
@property
341+
def domain_clean(self):
342+
return self.domain.replace("www.", "")
343+
339344
organisation_name = models.TextField(default="", blank=True)
340345
psb_location = models.CharField(
341346
max_length=20,

‎accessibility_monitoring_platform/apps/common/sitemap.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ def __init__(self, type=PlatformPageGroup.Type.MOBILE_CASE_NAV, **kwargs):
14151415
url_name="simplified:edit-no-psb-response",
14161416
case_details_form_class=CaseNoPSBContactUpdateForm,
14171417
case_details_template_name="cases/details/details.html",
1418-
next_page_url_name="simplified:edit-enforcement-recommendation",
1418+
next_page_url_name="simplified:case-detail",
14191419
),
14201420
],
14211421
),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<td class="govuk-table__cell amp-width-one-quarter">
2424
<a href="{{ case.get_absolute_url }}" class="govuk-link">{{case.organisation_name|truncatechars:25}}</a>
2525
</td>
26-
<td class="govuk-table__cell amp-width-one-quarter">{{case.domain|truncatechars:25}}</td>
26+
<td class="govuk-table__cell amp-width-one-quarter">{{case.domain_clean|truncatechars:25}}</td>
2727
<td class="govuk-table__cell amp-width-one-quarter">
2828
{% if filter == "all-cases" %}
2929
{% if case.auditor %}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<td class="govuk-table__cell amp-width-one-quarter">
2424
<a href="{{ case.get_absolute_url }}" class="govuk-link"> {{case.organisation_name|truncatechars:25}} </a>
2525
</td>
26-
<td class="govuk-table__cell amp-width-one-quarter"> {{case.domain|truncatechars:25}} </td>
26+
<td class="govuk-table__cell amp-width-one-quarter"> {{case.domain_clean|truncatechars:25}} </td>
2727
<td class="govuk-table__cell amp-width-one-quarter">
2828
{% if filter == "all-cases" %}
2929
{% if case.auditor %}
@@ -32,9 +32,7 @@
3232
No auditor
3333
{% endif %}
3434
{% else %}
35-
<a href="{% url 'simplified:edit-case-close' case.id %}" class="govuk-link">
36-
Closing the case
37-
</a>
35+
<a href="{% url 'simplified:edit-case-close' case.id %}" class="govuk-link">Closing the case</a>
3836
{% endif %}
3937
{% if case.reminder %}
4038
|

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<td class="govuk-table__cell amp-width-one-quarter">
2424
<a href="{{ case.get_absolute_url }}" class="govuk-link"> {{case.organisation_name|truncatechars:25}} </a>
2525
</td>
26-
<td class="govuk-table__cell amp-width-one-quarter">{{case.domain|truncatechars:25}}</td>
26+
<td class="govuk-table__cell amp-width-one-quarter">{{case.domain_clean|truncatechars:25}}</td>
2727
<td class="govuk-table__cell amp-width-one-quarter">
2828
{% if filter == "all-cases" %}
2929
{% if case.auditor %}

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/1_new_cases_table.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<td class="govuk-table__cell amp-width-one-quarter">
2323
<a href="{{ case.get_absolute_url }}" class="govuk-link">{{ case.organisation_name|truncatechars:25 }}</a>
2424
</td>
25-
<td class="govuk-table__cell amp-width-one-quarter">{{ case.domain|truncatechars:25 }}</td>
25+
<td class="govuk-table__cell amp-width-one-quarter">{{ case.domain_clean|truncatechars:25 }}</td>
2626
<td class="govuk-table__cell amp-width-one-quarter">
2727
{% if filter == "all-cases" %}
2828
{% if case.auditor %}

0 commit comments

Comments
 (0)