diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/admin/reports/edit.html | 2 | ||||
| -rw-r--r-- | templates/web/base/around/postcode_form.html | 4 | ||||
| -rw-r--r-- | templates/web/base/debug_header.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/new/category_extras.html | 18 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/header/css.html | 2 | ||||
| -rw-r--r-- | templates/web/oxfordshire/around/postcode_form.html | 8 |
6 files changed, 23 insertions, 13 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.html b/templates/web/base/around/postcode_form.html index ac83d4bf4..4e222471e 100644 --- a/templates/web/base/around/postcode_form.html +++ b/templates/web/base/around/postcode_form.html @@ -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/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.html b/templates/web/oxfordshire/around/postcode_form.html index ea15809d8..5d061291c 100644 --- a/templates/web/oxfordshire/around/postcode_form.html +++ b/templates/web/oxfordshire/around/postcode_form.html @@ -25,7 +25,13 @@ <input type="hidden" name="filter_category" value="[% c.user.categories.join(",") | 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' %] |