Remove final web/fixmystreet templates.

And associated, e.g. nothing references fixmystreet-old-box.js any more.

35 files changed, 168 insertions, 338 deletions

diff --git a/bin/gettext-extract b/bin/gettext-extract
index 694fba66e..1c0771f9e 100755
--- a/bin/gettext-extract
+++ b/bin/gettext-extract
@@ -20,7 +20,7 @@ rm -f $PO
 
 # we don't want to extract strings from all the cobrand templates so list
 # the ones we care about
-find templates/web/base templates/web/fixmystreet templates/web/zurich -name '*.html' > template_list
+find templates/web/base templates/web/zurich -name '*.html' > template_list
 
 # Extract from Perl
 xgettext.pl --gnu-gettext --verbose --output $PO --plugin perl=* --plugin tt2 --directory perllib -f template_list --directory db --directory bin
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 5cc44bb8f..475a29fb5 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -230,7 +230,7 @@ to moderation, however we'd need to inform all the other
 users too about this change, at which point we can delete:
 
  - this method
- - the call to it in templates/web/fixmystreet/report/display.html
+ - the call to it in templates/web/base/report/display_tools.html
  - the users_can_hide cobrand method, in favour of user->has_permission_to
 
 =cut
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 6ba144f0d..4dc024d48 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -20,7 +20,7 @@ use mySociety::PostcodeUtil;
     $path = $cobrand->path_to_web_templates(  );
 
 Returns the path to the templates for this cobrand - by default
-"templates/web/$moniker" and "templates/web/fixmystreet"
+"templates/web/$moniker" (and then base in Web.pm).
 
 =cut
 
