aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/base/admin/response_templates_select.html2
-rw-r--r--templates/web/base/admin/user-form.html29
-rw-r--r--templates/web/base/contact/submit.html2
-rw-r--r--templates/web/base/my/planned.html6
-rw-r--r--templates/web/base/questionnaire/index.html20
-rw-r--r--templates/web/base/report/_main.html66
-rw-r--r--templates/web/base/report/new/after_photo.html3
-rw-r--r--templates/web/base/report/new/form_user_loggedin.html4
-rw-r--r--templates/web/base/report/update.html2
-rw-r--r--templates/web/base/report/update/form_name.html4
-rw-r--r--templates/web/fixmystreet.com/about/council.html1
-rw-r--r--templates/web/fixmystreet.com/report/new/extra_name.html2
-rw-r--r--templates/web/oxfordshire/header.html2
-rw-r--r--templates/web/zurich/maps/noscript_map.html30
14 files changed, 124 insertions, 49 deletions
diff --git a/templates/web/base/admin/response_templates_select.html b/templates/web/base/admin/response_templates_select.html
index 33f50170e..fbe09268e 100644
--- a/templates/web/base/admin/response_templates_select.html
+++ b/templates/web/base/admin/response_templates_select.html
@@ -1,3 +1,4 @@
+[% IF problem.response_templates %]
<div class="response_templates_select">
<select id="templates_for_[% for %]" class="js-template-name" data-for="[% for %]" name="response_template">
<option value="">[% loc('--Choose a template--') %]</option>
@@ -6,3 +7,4 @@
[% END %]
</select>
</div>
+[% END %]
diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html
index 8a9ba5a77..40e0b510a 100644
--- a/templates/web/base/admin/user-form.html
+++ b/templates/web/base/admin/user-form.html
@@ -23,7 +23,7 @@
<li><label for="phone">[% loc('Phone:') %]</label>
<input type='text' id='phone' name='phone' value='[% user.phone | html %]'></li>
- [% IF c.user.is_superuser %]
+ [% IF c.user.is_superuser || c.cobrand.moniker == 'zurich' %]
<li>
<div class="admin-hint">
<p>
@@ -53,7 +53,7 @@
</li>
[% END %]
- [% IF areas %]
+ [% IF areas AND c.cobrand.moniker != 'zurich' %]
<li>
<div class="admin-hint">
<p>
@@ -85,10 +85,33 @@
[% loc("You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create.") %]
</p>
</div>
-
+
[% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]>
</li>
+ [% UNLESS user.is_superuser %]
+ <li>
+ <div class="admin-hint">
+ <p>
+ [% loc("Reports made by trusted users will be sent to the responsible body without being inspected first.") %]
+ </p>
+ </div>
+ [% IF c.user.is_superuser %]
+ [% loc('Trusted by bodies:') %]<br />
+ <select id='body' name='trusted_bodies' multiple>
+ [% FOR body IN bodies %]
+ <option value="[% body.id %]"[% ' selected' IF user.has_permission_to('trusted', body.id) %]>[% body.name %]</option>
+ [% END %]
+ </select>
+ [% ELSE %]
+ <label>
+ [% loc('Trusted:') %]
+ <input type="checkbox" id="trusted_bodies" name="trusted_bodies" value="[% c.user.from_body.id %]" [% 'checked' IF user.has_permission_to('trusted', c.user.from_body.id) %]>
+ </label>
+ [% END %]
+ </li>
+ [% END %]
+
[% IF c.user.is_superuser %]
<li>
<div class="admin-hint">
diff --git a/templates/web/base/contact/submit.html b/templates/web/base/contact/submit.html
index 5adb87e2d..4bf82dcd6 100644
--- a/templates/web/base/contact/submit.html
+++ b/templates/web/base/contact/submit.html
@@ -3,7 +3,7 @@
[% IF success %]
<div class="confirmation-header">
- <h1>[% loc('Thank you for your feedback') %]</h1>
+ <h1>[% loc('Thank you for your enquiry') %]</h1>
<p>[% loc('We’ll get back to you as soon as we can.') %]</p>
</div>
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&rsquo;t planned any reports yet.') %]
+[% loc('You haven&rsquo;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 a93039827..217bd827e 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&rsquo;t know') %]</label>
+ <label for="been_fixed_unknown">[% loc('Don&rsquo;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 e02d4b2b0..a85bca08f 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -7,20 +7,26 @@
<div class="problem-header clearfix" problem-id="[% problem.id %]">
-[% IF c.user.has_permission_to('planned_reports', problem.bodies_str) %]
-<form method="post" action="/my/planned/change" id="planned_form">
+[% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) %]
+<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/base/report/new/after_photo.html b/templates/web/base/report/new/after_photo.html
index cdebab462..b337977e4 100644
--- a/templates/web/base/report/new/after_photo.html
+++ b/templates/web/base/report/new/after_photo.html
@@ -1,7 +1,6 @@
<div class="description_tips" aria-label="[% loc('Tips for perfect photos') %]">
<ul class="do">
- <li>[% loc('Show what the problem is') %]</li>
- <li>[% loc('Show where it’s located') %]</li>
+ <li>[% loc('For best results include a close-up and a wide shot') %]</li>
</ul>
<ul class="dont">
<li>[% loc('Avoid personal information and vehicle number plates') %]</li>
diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html
index 4935a6481..7fc1b1b5f 100644
--- a/templates/web/base/report/new/form_user_loggedin.html
+++ b/templates/web/base/report/new/form_user_loggedin.html
@@ -5,8 +5,8 @@
[% INCLUDE form_as %]
</div>
[% ELSE %]
- [% can_contribute_as_another_user = c.user.has_permission_to("contribute_as_another_user", bodies.keys.join(",")) %]
- [% can_contribute_as_body = c.user.from_body AND c.user.has_permission_to("contribute_as_body", bodies.keys.join(",")) %]
+ [% can_contribute_as_another_user = c.user.has_permission_to("contribute_as_another_user", bodies.keys) %]
+ [% can_contribute_as_body = c.user.from_body AND c.user.has_permission_to("contribute_as_body", bodies.keys) %]
[% IF can_contribute_as_another_user OR can_contribute_as_body %]
[% INCLUDE form_as %]
[% END %]
diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html
index 55fdeb3b1..104e1d6f9 100644
--- a/templates/web/base/report/update.html
+++ b/templates/web/base/report/update.html
@@ -1,4 +1,4 @@
-[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %]
+[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str_ids) %]
[% IF loop.first %]
<section class="full-width">
diff --git a/templates/web/base/report/update/form_name.html b/templates/web/base/report/update/form_name.html
index 5d4c719ae..19c31998e 100644
--- a/templates/web/base/report/update/form_name.html
+++ b/templates/web/base/report/update/form_name.html
@@ -2,8 +2,8 @@
[% PROCESS 'user/_anonymity.html' anonymous = update.anonymous %]
- [% can_contribute_as_another_user = c.user.has_permission_to("contribute_as_another_user", problem.bodies_str) %]
- [% can_contribute_as_body = c.user.from_body AND c.user.has_permission_to("contribute_as_body", problem.bodies_str) %]
+ [% can_contribute_as_another_user = c.user.has_permission_to("contribute_as_another_user", problem.bodies_str_ids) %]
+ [% can_contribute_as_body = c.user.from_body AND c.user.has_permission_to("contribute_as_body", problem.bodies_str_ids) %]
[% IF can_contribute_as_another_user OR can_contribute_as_body %]
<label for="form_as">[% loc('Provide update as') %]</label>
diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html
index cd28a7269..651e4f57f 100644
--- a/templates/web/fixmystreet.com/about/council.html
+++ b/templates/web/fixmystreet.com/about/council.html
@@ -260,6 +260,7 @@
</div>
<div class="form-group submit-group">
<input type="hidden" name="subject" value="Councils submission">
+ <input type="hidden" name="recipient" value="enquiries">
<input type="hidden" name="dest" value="from_council">
<input type="submit" value="Send">
</div>
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>
diff --git a/templates/web/zurich/maps/noscript_map.html b/templates/web/zurich/maps/noscript_map.html
index dcd577c52..4925f9260 100644
--- a/templates/web/zurich/maps/noscript_map.html
+++ b/templates/web/zurich/maps/noscript_map.html
@@ -1,3 +1,4 @@
+[% IF map.cols %]
<div class="noscript square-map__outer">
<div class="square-map__inner">
<div id="[% nsm_prefix %]drag">
@@ -19,6 +20,35 @@
[% INCLUDE 'maps/_compass.html' %]
</div>
</div>
+[% ELSE %]
+<div class="noscript">
+ <div id="[% nsm_prefix %]drag">
+ <[% map.img_type %]
+ alt="NW map tile" id="[% nsm_prefix %]t2.2"
+ name="tile_[% map.x_tile - 1 %].[% map.y_tile - 1 %]"
+ src="[% map.tiles.0 %]"
+ style="top:0; left:0;">
+ <[% map.img_type %]
+ alt="NE map tile" id="[% nsm_prefix %]t2.3"
+ name="tile_[% map.x_tile %].[% map.y_tile - 1 %]"
+ src="[% map.tiles.1 %]"
+ style="top:0px; left:256px;">
+ <br>
+ <[% map.img_type %]
+ alt="SW map tile" id="[% nsm_prefix %]t3.2"
+ name="tile_[% map.x_tile - 1 %].[% map.y_tile %]"
+ src="[% map.tiles.2 %]"
+ style="top:256px; left:0;">
+ <[% map.img_type %]
+ alt="SE map tile" id="[% nsm_prefix %]t3.3"
+ name="tile_[% map.x_tile %].[% map.y_tile %]"
+ src="[% map.tiles.3 %]"
+ style="top:256px; left:256px;">
+ </div>
+ <div id="[% nsm_prefix %]pins">[% FOR pin IN map.pins %][% INCLUDE 'maps/pin.html' %][% END %]</div>
+ [% INCLUDE 'maps/_compass.html' %]
+</div>
+[% END %]
[% BLOCK pin %]
[%
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-21 09:07:41 +0000