aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-02-24 11:19:48 +0000
committerMatthew Somerville <matthew@mysociety.org>2012-02-24 11:19:48 +0000
commita3c4648e26ef9480df3c99716c8c55260bb4a1e2 (patch)
treeef4eba8791841ad2dbe88d87a5d27457e372dd44
parent09a31705470f3cfce90187ed0454768359bb414c (diff)
Get council name text working, and put public message there too for ease.
-rw-r--r--templates/web/fixmystreet/report/new/fill_in_details_form.html33
1 files changed, 15 insertions, 18 deletions
diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html
index 2a70a5e32..61305ac80 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -1,8 +1,19 @@
<div id="report-a-problem-main">
<h1>[% loc('Reporting a problem') %]</h1>
- <!-- THIS NEED THE NAME OF THE COUNCIL -->
- <p>[% loc('This report will be sent to <strong>Name of the Council</strong>.') %]</p>
+ [% 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">
<!--
@@ -13,21 +24,7 @@
[% IF partial_token %]
<p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p>
[% END %]
- <p>[% loc('You have located the problem at the point marked with a purple pin on the map. If this is not the correct location, simply click on the map again. ') %]</p>
- [% END %]
-
- [% 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' %]
+ <p>[% loc('You have located the problem at the point marked with a yellow pin on the map. If this is not the correct location, simply click on the map again. ') %]</p>
[% END %]
<p>
@@ -208,4 +205,4 @@
[% END %]
<input type="hidden" name="submit_problem" value="1">
-</div> \ No newline at end of file
+</div>