@@ -28,7 +28,6 @@ sub path_to_web_templates {
     my $self = shift;
     my $paths = [
         FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify,
-        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify,
     ];
     return $paths;
 }
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 99fe6da15..c8c1eef66 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -8,7 +8,6 @@ sub path_to_web_templates {
     my $self = shift;
     return [
         FixMyStreet->path_to( 'templates/web/fixmystreet.com' )->stringify,
-        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify
     ];
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index b4b91b7dd..0321e0297 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -18,7 +18,6 @@ sub path_to_web_templates {
     return [
         FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify,
         FixMyStreet->path_to( 'templates/web/fixmystreet-uk-councils' )->stringify,
-        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify
     ];
 }
 
diff --git a/t/cobrand/form_extras.t b/t/cobrand/form_extras.t
index 9c20b7ad4..c6f6976d5 100644
--- a/t/cobrand/form_extras.t
+++ b/t/cobrand/form_extras.t
@@ -13,7 +13,6 @@ sub path_to_web_templates {
     my $self = shift;
     return [
         FixMyStreet->path_to( 't/cobrand/form_extras/templates' )->stringify,
-        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify
     ];
 }
 
diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html
index d1a40574e..a7199949d 100644
--- a/templates/web/angus/header.html
+++ b/templates/web/angus/header.html
@@ -26,7 +26,7 @@
 
         <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% version('/cobrands/angus/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html' %]
         [% extra_js %]
 
         [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
diff --git a/templates/web/fixmystreet/alert/list-ajax.html b/templates/web/base/alert/list-ajax.html
index 639af6f07..639af6f07 100644
--- a/templates/web/fixmystreet/alert/list-ajax.html
+++ b/templates/web/base/alert/list-ajax.html
diff --git a/templates/web/base/alert/updates.html b/templates/web/base/alert/updates.html
index 5efc41bac..104bfa55a 100644
--- a/templates/web/base/alert/updates.html
+++ b/templates/web/base/alert/updates.html
@@ -5,16 +5,27 @@
 
 [% INCLUDE 'errors.html' %]
 
+<p><a href="[% c.uri_for( '/rss', problem_id ) %]">
+        <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="float:right">
+    </a>
+</p>
+
 <p>
 [% loc('Receive email when updates are left on this problem.') %]
 </p>
 
 <form action="/alert/subscribe" method="post">
-<label class="n" for="alert_rznvy">[% loc('Email:') %]</label>
-<input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30">
-<input type="hidden" name="id" value="[% problem_id | html %]">
-<input type="hidden" name="type" value="updates">
-<input type="submit" value="[% loc('Subscribe') %]">
+    <fieldset>
+        <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label>
+
+        <div class="form-txt-submit-box">
+            <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" placeholder="[% loc('Your email') %]">
+            <input class="green-btn" type="submit" value="[% loc('Subscribe') %]">
+        </div>
+
+        <input type="hidden" name="id" value="[% problem_id | html %]">
+        <input type="hidden" name="type" value="updates">
+    </fieldset>
 </form>
 
 
diff --git a/templates/web/base/around/_main.html b/templates/web/base/around/_main.html
index 1b832cb49..900dcb6aa 100644
--- a/templates/web/base/around/_main.html
+++ b/templates/web/base/around/_main.html
@@ -1,8 +1,3 @@
-<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
-    <div id="side-form">
-        <div id="report-a-problem-main">
-            [% pre_container_extra %]
-            [% INCLUDE 'around/_error_multiple.html' %]
-        </div>
-    </div>
-</form>
+<div class="tablewrapper">
+    [% INCLUDE 'around/_error_multiple.html' %]
+</div>
diff --git a/templates/web/base/around/_updates.html b/templates/web/base/around/_updates.html
index 8110a6c7c..458983e8f 100755
--- a/templates/web/base/around/_updates.html
+++ b/templates/web/base/around/_updates.html
@@ -1,12 +1,5 @@
-<h1>[% loc('Problems in this area') %]</h1>
-
-<p id="alert_links_area">
-    <a id="email_alert" rel="nofollow" href="[% email_url | html %]">
-        [%- loc('Email me new local problems') -%]
-</a> |
-    <a href="[% rss_url | html %]" id="rss_alert">
-        <span>[% rss_alt %]</span>
-        <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top">
-    </a>
-</p>
-
+<div class="shadow-wrap">
+    <ul id="key-tools" class="singleton">
+        <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li>
+    </ul>
+</div>
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index d13509a7a..99d409362 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript" src="[% start %][% version('/js/geo.min.js') %]"></script>
 <script type="text/javascript" src="[% start %][% version('/js/fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% start %][% version(js_override || '/js/fixmystreet-old-box.js') %]"></script>
+<script type="text/javascript" src="[% start %][% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script>
 
 [% IF admin %]
   <script src="[% start %]/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js"></script>
diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index 3f4e5b551..7626736a0 100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
@@ -1,33 +1,53 @@
-    </div><!-- #mysociety .container -->
-
-    <div id="navigation" class="container" role="navigation">
-        <div class="spacer"></div>
-        <ul id="site-nav" class="nav">
-            <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END
-                %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-            %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
-                %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-            %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END
-                %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-            %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-            %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-        </ul>
-
-    </div>
-
-</div></div></div><!-- wrappers -->
-
-<div id="footer">
-
-    <p><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) | replace(' ', '&nbsp;') %]</a></p>
-      
-    [% INCLUDE 'front/footer-marketing.html' %]
-
-</div>
-
-[% INCLUDE 'debug_footer.html' %]
+                    [% IF pagefooter %]
+                    <footer role="contentinfo">
+                        [% INCLUDE 'front/footer-marketing.html' %]
+                    </footer>
+                    [% END %]
+                </div><!-- .content role=main -->
+            </div><!-- .container -->
+            [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %]
+                [% INCLUDE 'footer-nav.html' %]
+            [% END %]
+        </div><!-- .table-cell -->
+
+        <div class="nav-wrapper">
+            <div class="nav-wrapper-2">
+                <div id="main-nav" role="navigation">
+                    <ul class="nav-menu nav-menu--mysoc">
+                        <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li>
+                    </ul>
+[%
+    SET base = "";
+    SET base = c.cobrand.base_url IF admin;
+%]
+                    <ul class="nav-menu nav-menu--main">
+                        <li><[% IF c.req.uri.path == '/'
+                            %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn"
+                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
+                        %]<li><[% IF c.req.uri.path == '/my'
+                            %]span[% ELSE %]a href="[% base %]/my"[% END
+                            %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+                        %]<li><[% IF c.req.uri.path == '/reports'
+                            %]span[% ELSE %]a href="[% base %]/reports"[% END
+                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
+                        %]<li><[% IF c.req.uri.path == '/alert'
+                            %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
+                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
+                        %]<li><[% IF c.req.uri.path == '/faq'
+                            %]span[% ELSE %]a href="[% base %]/faq"[% END
+                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
+                        %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy'
+                            %]span[% ELSE %]a href="[% base %]/privacy"[% END
+                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+<!-- [% INCLUDE 'debug_footer.html' %] -->
+    </div> <!-- .wrapper -->
+
+    [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %]
 
 </body>
 </html>
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index 1d7960661..7ef37675a 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -1,30 +1,61 @@
+[%
+    SET html_att = ' lang="' _ lang_code _ '"';
+    # For a right-to-left language, use the following line in your own header:
+    # SET html_att = html_att _ ' dir="rtl"';
+-%]
 <!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]>   <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]>   <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8"[% html_att %]><![endif]-->
