diff options
Diffstat (limited to 'templates')
17 files changed, 51 insertions, 46 deletions
diff --git a/templates/web/base/alert/_index_text.html b/templates/web/base/alert/_index_text.html new file mode 100644 index 000000000..92e84478e --- /dev/null +++ b/templates/web/base/alert/_index_text.html @@ -0,0 +1,25 @@ +<p> +[% IF c.cobrand.is_council %] +[% tprintf(loc('%s has a variety of RSS feeds and email alerts for local +problems, including alerts for all problems within a particular ward, or all +problems within a certain distance of a particular location.', "%s is the site name"), site_name) %] +[% ELSE %] +[% tprintf(loc('%s has a variety of RSS feeds and email alerts for local problems, including +alerts for all problems within a particular ward or council, or all problems +within a certain distance of a particular location.', "%s is the site name"), site_name) %] +[% END %] +</p> + +[% IF location_error %] + <div class="error">[% location_error %]</div> +[% ELSE %] + [% INCLUDE 'errors.html' %] +[% END %] + +<p> +[% IF c.cobrand.is_council %] +[% tprintf(loc('To find out what local alerts we have for you, please enter your %s postcode or street name and area:'), c.cobrand.council_area) %] +[% ELSE %] +[% loc('To find out what local alerts we have for you, please enter your postcode or street name and area' ) %] +[% END %] +</p> diff --git a/templates/web/base/alert/_list.html b/templates/web/base/alert/_list.html index b9d955466..3dbd6b8d2 100644 --- a/templates/web/base/alert/_list.html +++ b/templates/web/base/alert/_list.html @@ -22,16 +22,7 @@ <h3>[% loc('Problems in an area') %]</h3> [% END %] - <p id="rss_local"> - <a href="[% rss_feed_uri %]" class="alerts-rss-link"> - <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed of nearby problems') %]" alt="[% loc('RSS feed') %]"> - </a> - <label class="label-containing-checkbox" for="[% rss_feed_id %]"> - <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> - [% tprintf( loc('Problems within %.1fkm of %s'), population_radius, name_of_location ) %] - [% loc('(covers roughly 200,000 people)') %] - </label> - </p> + [% PROCESS 'alert/_list_rss_local.html' %] <p id="rss_local_alt"> [% SET distance_options = '<a href="' _ rss_feed_2k _ ' ">2km</a> / <a href="' _ rss_feed_5k _ ' ">5km</a> / <a href="' _ rss_feed_10k _ '">10km</a> / <a href="' _ rss_feed_20k _ '">20km</a>' %] diff --git a/templates/web/base/alert/_list_rss_local.html b/templates/web/base/alert/_list_rss_local.html new file mode 100644 index 000000000..a7fd82ca2 --- /dev/null +++ b/templates/web/base/alert/_list_rss_local.html @@ -0,0 +1,10 @@ + <p id="rss_local"> + <a href="[% rss_feed_uri %]" class="alerts-rss-link"> + <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed of nearby problems') %]" alt="[% loc('RSS feed') %]"> + </a> + <label class="label-containing-checkbox" for="[% rss_feed_id %]"> + <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> + [% tprintf( loc('Problems within %.1fkm of %s'), population_radius, name_of_location ) %] + [% loc('(covers roughly 200,000 people)') %] + </label> + </p> diff --git a/templates/web/base/alert/index.html b/templates/web/base/alert/index.html index ba3c64baf..3c7ff9e8b 100644 --- a/templates/web/base/alert/index.html +++ b/templates/web/base/alert/index.html @@ -3,33 +3,11 @@ <h1>[% loc('Local RSS feeds and email alerts') %]</h1> -<p> -[% IF c.cobrand.is_council %] -[% tprintf(loc('%s has a variety of RSS feeds and email alerts for local -problems, including alerts for all problems within a particular ward, or all -problems within a certain distance of a particular location.', "%s is the site name"), site_name) %] -[% ELSE %] -[% tprintf(loc('%s has a variety of RSS feeds and email alerts for local problems, including -alerts for all problems within a particular ward or council, or all problems -within a certain distance of a particular location.', "%s is the site name"), site_name) %] -[% END %] -</p> - -[% IF location_error %] - <div class="error">[% location_error %]</div> -[% ELSE %] - [% INCLUDE 'errors.html' %] -[% END %] +[% PROCESS 'alert/_index_text.html' %] -<p> -[% IF c.cobrand.is_council %] -[% tprintf(loc('To find out what local alerts we have for you, please enter your %s postcode or street name and area:'), c.cobrand.council_area) %] -[% ELSE %] -[% loc('To find out what local alerts we have for you, please enter your postcode or street name and area' ) %] -[% END %] -</p> <form method="get" action="/alert/list" class="form-box js-geolocate"> <fieldset> + <legend class="visuallyhidden">[% loc('Search for location of email alert or RSS feed') %]</legend> <label for="pc">[% loc('Postcode or street name and area') %]</label> <p class="form-hint" id="pc-hint">[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]</p> <div class="form-txt-submit-box"> diff --git a/templates/web/base/around/tabbed_lists.html b/templates/web/base/around/tabbed_lists.html index f135684b9..b3284468a 100755 --- a/templates/web/base/around/tabbed_lists.html +++ b/templates/web/base/around/tabbed_lists.html @@ -1,5 +1,7 @@ [% INCLUDE "reports/_list-filters.html" %] +<h2 class="hidden-js">[% loc('Reports') %]</h2> + <div class="js-pagination"> [% INCLUDE 'pagination.html' param = 'p' %] </div> diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html index 21591203d..5ccd9863e 100644 --- a/templates/web/base/js/translation_strings.html +++ b/templates/web/base/js/translation_strings.html @@ -68,8 +68,6 @@ fixmystreet.password_minimum_length = [% c.cobrand.password_minimum_length %]; expand_map: '[% loc('Expand map') | replace("'", "\\'") %]', collapse_map: '[% loc('Collapse map') | replace("'", "\\'") %]', - permalink: '[% loc('Permalink') | replace("'", "\\'") %]', - filter: '[% loc('Filter') | replace("'", "\\'") %]', show_pins: '[% loc('Show pins') | replace("'", "\\'") %]', diff --git a/templates/web/base/report/form/user_loggedout_by_email_heading.html b/templates/web/base/report/form/user_loggedout_by_email_heading.html index 6aa90c2fd..221b75101 100644 --- a/templates/web/base/report/form/user_loggedout_by_email_heading.html +++ b/templates/web/base/report/form/user_loggedout_by_email_heading.html @@ -1,13 +1,13 @@ [% IF c.config.SMS_AUTHENTICATION %] [% IF type == 'update' %] - <h5 class="hidden-js">[% loc('<strong>No</strong> Let me confirm my update by email/text') %]</h5> + <h3 class="hidden-js">[% loc('<strong>No</strong> Let me confirm my update by email/text') %]</h3> [% ELSE %] - <h5 class="hidden-js">[% loc('<strong>No</strong> Let me confirm my report by email/text') %]</h5> + <h3 class="hidden-js">[% loc('<strong>No</strong> Let me confirm my report by email/text') %]</h3> [% END %] [% ELSE %] [% IF type == 'update' %] - <h5 class="hidden-js">[% loc('<strong>No</strong> Let me confirm my update by email') %]</h5> + <h3 class="hidden-js">[% loc('<strong>No</strong> Let me confirm my update by email') %]</h3> [% ELSE %] - <h5 class="hidden-js">[% loc('<strong>No</strong> Let me confirm my report by email') %]</h5> + <h3 class="hidden-js">[% loc('<strong>No</strong> Let me confirm my report by email') %]</h3> [% END %] [% END %] diff --git a/templates/web/base/report/form/user_loggedout_password.html b/templates/web/base/report/form/user_loggedout_password.html index 40a028b24..4b8611fcb 100644 --- a/templates/web/base/report/form/user_loggedout_password.html +++ b/templates/web/base/report/form/user_loggedout_password.html @@ -1,7 +1,7 @@ <!-- user_loggedout_password.html --> <div id="form_sign_in_yes" class="form-box hidden-js js-new-report-sign-in-shown"> - <h5 class="hidden-js">[% loc('<strong>Yes</strong> I have a password') %]</h5> + <h3 class="hidden-js">[% loc('<strong>Yes</strong> I have a password') %]</h3> <p class="hidden-nojs"> [% loc('No account?') %] diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index c9bb2bf87..448941647 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -1,4 +1,4 @@ -<h1>[% loc('Report your problem') %]</h1> +[% PROCESS 'report/new/form_heading.html' %] <div class="js-new-report-user-hidden"> diff --git a/templates/web/base/report/new/form_after_heading.html b/templates/web/base/report/new/form_after_heading.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/base/report/new/form_after_heading.html diff --git a/templates/web/base/report/new/form_heading.html b/templates/web/base/report/new/form_heading.html index e69de29bb..bd61baa95 100644 --- a/templates/web/base/report/new/form_heading.html +++ b/templates/web/base/report/new/form_heading.html @@ -0,0 +1 @@ +<h1>[% loc('Report your problem') %]</h1> diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html index 52133ba68..9f99b86c3 100644 --- a/templates/web/base/report/new/form_report.html +++ b/templates/web/base/report/new/form_report.html @@ -1,7 +1,7 @@ [% SET form_show_category_only = NOT category || field_errors.category || disable_form_message || have_disable_qn_to_answer %] <!-- report/new/form_report.html --> -[% INCLUDE 'report/new/form_heading.html' %] +[% INCLUDE 'report/new/form_after_heading.html' %] [% IF field_errors.bodies %] <p class='form-error'>[% field_errors.bodies %]</p> diff --git a/templates/web/base/report/new/login_success_form.html b/templates/web/base/report/new/login_success_form.html index b9abf2023..22da33265 100644 --- a/templates/web/base/report/new/login_success_form.html +++ b/templates/web/base/report/new/login_success_form.html @@ -1,4 +1,4 @@ -<h1>[% loc('Report your problem') %]</h1> +[% PROCESS 'report/new/form_heading.html' %] <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p> diff --git a/templates/web/base/report/new/oauth_email_form.html b/templates/web/base/report/new/oauth_email_form.html index 8e5b9a7ae..a5ca1c290 100644 --- a/templates/web/base/report/new/oauth_email_form.html +++ b/templates/web/base/report/new/oauth_email_form.html @@ -1,4 +1,4 @@ -<h1>[% loc('Report your problem') %]</h1> +[% PROCESS 'report/new/form_heading.html' %] <p class="form-error"> [% loc('Please note your report has <strong>not yet been sent</strong>.') %] diff --git a/templates/web/buckinghamshire/report/new/form_heading.html b/templates/web/buckinghamshire/report/new/form_after_heading.html index 81bff156a..81bff156a 100644 --- a/templates/web/buckinghamshire/report/new/form_heading.html +++ b/templates/web/buckinghamshire/report/new/form_after_heading.html diff --git a/templates/web/oxfordshire/report/new/form_heading.html b/templates/web/oxfordshire/report/new/form_after_heading.html index a561c7efb..a561c7efb 100644 --- a/templates/web/oxfordshire/report/new/form_heading.html +++ b/templates/web/oxfordshire/report/new/form_after_heading.html diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html index 17e308f07..4c266bbad 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -7,7 +7,7 @@ <fieldset> <div id="problem_form"> - [% INCLUDE 'report/new/form_heading.html' %] + [% INCLUDE 'report/new/form_after_heading.html' %] [% IF field_errors.bodies %] |