5 files changed, 21 insertions, 8 deletions
diff --git a/templates/web/base/admin/stats/index.html b/templates/web/base/admin/stats/index.html
index d47054427..452af001e 100644
--- a/templates/web/base/admin/stats/index.html
+++ b/templates/web/base/admin/stats/index.html
@@ -5,6 +5,15 @@
 <li><a href="[% c.uri_for_action('admin/stats/state') %]">[% loc('Problem breakdown by state') %]</a></li>
 <li><a href="[% c.uri_for_action('admin/stats/fix_rate') %]">[% loc('Category fix rate for problems > 4 weeks old') %]</a></li>
 <li><a href="[% c.uri_for_action('dashboard/index') %]">[% loc('Summary statistics') %]</a></li>
+[% IF c.cobrand.feature('heatmap').keys %]
+    <li>[% loc('Heatmap') %] <ul>
+      [% FOR body IN c.cobrand.feature('heatmap').pairs %]
+        <li><a href="[% c.uri_for_action('dashboard/heatmap') %]?body=[% body.value %]">[% body.key %]</a></li>
+      [% END %]
+    </ul> </li>
+[% ELSIF c.cobrand.feature('heatmap') %]
+<li><a href="[% c.uri_for_action('dashboard/heatmap') %]">[% loc('Heatmap') %]</a></li>
+[% END %]
 [% IF c.cobrand.moniker == 'fixmystreet' %]
 <li><a href="[% c.uri_for_action('admin/stats/refused') %]">Refused</a></li>
 [% END %]
diff --git a/templates/web/bromley/about/heatmap-list.html b/templates/web/base/dashboard/heatmap-list.html
index e04df8581..d736a11f4 100644
--- a/templates/web/bromley/about/heatmap-list.html
+++ b/templates/web/base/dashboard/heatmap-list.html
@@ -2,7 +2,7 @@
 [% INCLUDE column problems = five_newest %]
 
 <h3>Five most recent commented reports<br>
-<small>Not from yourself or Confirm</small>
+<small>Not from yourself/backend</small>
 </h3>
 [% INCLUDE column problems = five_commented %]
 
diff --git a/templates/web/bromley/about/heatmap.html b/templates/web/base/dashboard/heatmap.html
index 0cb8bfb1b..ba5c10c17 100755
--- a/templates/web/bromley/about/heatmap.html
+++ b/templates/web/base/dashboard/heatmap.html
@@ -1,5 +1,8 @@
 [%
-    map_js.push(version('/cobrands/bromley/HeatmapLayer.js'));
+    map_js.push(
+        '/vendor/HeatmapLayer.js',
+        '/cobrands/fixmystreet/density-map.js',
+    );
     PROCESS "maps/${map.type}.html";
     SET bodyclass = 'mappage';
     INCLUDE 'header.html',
@@ -18,7 +21,9 @@
 
 <div class="full-width">
 
-[% INCLUDE "reports/_list-filters.html", use_form_wrapper = 1 %]
+[% INCLUDE "reports/_list-filters.html", use_form_wrapper = 1 heatmap=1 %]
+
+<input type="hidden" id="body" name="body" value="[% body.id | html %]">
 
 <p class="report-list-filters" style='padding-top:0.25em'>
     From <input type="date" id="start_date" name="start_date" class="form-control" value="[% start_date | html %]">
@@ -35,14 +40,14 @@ In wards <select class="form-control js-multiple" multiple id="wards" name="ward
 </div>
 
 <p class="segmented-control segmented-control--radio">
-    <input type="radio" name="heatmap" id="heatmap_yes" value="Yes">
+    <input type="radio" name="heatmap" id="heatmap_yes" value="Yes" checked>
     <label class="btn" for="heatmap_yes">Heatmap</label>
-    <input type="radio" name="heatmap" id="heatmap_no" value="No" checked>
+    <input type="radio" name="heatmap" id="heatmap_no" value="No">
     <label class="btn" for="heatmap_no">Pin map</label>
 </p>
 
 <div id="js-reports-list">
-    [% INCLUDE 'about/heatmap-list.html' %]
+    [% INCLUDE 'dashboard/heatmap-list.html' %]
 </div>
 
     </div>
diff --git a/templates/web/base/reports/_list-filter-status.html b/templates/web/base/reports/_list-filter-status.html
index 6923a7929..6fa998fc1 100644
--- a/templates/web/base/reports/_list-filter-status.html
+++ b/templates/web/base/reports/_list-filter-status.html
@@ -20,7 +20,7 @@
     [%~ END ~%]
     [% INCLUDE 'reports/_status_filter_options.html' %]
     >
-      [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') AND !shortlist %]
+      [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') AND !shortlist AND !heatmap %]
         <option value="shortlisted"[% ' selected' IF filter_status.shortlisted %]>[% loc('Shortlisted') %]</option>
         <option value="unshortlisted"[% ' selected' IF filter_status.unshortlisted %]>[% loc('Unshortlisted') %]</option>
       [% END %]
diff --git a/templates/web/bromley/footer_extra_js.html b/templates/web/bromley/footer_extra_js.html
index 26c8fe9f5..b58dda570 100644
--- a/templates/web/bromley/footer_extra_js.html
+++ b/templates/web/bromley/footer_extra_js.html
@@ -5,7 +5,6 @@
 ) %]
 [% IF bodyclass.match('mappage');
     scripts.push(
-        version('/cobrands/bromley/js.js'),
         version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
         version('/cobrands/fixmystreet/assets.js'),
         version('/cobrands/bromley/map.js'),