6 files changed, 43 insertions, 23 deletions
diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html
new file mode 100644
index 000000000..3db776f1a
--- /dev/null
+++ b/templates/web/default/report/new/category.html
@@ -0,0 +1,9 @@
+[% IF category_options.size %]
+    <label for="form_category">[% category_label | html %]</label>
+    <select name="category" id="form_category">
+        [%- FOREACH cat_op IN category_options %]
+        <option value="[% cat_op | html %]"[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option>
+        [%- END %]
+    </select>
+[% END %]
+
diff --git a/templates/web/default/report/new/councils_text.html b/templates/web/default/report/new/councils_text.html
new file mode 100644
index 000000000..d463f399f
--- /dev/null
+++ b/templates/web/default/report/new/councils_text.html
@@ -0,0 +1,8 @@
+[% IF area_ids_to_list.size == 0 %]
+    [% PROCESS 'report/new/councils_text_none.html' %]
+[% ELSIF area_ids_to_list.size == all_councils.size %]
+    [% PROCESS 'report/new/councils_text_all.html' %]
+[% ELSE %]
+    [% PROCESS 'report/new/councils_text_some.html' %]
+[% END %]
+
diff --git a/templates/web/default/report/new/all_councils_text.html b/templates/web/default/report/new/councils_text_all.html
index 8514e0b0a..8514e0b0a 100644
--- a/templates/web/default/report/new/all_councils_text.html
+++ b/templates/web/default/report/new/councils_text_all.html
diff --git a/templates/web/default/report/new/no_councils_text.html b/templates/web/default/report/new/councils_text_none.html
index f991e031f..f991e031f 100644
--- a/templates/web/default/report/new/no_councils_text.html
+++ b/templates/web/default/report/new/councils_text_none.html
diff --git a/templates/web/default/report/new/some_councils_text.html b/templates/web/default/report/new/councils_text_some.html
index 042e89914..042e89914 100644
--- a/templates/web/default/report/new/some_councils_text.html
+++ b/templates/web/default/report/new/councils_text_some.html
diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html
index d2609f400..eea020e3f 100644
--- a/templates/web/default/report/new/fill_in_details_form.html
+++ b/templates/web/default/report/new/fill_in_details_form.html
@@ -8,15 +8,16 @@
 [% END %]
 
 [% IF js %]
-    <p id="council_text">COUNCIL TEXT HERE</p>
+    <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 %]
-    [% IF area_ids_to_list.size == 0 %]
-        [% INCLUDE 'report/new/no_councils_text.html' %]
-    [% ELSIF area_ids_to_list.size == all_councils.size %]
-        [% INCLUDE 'report/new/all_councils_text.html' %]
-    [% ELSE %]    
-        [% INCLUDE 'report/new/some_councils_text.html' %]
-    [% END %]
+    [% PROCESS 'report/new/councils_text.html' %]
 [% END %]
 
 <p>
@@ -43,21 +44,6 @@
     <div class='form-error'>[% field_errors.council %]</div>
 [% END %]
 
-[% IF category_options.size %]
-    [% IF field_errors.category %]
-        <div class='form-error'>[% field_errors.category %]</div>
-    [% END %]
-    
-    <div class="form-field">
-        <label for="form_category">[% category_label | html %]</label>
-        <select name="category" id="form_category">
-            [%- FOREACH cat_op IN category_options %]
-            <option value="[% cat_op | html %]"[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option>
-            [%- END %]
-        </select>
-    </div>
-[% END %]
-
 [% IF field_errors.title %]
     <div class='form-error'>[% field_errors.title %]</div>
 [% END %]
@@ -76,6 +62,23 @@
     <textarea name="detail" id="form_detail" rows="7" cols="26">[% report.detail | html %]</textarea>
 </div>
 
+[% IF js %]
+    <div class="form-field" id="form_category_row">
+        <label for="form_category">[% loc('Category:') %]</label>
+        <select name="category" id="form_category"><option>[% loc('Loading...') %]</option></select>
+    </div>
+[% ELSE %]
+    [% IF category_options.size %]
+        [% IF field_errors.category %]
+            <div class='form-error'>[% field_errors.category %]</div>
+        [% END %]
+
+        <div class="form-field">
+            [% PROCESS "report/new/category.html" %]
+        </div>
+    [% END %]
+[% END %]
+
 [% IF c.cobrand.allow_photo_upload %]
     [% IF field_errors.photo %]
         <div class='form-error'>[% field_errors.photo %]</div>