diff options
Diffstat (limited to 'templates/web/default')
| -rw-r--r-- | templates/web/default/admin/council_contacts.html | 4 | ||||
| -rw-r--r-- | templates/web/default/admin/search_users.html | 2 | ||||
| -rw-r--r-- | templates/web/default/js/validation_strings.html | 20 | ||||
| -rw-r--r-- | templates/web/default/report/_main.html | 5 |
4 files changed, 17 insertions, 14 deletions
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html index acfec3ed4..da7223aa6 100644 --- a/templates/web/default/admin/council_contacts.html +++ b/templates/web/default/admin/council_contacts.html @@ -10,7 +10,11 @@ [% IF example_pc %] <a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> | [% END %] +[% IF c.cobrand.moniker == 'emptyhomes' %] +<a href="[% c.uri_for( 'search_reports', search => 'area:' _ area_id ) %]">[% loc('List all reported problems' ) %]</a> +[% ELSE %] <a href="[% c.uri_for_email( '/reports/' _ area_id ) %]">[% loc('List all reported problems' ) %]</a> +[% END %] <a href="[% c.uri_for( 'council_contacts', area_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html index 98723e6ef..18c964dfe 100644 --- a/templates/web/default/admin/search_users.html +++ b/templates/web/default/admin/search_users.html @@ -18,7 +18,7 @@ [%- FOREACH user IN users %] <tr> <td>[% PROCESS value_or_nbsp value=user.name %]</td> - <td><a href="[% c.uri_for( 'search_reports', user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> + <td><a href="[% c.uri_for( 'search_reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> <td>[% user.flagged ? loc('Yes') : ' ' %]</td> <td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td> diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html index 70a0ed41c..718d10d56 100644 --- a/templates/web/default/js/validation_strings.html +++ b/templates/web/default/js/validation_strings.html @@ -1,18 +1,18 @@ validation_strings = { - update: '[% loc('Please enter a message') %]', - title: '[% loc('Please enter a subject') %]', - detail: '[% loc('Please enter some details') %]', + update: '[% loc('Please enter a message') | replace("'", "\\'") %]', + title: '[% loc('Please enter a subject') | replace("'", "\\'") %]', + detail: '[% loc('Please enter some details') | replace("'", "\\'") %]', name: { - required: '[% loc('Please enter your name') %]', - validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]' + required: '[% loc('Please enter your name') | replace("'", "\\'") %]', + validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]' }, - category: '[% loc('Please choose a category') %]', + category: '[% loc('Please choose a category') | replace("'", "\\'") %]', rznvy: { - required: '[% loc('Please enter your email') %]', - email: '[% loc('Please enter a valid email') %]' + required: '[% loc('Please enter your email') | replace("'", "\\'") %]', + email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' }, email: { - required: '[% loc('Please enter your email') %]', - email: '[% loc('Please enter a valid email') %]' + required: '[% loc('Please enter your email') | replace("'", "\\'") %]', + email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' } }; diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html index 552be17e6..3a9e60e7b 100644 --- a/templates/web/default/report/_main.html +++ b/templates/web/default/report/_main.html @@ -2,12 +2,11 @@ <p><em>[% problem.meta_line(c) | html %] [% IF problem.council %] - [% IF problem.whensent || problem.external_id %] + [% IF problem.whensent || problem.can_display_external_id %] <small class="council_sent_info"><br> [% problem.processed_summary_string(c) %] </small> - [% END %] - + [% END %] [% ELSE %] <br><small>[% loc('Not reported to council') %]</small> [% END %] |