diff options
Diffstat (limited to 'templates/web/base')
| -rw-r--r-- | templates/web/base/contact/index.html | 8 | ||||
| -rw-r--r-- | templates/web/base/contact/unsuitable-text.html | 3 | ||||
| -rw-r--r-- | templates/web/base/report/_inspect.html | 8 | ||||
| -rw-r--r-- | templates/web/base/report/display_tools.html | 4 | ||||
| -rw-r--r-- | templates/web/base/reports/_list-filters.html | 4 |
5 files changed, 14 insertions, 13 deletions
diff --git a/templates/web/base/contact/index.html b/templates/web/base/contact/index.html index a66d183b6..f24f8afea 100644 --- a/templates/web/base/contact/index.html +++ b/templates/web/base/contact/index.html @@ -40,16 +40,12 @@ <input type="hidden" name="id" value="[% update.problem_id %]"> [% ELSIF problem %] - <p> [% IF moderation_complaint %] <input type="hidden" name="m" value="[% moderation_complaint %]"> - [% loc('You are complaining that this problem report was unnecessarily moderated:') %] + <p>[% loc('You are complaining that this problem report was unnecessarily moderated:') %]</p> [% ELSE %] - [% loc('Does this report break our <a href="/about/house-rules">House Rules</a>? Use this form to let us know.') %] - </p> <p> - <strong>[% loc('If you are trying to make a new report, please <a href="/">go to the front page</a> and follow the instructions.') %]</strong> + [% INCLUDE 'contact/unsuitable-text.html' %] [% END %] - </p> <blockquote> <h2>[% problem.title_safe | html %]</h2> diff --git a/templates/web/base/contact/unsuitable-text.html b/templates/web/base/contact/unsuitable-text.html new file mode 100644 index 000000000..12137c818 --- /dev/null +++ b/templates/web/base/contact/unsuitable-text.html @@ -0,0 +1,3 @@ +<p> + [% loc('You are reporting the following problem report for being abusive, containing personal information, or similar:') %] +</p> diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index ba11bbcbd..84170a38c 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -52,11 +52,11 @@ [% cat_prefix = category | lower | replace('[^a-z]', '') %] [% cat_prefix = "category_" _ cat_prefix _ "_" %] [% IF category == problem.category %] - <p data-category="[% category | html %]"> + <p data-category="[% category | html %]" data-priorities="[% priorities_by_category.$category %]"> [% INCLUDE 'report/new/category_extras_fields.html' %] </p> - [% ELSIF category_extras.$category.size %] - <p data-category="[% category | html %]" class="hidden"> + [% ELSE %] + <p data-category="[% category | html %]" class="hidden" data-priorities="[% priorities_by_category.$category %]"> [% INCLUDE 'report/new/category_extras_fields.html' report_meta='' %] </p> [% END %] @@ -107,7 +107,7 @@ <select name="priority" id="problem_priority" class="form-control"> <option value="" [% 'selected' UNLESS problem.response_priority_id %]>-</option> [% FOREACH priority IN problem.response_priorities %] - <option value="[% priority.id %]" [% 'selected' IF problem.response_priority_id == priority.id %] [% 'disabled' IF priority.deleted %]>[% priority.name %]</option> + <option value="[% priority.id %]" [% 'selected' IF problem.response_priority_id == priority.id %] [% 'disabled' IF priority.deleted %]>[% priority.name | html %]</option> [% END %] </select> </p> diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html index 8a756a948..fb337df59 100644 --- a/templates/web/base/report/display_tools.html +++ b/templates/web/base/report/display_tools.html @@ -6,7 +6,9 @@ <input type="submit" id="key-tool-report-abuse" class="abuse btn" data-confirm="[% loc('Are you sure?') %]" name="remove_from_site" value="[% loc('Remove from site') %]"> </form></li> [% ELSIF c.cobrand.moniker != 'zurich' %] - <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Unsuitable?' ) %]</a></li> + <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% + c.cobrand.moniker == 'fixmystreet' ? 'Unsuitable?' : loc('Report abuse') + %]</a></li> [% END %] [% IF c.cobrand.moniker != 'zurich' %] <li><a rel="nofollow" id="key-tool-report-updates" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li> diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html index 5ca483a1f..9c2a74e57 100644 --- a/templates/web/base/reports/_list-filters.html +++ b/templates/web/base/reports/_list-filters.html @@ -1,5 +1,5 @@ [% select_status = BLOCK %] - <select class="form-control" name="status" id="statuses" multiple data-all="[% loc('All reports') %]"> + <select class="form-control js-multiple" name="status" id="statuses" multiple data-all="[% loc('All reports') %]"> <option value="open"[% ' selected' IF filter_status.open %]>[% loc('Unfixed reports') %]</option> <option value="closed"[% ' selected' IF filter_status.closed %]>[% loc('Closed reports') %]</option> <option value="fixed"[% ' selected' IF filter_status.fixed %]>[% loc('Fixed reports') %]</option> @@ -8,7 +8,7 @@ [% select_category = BLOCK %] [% IF filter_categories.size %] - <select class="form-control" name="filter_category" id="filter_categories" multiple data-all="[% loc('Everything') %]"> + <select class="form-control js-multiple" name="filter_category" id="filter_categories" multiple data-all="[% loc('Everything') %]"> [% FOR cat IN filter_categories %] <option value="[% cat | html %]"[% ' selected' IF filter_category.grep(cat).size %]> [% cat | html %] |