diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-01-24 10:16:57 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-01-24 10:16:57 +0000 |
| commit | efcf0504597aec9e24cb9d29aad5fa0624f3635b (patch) | |
| tree | c3a0ec4e6e3d8a7013da5544dc80a43d92ee9221 | |
| parent | 08c4f1a46206e1a41bb9b6b5375d2888e42118f2 (diff) | |
Remove some unwanted text from Zurich site.
4 files changed, 6 insertions, 20 deletions
diff --git a/templates/web/default/email_sent.html b/templates/web/default/email_sent.html index fd947022a..a18a73888 100644 --- a/templates/web/default/email_sent.html +++ b/templates/web/default/email_sent.html @@ -19,12 +19,16 @@ <h1>[% loc("Nearly Done! Now check your email...") %]</h1> +[% IF c.cobrand.moniker != 'zurich' %] <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> +[% END %] <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> <p>[% tprintf( loc("You must now click the link in the email we've just sent you — if you do not, %s."), messages.$email_type.action ) %].</p> +[% IF c.cobrand.moniker != 'zurich' %] <p>[% tprintf( loc("(Don't worry — %s)"), messages.$email_type.worry ) %]</p> +[% END %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html index d508b1929..657390c79 100644 --- a/templates/web/fixmystreet/report/new/notes.html +++ b/templates/web/fixmystreet/report/new/notes.html @@ -2,8 +2,10 @@ <ul class="plain-list"> <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li> + [% IF c.cobrand.moniker != 'zurich' %] <li>[% loc("Please be polite, concise and to the point.") %]</li> <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> + [% END %] <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> </ul> diff --git a/templates/web/zurich/report/new/councils_text_all.html b/templates/web/zurich/report/new/councils_text_all.html index d76fca7f2..e69de29bb 100644 --- a/templates/web/zurich/report/new/councils_text_all.html +++ b/templates/web/zurich/report/new/councils_text_all.html @@ -1,6 +0,0 @@ -<p> -[% - loc('All the information you provide here will be sent to <strong>Stadt Zürich</strong>.') -%] -</p> - 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 1fee02717..1cecf036d 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -1,20 +1,6 @@ <div id="report-a-problem-main"> <h1>[% loc('Reporting a problem') %]</h1> - [% IF js %] - <p id="councils_text"> - [% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.'), - loc('the local council') - ); - %] - [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] - </p> - [% ELSE %] - [% PROCESS 'report/new/councils_text.html' %] - [% END %] - <div id="report-a-problem-sidebar"> <!-- The text for this section needs checking, but I can't work out which bit comes from where |