diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2014-12-17 11:21:28 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2014-12-17 12:15:03 +0000 |
| commit | 00090170f96ae43f521ce29a3731859ca5f6738a (patch) | |
| tree | e31c3d9125c13025771f03a317622ca0c4e6fe38 /templates/web/base | |
| parent | e57f715a4625507cf6720d22e676c606bcb56053 (diff) | |
Version 1.5.2.v1.5.2
Includes:
* [UK] Don't show topic form field when reporting abuse.
* Use token in moderation response URL to prevent hidden report leak.
* Make sure successful submission page is full width.
Diffstat (limited to 'templates/web/base')
| -rw-r--r-- | templates/web/base/contact/index.html | 1 | ||||
| -rw-r--r-- | templates/web/base/contact/submit.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/_main.html | 30 |
3 files changed, 13 insertions, 20 deletions
diff --git a/templates/web/base/contact/index.html b/templates/web/base/contact/index.html index 439091f88..228a77def 100644 --- a/templates/web/base/contact/index.html +++ b/templates/web/base/contact/index.html @@ -35,6 +35,7 @@ [% 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:') %] [% ELSE %] [% loc('You are reporting the following problem report for being abusive, containing personal information, or similar:') %] diff --git a/templates/web/base/contact/submit.html b/templates/web/base/contact/submit.html index 3845e9210..fc416c2d7 100644 --- a/templates/web/base/contact/submit.html +++ b/templates/web/base/contact/submit.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title = loc('Contact Us') %] +[% INCLUDE 'header.html', title = loc('Contact Us'), bodyclass = 'fullwidthpage' %] <h1>[% loc('Contact the team') %]</h1> diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 6ae96f97c..00b0188af 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -66,28 +66,20 @@ </em></p> [% INCLUDE 'report/_support.html' %] - [% IF c.cobrand.moniker != 'southampton' %] - [% INCLUDE 'report/photo.html' object=problem %] - [% END %] + [% INCLUDE 'report/photo.html' object=problem %] + <div class="moderate-display"> + [% add_links( problem.detail ) | html_para %] + </div> - <div class="moderate-display"> - [% add_links( problem.detail ) | html_para %] - </div> - [% IF moderating %] - <div class="moderate-edit"> - [% IF problem.detail != original.detail %] - <input type="checkbox" name="problem_revert_detail" class="revert-textarea"> - <label for="problem_revert_detail">Revert to original text</label> - [% END %] - <textarea name="problem_detail">[% add_links( problem.detail ) %]</textarea> - </div> + [% IF moderating %] + <div class="moderate-edit"> + [% IF problem.detail != original.detail %] + <input type="checkbox" name="problem_revert_detail" class="revert-textarea"> + <label for="problem_revert_detail">Revert to original text</label> [% END %] + <textarea name="problem_detail">[% add_links( problem.detail ) %]</textarea> + </div> - [% IF c.cobrand.moniker == 'southampton' %] - [% INCLUDE 'report/photo.html' object=problem %] - [% END %] - - [% IF moderating %] <div class="moderate-edit"> <label for="moderation_reason">Moderation reason:</label> <input type="text" name="moderation_reason" placeholder="Describe why you are moderating this"> |