diff options
Diffstat (limited to 'templates')
12 files changed, 42 insertions, 21 deletions
diff --git a/templates/web/base/admin/reports/edit.html b/templates/web/base/admin/reports/edit.html index 4f9b58887..d2b866d01 100644 --- a/templates/web/base/admin/reports/edit.html +++ b/templates/web/base/admin/reports/edit.html @@ -81,7 +81,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> [% IF problem.send_method_used %] ([% problem.send_method_used %]) [% END %] - [% IF problem.state == 'confirmed' AND problem.whensent AND NOT c.cobrand.disable_resend %] + [% IF problem.state == 'confirmed' AND problem.whensent AND NOT c.cobrand.disable_resend_button %] <input data-confirm="[% loc('Are you sure?') %]" class="btn" type="submit" name="resend" value="[% loc('Resend report') %]"> [% ELSIF NOT problem.whensent %] <input type="submit" class="btn" name="mark_sent" value="[% loc('Mark as sent') %]"> diff --git a/templates/web/base/around/_postcode_form_examples.html b/templates/web/base/around/_postcode_form_examples.html new file mode 100644 index 000000000..975d33927 --- /dev/null +++ b/templates/web/base/around/_postcode_form_examples.html @@ -0,0 +1 @@ +<p class="form-hint" id="pc-hint">[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]</p> diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html index ac83d4bf4..60fa1a703 100644 --- a/templates/web/base/around/postcode_form.html +++ b/templates/web/base/around/postcode_form.html @@ -10,7 +10,7 @@ <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm" class="js-geolocate"> <label for="pc">[% question %]:</label> - <p class="form-hint" id="pc-hint">[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]</p> + [% INCLUDE 'around/_postcode_form_examples.html' %] <div> <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" required aria-describedby="pc-hint"> [% INCLUDE 'around/_postcode_submit_button.html' attr='id="sub"' %] @@ -27,7 +27,9 @@ <input type="hidden" name="filter_category" value="[% c.user.categories_string | html %]"> [% END %] </form> - [%~ SET link_params = {}; + [%~ SET link_params = { + geolocate = 1 + }; IF c.get_param('filter_category'); link_params.filter_category = c.get_param('filter_category'); END; IF c.get_param('filter_group'); link_params.filter_group = c.get_param('filter_group'); END; %] diff --git a/templates/web/base/debug_header.html b/templates/web/base/debug_header.html index 5bbb65cfc..222878871 100644 --- a/templates/web/base/debug_header.html +++ b/templates/web/base/debug_header.html @@ -1,4 +1,4 @@ -[% IF c.config.STAGING_SITE ~%] +[% IF c.config.STAGING_SITE and !c.config.STAGING_FLAGS.hide_staging_banner ~%] <div class="dev-site-notice"> [% loc("Staging site") %] </div> diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html index f3293bbbb..5cef391ce 100644 --- a/templates/web/base/report/new/category_extras.html +++ b/templates/web/base/report/new/category_extras.html @@ -9,14 +9,16 @@ [%- IF category_extras.$category.size %] [% UNLESS category_extras_hidden.$category %] - <div class="extra-category-questions"> - <h2 class="visuallyhidden form-section-heading">[% loc('Extra details') %]</h2> - <p class="form-section-description"> - [% tprintf( - loc('Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online.'), - mark_safe(list_of_names.join( '</strong>' _ loc(' or ') _ '<strong>' )) - ); %] - </p> + <div class="extra-category-questions"> + [% UNLESS category_extras_notices.$category %] + <h2 class="visuallyhidden form-section-heading">[% loc('Extra details') %]</h2> + <p class="form-section-description"> + [% tprintf( + loc('Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online.'), + mark_safe(list_of_names.join( '</strong>' _ loc(' or ') _ '<strong>' )) + ); %] + </p> + [% END %] [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$category %] </div> [% ELSE %] diff --git a/templates/web/cheshireeast/report/new/_form_labels.html b/templates/web/cheshireeast/report/new/_form_labels.html new file mode 100644 index 000000000..1897a5ff2 --- /dev/null +++ b/templates/web/cheshireeast/report/new/_form_labels.html @@ -0,0 +1,4 @@ +[% +SET form_title = 'Location of the problem'; +SET form_title_placeholder = 'Exact location, including any landmarks'; +%] diff --git a/templates/web/cheshireeast/report/new/roads_message.html b/templates/web/cheshireeast/report/new/roads_message.html index 3a62e052c..71fa3332d 100644 --- a/templates/web/cheshireeast/report/new/roads_message.html +++ b/templates/web/cheshireeast/report/new/roads_message.html @@ -1,8 +1,8 @@ <div id="js-roads-responsibility" class="box-warning hidden"> <strong>Not maintained by Cheshire East Council</strong> - <div id="js-not-council-road" class="hidden js-responsibility-message"> - <p>The selected road is not maintained by Cheshire East Council; - to find out who owns this land/road please contact the Land Registry at + <div id="js-not-a-road" class="hidden js-responsibility-message"> + <p>Cheshire East Council is not responsible for this location; + to find out who is responsible visit <a href="https://www.gov.uk/search-property-information-land-registry">https://www.gov.uk/search-property-information-land-registry</a>. </p> </div> diff --git a/templates/web/fixmystreet.com/header/css.html b/templates/web/fixmystreet.com/header/css.html index 14dc98d44..96ecde092 100644 --- a/templates/web/fixmystreet.com/header/css.html +++ b/templates/web/fixmystreet.com/header/css.html @@ -11,7 +11,7 @@ <![endif]--> <!--[if gte IE 9]><!--> <style id="critical"> -[% critical %] +[% critical | safe %] </style> <noscript><link rel="stylesheet" href="[% base_css %]"></noscript> diff --git a/templates/web/oxfordshire/around/_postcode_form_examples.html b/templates/web/oxfordshire/around/_postcode_form_examples.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/oxfordshire/around/_postcode_form_examples.html diff --git a/templates/web/oxfordshire/around/_postcode_submit_button.html b/templates/web/oxfordshire/around/_postcode_submit_button.html new file mode 100644 index 000000000..e06579b0f --- /dev/null +++ b/templates/web/oxfordshire/around/_postcode_submit_button.html @@ -0,0 +1 @@ +<input type="submit" [% attr | safe %] value="Find"> diff --git a/templates/web/oxfordshire/around/postcode_form.html b/templates/web/oxfordshire/around/postcode_form.html index ea15809d8..9f7e9e763 100644 --- a/templates/web/oxfordshire/around/postcode_form.html +++ b/templates/web/oxfordshire/around/postcode_form.html @@ -10,22 +10,30 @@ <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm" class="js-geolocate"> <label for="pc">[% question %]:</label> + [% INCLUDE 'around/_postcode_form_examples.html' %] <div> - <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]" required> - <input type="submit" value="[% loc('Find') %]" id="sub"> + <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]" required aria-describedby="pc-hint"> + [% INCLUDE 'around/_postcode_submit_button.html' attr='id="sub"' %] </div> [% IF partial_token %] <input type="hidden" name="partial" value="[% partial_token.token %]"> [% END %] - [% IF c.get_param('filter_category') %] + [% IF c.get_param('filter_category') OR c.get_param('filter_group') %] <input type="hidden" name="filter_category" value="[% c.get_param('filter_category') | html %]"> + <input type="hidden" name="filter_group" value="[% c.get_param('filter_group') | html %]"> [% ELSIF c.user_exists AND c.user.categories.size %] - <input type="hidden" name="filter_category" value="[% c.user.categories.join(",") | html %]"> + <input type="hidden" name="filter_category" value="[% c.user.categories_string | html %]"> [% END %] </form> - <a href="[% c.uri_for('/around') %]" id="geolocate_link">[% loc('Or use my location') %]</a> + [%~ SET link_params = { + geolocate = 1 + }; + IF c.get_param('filter_category'); link_params.filter_category = c.get_param('filter_category'); END; + IF c.get_param('filter_group'); link_params.filter_group = c.get_param('filter_group'); END; + %] + <a href="[% c.uri_for('/around', link_params) | html %]" id="geolocate_link">[% loc('Or use my location') %]</a> [% UNLESS possible_location_matches %] [% INCLUDE 'around/_postcode_form_post.html' %] diff --git a/templates/web/tfl/around/_postcode_form_examples.html b/templates/web/tfl/around/_postcode_form_examples.html new file mode 100644 index 000000000..57d5fce2f --- /dev/null +++ b/templates/web/tfl/around/_postcode_form_examples.html @@ -0,0 +1,3 @@ +<p class="form-hint" id="pc-hint"> +[% tprintf('e.g. ‘%s’ or ‘%s’', c.cobrand.example_places) %] +or ‘FMS1234567’</p> |