+<!--[if IE 7]>   <html class="no-js ie7 iel8"[% html_att %]><![endif]-->
+<!--[if IE 8]>   <html class="no-js ie8 iel8"[% html_att %]><![endif]-->
+<!--[if IE 9]>   <html class="no-js ie9"[% html_att %]><![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]-->
     <head>
         <meta name="viewport" content="initial-scale=1.0">
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
         <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
         <meta name="HandHeldFriendly" content="true">
         <meta name="mobileoptimized" content="0">
 
         [% INCLUDE 'header_opengraph.html' %]
+        [% SET start = c.config.ADMIN_BASE_URL IF admin;
 
-        <link rel="stylesheet" href="[% version('/css/core.css') %]">
+           # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts
+           # it stylesheets under fixmystreet.com
+           IF c.cobrand.moniker == 'fixmystreet';
+               SET css_dir = 'fixmystreet.com';
+           ELSE;
+               SET css_dir = c.cobrand.moniker;
+           END %]
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]">
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)">
+        [% extra_css %]
+        <!--[if (lt IE 9) & (!IEMobile)]>
+            <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]">
+        <![endif]-->
 
+        <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+        <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
         [% INCLUDE 'common_header_tags.html' %]
-                
-    </head>
-    <body>
+        [% extra_js %]
+
+        [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
+            <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]">
+        [% END %]
 
