12 files changed, 236 insertions, 17 deletions
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html
index da7223aa6..e35c8cda2 100644
--- a/templates/web/default/admin/council_contacts.html
+++ b/templates/web/default/admin/council_contacts.html
@@ -121,6 +121,31 @@
     </p>
 
     <p>
+        <label for="send_method">Send Method</label>:
+        <select name="send_method">
+            <option value=""> -- Select a method -- </option>
+            [% FOR method IN send_methods %]
+            <option value="[% method %]"[% ' selected' IF conf.send_method == method %]>[% method %]</option>
+            [% END %]
+        </select>
+    </p>
+
+    <p>
+        <label for="send_comments">Use Open311 comment sending extension</label>:
+        <input type="checkbox" name="send_comments"[% ' checked' IF conf.send_comments %]>
+    </p>
+
+    <p>
+        <label for"comment_user_id">User to attribute fetched comments to</label>:
+        <input type="text" name="comment_user_id" value="[% conf.comment_user_id %]">
+    </p>
+
+    <p>
+        <label for="suppress_alerts">Do not send email alerts on fetched comments to problem creator</label>:
+        <input type="checkbox" name="suppress_alerts"[% ' checked' IF conf.suppress_alerts %]>
+    </p>
+
+    <p>
     <input type="hidden" name="open311_id" value="[% conf.id %]">
     <input type="hidden" name="area_id" value="[% area_id %]">
     <input type="hidden" name="posted" value="open311">
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/auth/sign_out.html b/templates/web/default/auth/sign_out.html
index 3d8df60e4..23d39aa2d 100644
--- a/templates/web/default/auth/sign_out.html
+++ b/templates/web/default/auth/sign_out.html
@@ -1,8 +1,8 @@
-[% INCLUDE 'header.html', title => loc('Sign out') %]
+[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %]
 
 <h1>[% loc('You have been signed out') %]</h1>
 
-<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>.</p>
-
+<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or
+go back to the <a href="/">FixMyStreet front page</a>.</p>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index c87f93994..582afd422 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/dashboard/index.html b/templates/web/default/dashboard/index.html
new file mode 100644
index 000000000..a0ef7b911
--- /dev/null
+++ b/templates/web/default/dashboard/index.html
@@ -0,0 +1,146 @@
+[% 
+    INCLUDE 'header.html'
+        title = loc('Dashboard')
+        robots = 'noindex, nofollow'
+        bodyclass = 'fullwidthpage'
+%]
+
+<style>
+    th[scope=row] { text-align: left; }
+    tr.subtotal { background-color: #eee; }
+    #overview tr:nth-child(2) { background-color: #fee; }
+</style>
+
+<form>
+
+<p>Ward: <select name="ward"><option value=''>All</option>
+    [% FOR w IN children.values.sort('name') %]
+        <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option>
+    [% END %]
+</select>
+<input type="submit" value="Look up">
+
+<h2>Performance Overview</h2>
+
+<p>Report category: <select name="category"><option value=''>All</option>
+    [% FOR cat_op IN category_options %]
+        <option value='[% cat_op | html %]'[% ' selected' IF category == cat_op %]>[% cat_op | html %]</option>
+    [% END %]
+    </select>
+<input type="submit" value="Look up">
+
+<table width="100%" id="overview">
+    <tr>
+        <td>&nbsp;</td>
+        <th scope="col">WTD</th>
+        <th scope="col">Last 7 days</th>
+        <th scope="col">Last 4 weeks</th>
+        <th scope="col">YTD</th>
+    </tr>
+
+    [%
+    rows = {
+        '0' => [ "total", "Total reports received" ]
+        '1' => [ "fixed - council", "Council has marked as fixed" ]
+        '2' => [ "fixed_user", "User has marked as fixed" ]
+    };
+    FOR row IN rows %]
+    <tr>
+        <th scope="row">[% row.value.1 %]</th>
+        <td>[% problems.wtd.${row.value.0} %]</td>
+        <td>[% problems.week.${row.value.0} %]</td>
+        <td>[% problems.weeks.${row.value.0} %]</td>
+        <td>[% problems.ytd.${row.value.0} %]</td>
+    </tr>
+    [% END %]
+
+    <tr class='subtotal'>
+        <th scope="row">Total marked as fixed</th>
+        <td>[% problems.wtd.${"fixed - council"} + problems.wtd.fixed_user %]</td>
+        <td>[% problems.week.${"fixed - council"} + problems.week.fixed_user %]</td>
+        <td>[% problems.weeks.${"fixed - council"} + problems.weeks.fixed_user %]</td>
+        <td>[% problems.ytd.${"fixed - council"} + problems.ytd.fixed_user %]</td>
+    </tr>
+
+    [%
+    rows = {
+        '0' => [ "in progress", "Council has marked as in progress" ]
+        '1' => [ "planned", "Council has marked as planned" ]
+        '2' => [ "investigating", "Council has marked as investigating" ]
+    };
+    wtd = 0, week = 0, weeks = 0, ytd = 0;
+    FOR row IN rows %]
+    <tr>
+        <th scope="row">[% row.value.1 %]</th>
+        <td>[% problems.wtd.${row.value.0} %]</td>
+        <td>[% problems.week.${row.value.0} %]</td>
+        <td>[% problems.weeks.${row.value.0} %]</td>
+        <td>[% problems.ytd.${row.value.0} %]</td>
+    </tr>
+    [% END %]
+
+    <tr class='subtotal'>
+        <th scope="row">Total marked</th>
+        <td>[% problems.wtd.${"in progress"} + problems.wtd.planned + problems.wtd.investigating %]</td>
+        <td>[% problems.week.${"in progress"} + problems.week.planned + problems.week.investigating %]</td>
+        <td>[% problems.weeks.${"in progress"} + problems.weeks.planned + problems.weeks.investigating %]</td>
+        <td>[% problems.ytd.${"in progress"} + problems.ytd.planned + problems.ytd.investigating %]</td>
+    </tr>
+
+    <tr>
+        <th scope="row">Average time to fix</th>
+        <td>-</td>
+        <td>-</td>
+        <td>-</td>
+        <td>-</td>
+    </tr>
+
+    <tr>
+        <th scope="row">Average time to mark</th>
+        <td>-</td>
+        <td>-</td>
+        <td>-</td>
+        <td>-</td>
+    </tr>
+
+    <tr class='subtotal'>
+        <th scope="row">Total not marked</th>
+        <td>-</td>
+        <td>-</td>
+        <td>-</td>
+        <td>-</td>
+    </tr>
+
+</table>
+
+<h2>Reports</h2>
+
+                </select>
+<p>Report state: <select name="state">
+<option value=''>All</option>
+                [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
+                loc('Investigating')], ['planned', loc('Planned')], ['in progress',
+                loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
+                    <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option>
+                [% END %]
+</select>
+<input type="submit" value="Look up">
+
+<table width="100%">
+    <tr>
+        <th scope="col">Less than 7 days old</th>
+        <th scope="col">7-14 days old</th>
+        <th scope="col">14-30 days old</th>
+        <th scope="col">30+ days old</th>
+    </tr>
+    <tr>
+        <td><ul><li></li></ul></td>
+        <td><ul><li></li></ul></td>
+        <td><ul><li></li></ul></td>
+        <td><ul><li></li></ul></td>
+    </tr>
+</table>
+
+</form>
+
+[% INCLUDE 'footer.html' %]
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/index.html b/templates/web/default/index.html
index e5f98b0c5..4d178d192 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -51,7 +51,7 @@
 </div>
 
 [% 
-    recent_photos = c.cobrand.recent_photos(3);
+    recent_photos = c.cobrand.recent_photos('front', 3);
     probs         = c.cobrand.recent();
 %]
 
diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html
index 718d10d56..3148d1993 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') | replace("'", "\\'") %]',
             email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
-        }
+        },
+        fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]',
+        first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]',
+        last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]'
     };
diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/default/report/new/councils_text_all.html
index 8514e0b0a..df3388bf3 100644
--- a/templates/web/default/report/new/councils_text_all.html
+++ b/templates/web/default/report/new/councils_text_all.html
@@ -1,5 +1,5 @@
 <p>
-[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' %]
+[% IF area_ids_to_list.0 != 2489 && area_ids_to_list.0 != 2482 && all_councils.${area_ids_to_list.0}.type == 'LBO' %]
 [%
     tprintf(
         loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'),
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..e8c2cadaf
--- /dev/null
+++ b/templates/web/default/report/new/extra_name.html
@@ -0,0 +1,18 @@
+[% 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 %]
+[% title = '' %]
+[% IF fms_extra_title %][% title = fms_extra_title | upper %]
+[% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %]
+<select class="form-focus-trigger" id="form_fms_extra_title"
+    name="fms_extra_title">
+    <option></option>
+    <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option>
+    <option value="MISS"[% ' selected' IF title == 'MISS' %]>Miss</option>
+    <option value="MRS"[% ' selected' IF title == 'MRS' %]>Mrs</option>
+    <option value="MS"[% ' selected' IF title == 'MS' %]>Ms</option>
+    <option value="DR"[% ' selected' IF title == 'DR' %]>Dr</option>
+</select>
+[% END %]
diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html
index 374a7c570..7a17adbc7 100644
--- a/templates/web/default/report/updates.html
+++ b/templates/web/default/report/updates.html
@@ -12,9 +12,13 @@
 
     [% IF update.anonymous || update.name == '' %]
         [% tprintf( loc( 'Posted anonymously at %s' ), prettify_epoch( update.confirmed_local.epoch ) ) -%]
-    [%- ELSIF update.user.from_council %]
-        [% user_name = update.user.name | html %]
-        [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, update.user.council, prettify_epoch( update.confirmed_local.epoch ) ) -%]
+    [%- ELSIF update.user.from_council;
+        user_name = update.user.name | html;
+        council = update.user.council;
+        IF c.cobrand.moniker == 'bromley';
+            council = "$council <img src='/cobrands/bromley/favicon.png' alt=''>";
+        END %]
+        [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, council, prettify_epoch( update.confirmed_local.epoch ) ) -%]
     [%- ELSE %]
         [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%]
     [%- END -%]
diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html
index 0d3d43d82..d1c2241c7 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,12 +72,26 @@ 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>
+            <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[%
+                IF c.cobrand.moniker == 'bromley' AND thing == 'council';
+                    'Get updates of reports in Bromley';
+                ELSIF c.cobrand.moniker == 'bromley';
+                    'Get updates of reports in this ward';
+                ELSE;
+                    tprintf(loc('Get updates of problems in this %s'), thing);
+                END
+            %]</a></li>
             [% IF children.size %]
-            <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% loc('Wards of this council') %]</a></li>
+            <li><a href="#council_wards" id="key-tool-wards" class="chevron">[%
+                IF c.cobrand.moniker == 'bromley';
+                    'View reports by ward';
+                ELSE;
+                    loc('Wards of this council');
+                END
+            %]</a></li>
             [% END %]
         </ul>
     </div>
@@ -81,7 +101,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 +137,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>