6 files changed, 34 insertions, 7 deletions
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html
index cbba1b3b0..9ef7e8248 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/default/admin/report_edit.html
@@ -37,6 +37,7 @@
 <li>[% loc('Service:') %] [% problem.service %]</li>
 <li>[% loc('Cobrand:') %] [% problem.cobrand %]</li>
 <li>[% loc('Cobrand data:') %] [% problem.cobrand_data %]</li>
+<li>[% loc('Extra data:') %] [% problem.extra ? 'Yes' : 'No' %]</li>
 <li>[% loc('Going to send questionnaire?') %] [% IF problem.send_questionnaire %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</li>
 <li><label for="flagged">[% loc('Flagged:') %]</label> <input type="checkbox" name="flagged"[% ' checked' IF problem.flagged %]></li>
 
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index e74ae7b70..4931e8230 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -7,7 +7,8 @@
 <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script>
 
 <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script>
-<script type="text/javascript" src="[% version(js_override || '/js/fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version(js_override || '/js/fixmystreet-old-box.js') %]"></script>
 
 [% map_js %]
 
diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html
index ed9d53c24..cc9ba979a 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/default/faq/faq-en-gb.html
@@ -93,7 +93,8 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd>
 to find out where reports go at the moment. Also <a href="/contact">contact us</a>
 to update the address or addresses we use.</dd>
         <dt>I&rsquo;m from a council, can we have FixMyStreet on our website?</dt>
-        <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="/for-councils">Full details</a>.</dd>
+        <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites.
+        <a href="http://www.fixmystreet.com/for-councils">Full details</a>.</dd>
         <dt>Do you remove silly or illegal content?</dt>
         <dd>FixMyStreet is not responsible for the content and accuracy
 of material submitted by its users. We reserve the right to edit or remove any
diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html
index 70a0ed41c..71637877a 100644
--- a/templates/web/default/js/validation_strings.html
+++ b/templates/web/default/js/validation_strings.html
@@ -14,5 +14,8 @@
         email: {
             required: '[% loc('Please enter your email') %]',
             email: '[% loc('Please enter a valid email') %]'
-        }
+        },
+        fms_extra_title: '[% loc('Please enter your title') %]',
+        first_name: '[% loc('Please enter your first name') %]',
+        last_name: '[% loc('Please enter your second name') %]'
     };
diff --git a/templates/web/default/report/new/extra_name.html b/templates/web/default/report/new/extra_name.html
new file mode 100644
index 000000000..ea523410b
--- /dev/null
+++ b/templates/web/default/report/new/extra_name.html
@@ -0,0 +1,15 @@
+[% IF extra_name_info %]
+<label for="form_fms_extra_title">Title</label>
+[% IF field_errors.fms_extra_title %]
+    <p class='form-error'>[% field_errors.fms_extra_title %]</p>
+[% END %]
+<select class="form-focus-trigger" id="form_fms_extra_title"
+    name="fms_extra_title">
+    <option></option>
+    <option value="Mr"[% ' selected' IF fms_extra_title == 'Mr' %]>Mr</option>
+    <option value="Miss"[% ' selected' IF fms_extra_title == 'Miss' %]>Miss</option>
+    <option value="Mrs"[% ' selected' IF fms_extra_title == 'Mrs' %]>Mrs</option>
+    <option value="Ms"[% ' selected' IF fms_extra_title == 'Ms' %]>Ms</option>
+    <option value="Dr"[% ' selected' IF fms_extra_title == 'Dr' %]>Dr</option>
+</select>
+[% END %]
diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html
index 0d3d43d82..4eef35dec 100755
--- a/templates/web/default/reports/council.html
+++ b/templates/web/default/reports/council.html
@@ -1,3 +1,9 @@
+[% IF c.cobrand.moniker == 'fixmystreet' OR c.cobrand.moniker == 'bromley';
+     style = 'new';
+   ELSE;
+     style = 'old';
+   END;
+%]
 [% IF ward %]
     [% name = "$ward.name, $council.name"
        thing = loc('ward')
@@ -19,7 +25,7 @@
 
 [% map_html %]
 
-[% IF c.cobrand.moniker != 'fixmystreet' AND children.size %]
+[% IF style != 'new' AND children.size %]
 <h2 style="clear:right">[% loc('Wards of this council') %]</h2>
 <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
 <ul>
@@ -66,7 +72,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
 <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>.
 [% END %]
 </p>
-[% ELSIF c.cobrand.moniker == 'fixmystreet' %]
+[% ELSIF style == 'new' %]
     <div class="shadow-wrap">
         <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]>
             <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li>
@@ -81,7 +87,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
 
 [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %]
 
-[% IF c.cobrand.moniker == 'fixmystreet' AND children.size %]
+[% IF style == 'new' AND children.size %]
 <section id="council_wards" class="hidden-js">
     <h2>[% loc('Wards of this council') %]</h2>
     <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
@@ -117,7 +123,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a
 [% IF problems %]
 
 <ul class="issue-list-a">
-[% IF c.cobrand.moniker == 'fixmystreet' %]
+[% IF style == 'new' %]
 
 [% FOREACH problem IN problems %]
     <li>