diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/web/base/my/planned.html | 6 | ||||
-rw-r--r-- | templates/web/base/questionnaire/index.html | 20 | ||||
-rw-r--r-- | templates/web/base/report/_main.html | 64 | ||||
-rw-r--r-- | templates/web/fixmystreet.com/report/new/extra_name.html | 2 | ||||
-rw-r--r-- | templates/web/oxfordshire/header.html | 2 |
5 files changed, 57 insertions, 37 deletions
diff --git a/templates/web/base/my/planned.html b/templates/web/base/my/planned.html index 2e852ea01..19d29f970 100644 --- a/templates/web/base/my/planned.html +++ b/templates/web/base/my/planned.html @@ -1,7 +1,7 @@ [% SET bodyclass = 'mappage'; PROCESS "maps/${map.type}.html" IF problems.size; - INCLUDE 'header.html', title = loc('Your planned reports') + INCLUDE 'header.html', title = loc('Your shortlist') %] [% IF problems.size %] @@ -14,10 +14,10 @@ <div id="skipped-map"> [% END %] -<h1>[% loc('Your planned reports') %]</h1> +<h1>[% loc('Your shortlist') %]</h1> [% IF ! has_content %] -[% loc('You haven’t planned any reports yet.') %] +[% loc('You haven’t shortlisted any reports yet.') %] [% END %] <section class="full-width"> diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html index 52d5ed5b1..7a7e433a1 100644 --- a/templates/web/base/questionnaire/index.html +++ b/templates/web/base/questionnaire/index.html @@ -48,22 +48,22 @@ [% loc('Has this problem been fixed?') %] </p> -<p class="radio-segmented-control"> +<p class="segmented-control segmented-control--radio"> <input type="radio" name="been_fixed" id="been_fixed_yes" value="Yes"[% ' checked' IF been_fixed == 'Yes' %]> - <label class="inline" for="been_fixed_yes">[% loc('Yes') %]</label> + <label for="been_fixed_yes">[% loc('Yes') %]</label> <input type="radio" name="been_fixed" id="been_fixed_no" value="No"[% ' checked' IF been_fixed == 'No' %]> - <label class="inline" for="been_fixed_no">[% loc('No') %]</label> + <label for="been_fixed_no">[% loc('No') %]</label> <input type="radio" name="been_fixed" id="been_fixed_unknown" value="Unknown"[% ' checked' IF been_fixed == 'Unknown' %]> - <label class="inline" for="been_fixed_unknown">[% loc('Don’t know') %]</label> + <label for="been_fixed_unknown">[% loc('Don’t know') %]</label> </p> [% UNLESS answered_ever_reported %] <p>[% loc('Have you ever reported a problem to a council before, or is this your first time?') %]</p> -<p class="radio-segmented-control"> +<p class="segmented-control segmented-control--radio"> <input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> - <label class="inline" for="reported_yes">[% loc('Reported before') %]</label> + <label for="reported_yes">[% loc('Reported before') %]</label> <input type="radio" name="reported" id="reported_no" value="No"[% ' checked' IF reported == 'No' %]> - <label class="inline" for="reported_no">[% loc('First time') %]</label> + <label for="reported_no">[% loc('First time') %]</label> </p> [% END %] @@ -99,11 +99,11 @@ <div class="js-another-questionnaire"> <p>[% loc('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?') %]</p> - <p class="radio-segmented-control"> + <p class="segmented-control segmented-control--radio"> <input type="radio" name="another" id="another_yes" value="Yes"[% ' checked' IF another == 'Yes' %]> - <label class="inline" for="another_yes">[% loc('Yes') %]</label> + <label for="another_yes">[% loc('Yes') %]</label> <input type="radio" name="another" id="another_no" value="No"[% ' checked' IF another == 'No' %]> - <label class="inline" for="another_no">[% loc('No') %]</label> + <label for="another_no">[% loc('No') %]</label> </p> </div> diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 5ff34a2cf..a85bca08f 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -8,19 +8,25 @@ <div class="problem-header clearfix" problem-id="[% problem.id %]"> [% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) %] -<form method="post" action="/my/planned/change" id="planned_form"> +<form method="post" action="/my/planned/change" id="planned_form" class="hidden-label-target"> <input type="hidden" name="id" value="[% problem.id %]"> <input type="hidden" name="token" value="[% csrf_token %]"> <input type="hidden" name="change" value="[% IF c.user.is_planned_report(problem) %]remove[% ELSE %]add[% END %]"> - <p><input type="submit" - data-remove="[% loc('Remove from planned reports') %]" data-add="[% loc('Add to planned reports') %]" - value=" + <p><input + type="submit" + id="shortlist-report" + data-label-remove="[% loc('Remove from shortlist') %]" + data-label-add="[% loc('Add to shortlist') %]" + data-value-remove="[% loc('Shortlisted') %]" + data-value-add="[% loc('Shortlist') %]" [%~ IF c.user.is_planned_report(problem) ~%] - [% loc('Remove from planned reports') %] + value="[% loc('Shortlisted') %]" + aria-label="[% loc('Remove from shortlist') %]" [%~ ELSE ~%] - [% loc('Add to planned reports') %] + value="[% loc('Shortlist') %]" + aria-label="[% loc('Add to shortlist') %]" [%~ END ~%] - "></p> + ></p> </form> [% END %] @@ -106,25 +112,39 @@ </div> [% END %] - [% IF permissions.keys.grep('moderate|report_inspect|report_edit_category|report_edit_priority').size %] - <p class="moderate-display"> + [% IF permissions.moderate %] + </form> + [% END %] + + [% IF + (permissions.moderate) + OR + (!hide_inspect_button AND + permissions.keys.grep('report_inspect|report_edit_category|report_edit_priority').size) + OR + (c.user.has_permission_to('planned_reports', problem.bodies_str_ids)) + %] + <div class="moderate-display segmented-control" role="menu"> [% IF permissions.moderate %] - <input type="button" class="btn moderate" value="Moderate this report"> + <a id="moderate-report" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a> [% END %] [% IF !hide_inspect_button AND permissions.keys.grep('report_inspect|report_edit_category|report_edit_priority').size %] - <a href="/report/[% problem.id %]/inspect" class="btn inspect"> - [%- IF permissions.report_inspect %] - [%- loc('Inspect') %] - [%- ELSE %] - [%- loc('Manage') %] - [%- END ~%] - </a> + <a href="/report/[% problem.id %]/inspect" role="menuitem"> + [%~ IF permissions.report_inspect ~%] + [%~ loc('Inspect') ~%] + [%~ ELSE ~%] + [%~ loc('Manage') ~%] + [%~ END ~%] + </a> [% END %] - </p> - [% END %] - - [% IF permissions.moderate %] - </form> + [% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) %] + [%~ IF c.user.is_planned_report(problem) ~%] + <label for="shortlist-report" role="menuitem" aria-label="[% loc('Remove from shortlist') %]">[% loc('Shortlisted') %]</label> + [%~ ELSE ~%] + <label for="shortlist-report" role="menuitem" aria-label="[% loc('Add to shortlist') %]">[% loc('Shortlist') %]</label> + [%~ END ~%] + [% END %] + </div> [% END %] [% TRY %][% PROCESS 'report/_main_after.html' %][% CATCH file %][% END %] diff --git a/templates/web/fixmystreet.com/report/new/extra_name.html b/templates/web/fixmystreet.com/report/new/extra_name.html index 80ab1837a..f329541c3 100644 --- a/templates/web/fixmystreet.com/report/new/extra_name.html +++ b/templates/web/fixmystreet.com/report/new/extra_name.html @@ -8,7 +8,7 @@ shared with the council or displayed publicly.</em> </p> [% SET gender = report.get_extra_metadata('gender') %] -<p class="radio-segmented-control" style="font-size: 80%"> +<p class="segmented-control segmented-control--radio" style="font-size: 80%"> <input type="radio" name="gender" id="gender_female" value="female"[% ' checked' IF gender == 'female' %]> <label for="gender_female">Female</label> <input type="radio" name="gender" id="gender_male" value="male"[% ' checked' IF gender == 'male' %]> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index d5884272b..5b5532b67 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -45,7 +45,7 @@ [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') %] <li> <[% IF c.req.uri.path == '/my/planned' %]span[% ELSE %]a href="/my/planned"[% END - %]>[% loc('Planned reports') %]</[% c.req.uri.path == '/my/planned' ? 'span' : 'a' %]> + %]>[% loc('Shortlist') %]</[% c.req.uri.path == '/my/planned' ? 'span' : 'a' %]> </li> [% END %] <li> |