-<div id="wrapper"><div id="wrapper2"><div id="wrapper3">
+        [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
+
+    </head>
+    [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
+    <body class="[% bodyclass | html IF bodyclass %]">
 
-        [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END
-            %][% loc('FixMyStreet') %]
-        [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
+    <div class="wrapper">
+        <div class="table-cell">
+            <header id="site-header" role="banner">
+                <div class="container">
+                    [% INCLUDE 'header_logo.html' %]
+                    <a href="#main-nav" id="nav-link">Main Navigation</a>
+                </div>
+            </header>
 
           [% IF c.user_exists %]
             <div id="user-meta">
@@ -37,6 +68,7 @@
 
             [% pre_container_extra %]
 
-    <div id="mysociety" class="container" role="main">
+            <div class="container">
+                <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
 
-    [% INCLUDE 'debug_header.html' %]
+        <!-- [% INCLUDE 'debug_header.html' %] -->
diff --git a/templates/web/base/header_logo.html b/templates/web/base/header_logo.html
index e69de29bb..66378235a 100644
--- a/templates/web/base/header_logo.html
+++ b/templates/web/base/header_logo.html
@@ -0,0 +1,2 @@
+                    <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a>
+                    <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
diff --git a/templates/web/base/reports/_rss.html b/templates/web/base/reports/_rss.html
index 9756f131d..f2d164bfa 100644
--- a/templates/web/base/reports/_rss.html
+++ b/templates/web/base/reports/_rss.html
@@ -1,2 +1,19 @@
-<p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a>
+<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 %]">[%
+            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';
+            ELSIF c.cobrand.is_council;
+                tprintf(loc('Get updates of %s problems'), thing);
+            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">[% ward_text %]</a></li>
+        [% END %]
+    </ul>
+</div>
 
diff --git a/templates/web/base/reports/_ward-list.html b/templates/web/base/reports/_ward-list.html
index e78ac7d90..b7e19ffc2 100755
--- a/templates/web/base/reports/_ward-list.html
+++ b/templates/web/base/reports/_ward-list.html
@@ -1,9 +1,14 @@
-[% IF location == 'before' AND children.size %]
-<h2 style="clear:right">[% ward_text %]</h2>
-<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
-<ul>
-[% FOR child IN children.values.sort('name') %]
-<li><a href="[% child.url %]">[% child.name %]</a></li>
-[% END %]
-</ul>
+[% IF location == 'after' AND children.size %]
+<section id="council_wards" class="hidden-js">
+<h2>[% ward_text %]</h2>
+    <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
+    <ul class="item-list item-list--wards full-width">
+      [% FOR child IN children.values.sort('name') %]
+        <li class="item-list__item item-list--wards__item">
+            <a href="[% child.url %]">[% child.name %]</a>
+        </li>
+      [% END %]
+    </ul>
+</section>
 [% END %]
+
diff --git a/templates/web/eastsussex/header.html.template b/templates/web/eastsussex/header.html.template
index 1ca60f4b7..d80d4101a 100644
--- a/templates/web/eastsussex/header.html.template
+++ b/templates/web/eastsussex/header.html.template
@@ -11,7 +11,7 @@
     <![endif]-->
 
     <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/position_map.js') %]" charset="utf-8"></script>
-    [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+    [% INCLUDE 'common_header_tags.html' %]
     [% extra_js %]
     <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script>
 
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index ac607be8a..5bc0eaf4b 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -24,7 +24,7 @@
 
         <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html' %]
         [% extra_js %]
 
         [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
diff --git a/templates/web/fixmystreet/about/fun.html b/templates/web/fixmystreet.com/about/fun.html
index 03d977d44..03d977d44 100644
--- a/templates/web/fixmystreet/about/fun.html
+++ b/templates/web/fixmystreet.com/about/fun.html
diff --git a/templates/web/fixmystreet/alert/updates.html b/templates/web/fixmystreet/alert/updates.html
deleted file mode 100644
index 2240844e4..000000000
--- a/templates/web/fixmystreet/alert/updates.html
+++ /dev/null
@@ -1,32 +0,0 @@
-[% title = loc('Local RSS feeds and email alerts') %]
-
-[% INCLUDE 'header.html', title => title %]
-
-
-[% INCLUDE 'errors.html' %]
-
-<p><a href="[% c.uri_for( '/rss', problem_id ) %]">
-        <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="float:right">
-    </a>
-</p>
-
-<p>
-[% loc('Receive email when updates are left on this problem.') %]
-</p>
-
-<form action="/alert/subscribe" method="post">
-	<fieldset>
-		<label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label>
-		
-		<div class="form-txt-submit-box">
-			<input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" placeholder="[% loc('Your email') %]">
-			<input class="green-btn" type="submit" value="[% loc('Subscribe') %]">
-		</div>
-		
-		<input type="hidden" name="id" value="[% problem_id | html %]">
-		<input type="hidden" name="type" value="updates">
-	</fieldset>
-</form>
-
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet/around/_main.html b/templates/web/fixmystreet/around/_main.html
deleted file mode 100644
index 900dcb6aa..000000000
--- a/templates/web/fixmystreet/around/_main.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="tablewrapper">
-    [% INCLUDE 'around/_error_multiple.html' %]
-</div>
diff --git a/templates/web/fixmystreet/around/_updates.html b/templates/web/fixmystreet/around/_updates.html
deleted file mode 100755
index 458983e8f..000000000
--- a/templates/web/fixmystreet/around/_updates.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="shadow-wrap">
-    <ul id="key-tools" class="singleton">
-        <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li>
-    </ul>
-</div>
diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html
deleted file mode 100644
index 7626736a0..000000000
--- a/templates/web/fixmystreet/footer.html
+++ /dev/null
@@ -1,53 +0,0 @@
-                    [% IF pagefooter %]
-                    <footer role="contentinfo">
-                        [% INCLUDE 'front/footer-marketing.html' %]
-                    </footer>
-                    [% END %]
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-            [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %]
-                [% INCLUDE 'footer-nav.html' %]
-            [% END %]
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--mysoc">
-                        <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li>
-                    </ul>
-[%
-    SET base = "";
-    SET base = c.cobrand.base_url IF admin;
-%]
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/'
-                            %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my'
-                            %]span[% ELSE %]a href="[% base %]/my"[% END
-                            %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/reports'
-                            %]span[% ELSE %]a href="[% base %]/reports"[% END
-                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/alert'
-                            %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq'
-                            %]span[% ELSE %]a href="[% base %]/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-                        %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy'
-                            %]span[% ELSE %]a href="[% base %]/privacy"[% END
-                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-<!-- [% INCLUDE 'debug_footer.html' %] -->
-    </div> <!-- .wrapper -->
-
-    [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %]
-
-</body>
-</html>
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
deleted file mode 100644
index bc9e16af8..000000000
--- a/templates/web/fixmystreet/header.html
+++ /dev/null
@@ -1,74 +0,0 @@
-[%
-    SET html_att = ' lang="' _ lang_code _ '"';
-    # For a right-to-left language, use the following line in your own header:
-    # SET html_att = html_att _ ' dir="rtl"';
--%]
-<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 iel8"[% html_att %]><![endif]-->
-<!--[if IE 7]>   <html class="no-js ie7 iel8"[% html_att %]><![endif]-->
-<!--[if IE 8]>   <html class="no-js ie8 iel8"[% html_att %]><![endif]-->
-<!--[if IE 9]>   <html class="no-js ie9"[% html_att %]><![endif]-->
-<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]-->
-    <head>
-        <meta name="viewport" content="initial-scale=1.0">
-
-        <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-        <meta name="HandHeldFriendly" content="true">
-        <meta name="mobileoptimized" content="0">
-
-        [% INCLUDE 'header_opengraph.html' %]
-        [% SET start = c.config.ADMIN_BASE_URL IF admin;
-
-           # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts
-           # it stylesheets under fixmystreet.com
-           IF c.cobrand.moniker == 'fixmystreet';
-               SET css_dir = 'fixmystreet.com';
-           ELSE;
-               SET css_dir = c.cobrand.moniker;
-           END %]
-        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]">
-        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)">
-        [% extra_css %]
-        <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]">
-        <![endif]-->
-
-        <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
-        <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
-        [% extra_js %]
-
-        [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
-            <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]">
-        [% END %]
-
-        [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
-
-    </head>
-    [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
-    <body class="[% bodyclass | html IF bodyclass %]">
-
-    <div class="wrapper">
-        <div class="table-cell">
-            <header id="site-header" role="banner">
-                <div class="container">
-                    [% INCLUDE 'header_logo.html' %]
-                    <a href="#main-nav" id="nav-link">Main Navigation</a>
-                </div>
-            </header>
-
-          [% IF c.user_exists %]
-            <div id="user-meta">
-                <p>
-                    [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
-                    <a href="/auth/sign_out">[% loc('sign out') %]</a>
-                </p>
-            </div>
-          [% END %]
-
-            [% pre_container_extra %]
-
-            <div class="container">
-                <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
-
-        <!-- [% INCLUDE 'debug_header.html' %] -->
diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html
deleted file mode 100644
index 66378235a..000000000
--- a/templates/web/fixmystreet/header_logo.html
+++ /dev/null
@@ -1,2 +0,0 @@
-                    <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a>
-                    <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
diff --git a/templates/web/fixmystreet/reports/_rss.html b/templates/web/fixmystreet/reports/_rss.html
deleted file mode 100644
index f2d164bfa..000000000
--- a/templates/web/fixmystreet/reports/_rss.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<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 %]">[%
-            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';
-            ELSIF c.cobrand.is_council;
-                tprintf(loc('Get updates of %s problems'), thing);
-            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">[% ward_text %]</a></li>
-        [% END %]
-    </ul>
-</div>
-
diff --git a/templates/web/fixmystreet/reports/_ward-list.html b/templates/web/fixmystreet/reports/_ward-list.html
deleted file mode 100755
index b7e19ffc2..000000000
--- a/templates/web/fixmystreet/reports/_ward-list.html
+++ /dev/null
@@ -1,14 +0,0 @@
-[% IF location == 'after' AND children.size %]
-<section id="council_wards" class="hidden-js">
-<h2>[% ward_text %]</h2>
-    <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
-    <ul class="item-list item-list--wards full-width">
-      [% FOR child IN children.values.sort('name') %]
-        <li class="item-list__item item-list--wards__item">
-            <a href="[% child.url %]">[% child.name %]</a>
-        </li>
-      [% END %]
-    </ul>
-</section>
-[% END %]
-
diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html
index bd319e250..451832dda 100644
--- a/templates/web/harrogate/header.html
+++ b/templates/web/harrogate/header.html
@@ -24,7 +24,7 @@
 
         <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html' %]
         [% extra_js %]
 
         [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html
index b7b4fefcc..6337aad64 100644
--- a/templates/web/hart/header.html
+++ b/templates/web/hart/header.html
@@ -25,7 +25,7 @@
 
         <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html' %]
         [% extra_js %]
         <script type="text/javascript">
             $(function(){
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index b4244a51b..e69757dad 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -22,7 +22,7 @@
 
         <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% start %][% version('/cobrands/oxfordshire/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html' %]
         [% extra_js %]
 
         [% INCLUDE 'tracking_code.html' %]
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
index 87fb0d90d..11e362612 100644
--- a/templates/web/stevenage/header.html
+++ b/templates/web/stevenage/header.html
@@ -20,7 +20,7 @@
 
         <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html' %]
         [% extra_js %]
                 
         [% INCLUDE 'tracking_code.html' %]
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 35baeacd7..c6d2bc048 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -29,7 +29,7 @@
     <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
     <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/position_map.js') %]" charset="utf-8"></script>
 
-    [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+    [% INCLUDE 'common_header_tags.html' %]
 
     [% extra_js %]
     [% PROCESS 'header_extra.html' %]
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index 7e88f3f0f..ee00b851c 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -24,7 +24,7 @@
 
         <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
+        [% INCLUDE 'common_header_tags.html' %]
         [% extra_js %]
 
         <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script>
diff --git a/web/js/fixmystreet-old-box.js b/web/js/fixmystreet-old-box.js
deleted file mode 100644
index 72eeafb4d..000000000
--- a/web/js/fixmystreet-old-box.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * fixmystreet-old-box.js
- * Create the 'email me updates' pop up box on old-style report display pages.
- */
-
-$(function(){
-
-    if (!$('#email_alert_box').length) {
-        return;
-    }
-
-    var timer;
-    function email_alert_close() {
-        $('#email_alert_box').hide('fast');
-    }
-
-    $('#email_alert').click(function(e) {
-        e.preventDefault();
-        if ($('#email_alert_box').is(':visible')) {
-            email_alert_close();
-        } else {
-            var pos = $(this).position();
-            $('#email_alert_box').css( { 'left': ( pos.left - 20 ) + 'px', 'top': ( pos.top + 20 ) + 'px' } );
-            $('#email_alert_box').show('fast');
-            $('#alert_rznvy').focus();
-        }
-    }).hover(function() {
-        window.clearTimeout(timer);
-    }, function() {
-        timer = window.setTimeout(email_alert_close, 2000);
-    });
-
-    $('#email_alert_box').hover(function() {
-        window.clearTimeout(timer);
-    }, function() {
-        timer = window.setTimeout(email_alert_close, 2000);
-    });
-
-});