diff options
Diffstat (limited to 'templates/web/base')
| -rw-r--r-- | templates/web/base/admin/reports/edit.html | 2 | ||||
| -rw-r--r-- | templates/web/base/around/_postcode_form_examples.html | 1 | ||||
| -rw-r--r-- | templates/web/base/around/postcode_form.html | 6 | ||||
| -rw-r--r-- | templates/web/base/debug_header.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/new/category_extras.html | 18 |
5 files changed, 17 insertions, 12 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 %] |