Merge branch 'uk-council-footer-tidy'

28 files changed, 178 insertions, 300 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
index bf77b5cf1..486e9603d 100644
--- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm
@@ -1,5 +1,5 @@
 package FixMyStreet::Cobrand::Buckinghamshire;
-use parent 'FixMyStreet::Cobrand::UKCouncils';
+use parent 'FixMyStreet::Cobrand::Whitelabel';
 
 use strict;
 use warnings;
diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index 757692f48..d39bd5dd2 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 
 sub council_area_id { return 2493; }
-sub council_area { return 'Greenwich'; }
+sub council_area { return 'Royal Borough of Greenwich'; }
 sub council_name { return 'Royal Borough of Greenwich'; }
 sub council_url { return 'greenwich'; }
 
diff --git a/perllib/FixMyStreet/Cobrand/Lincolnshire.pm b/perllib/FixMyStreet/Cobrand/Lincolnshire.pm
index 2cb1844c6..3b731b273 100644
--- a/perllib/FixMyStreet/Cobrand/Lincolnshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Lincolnshire.pm
@@ -1,5 +1,5 @@
 package FixMyStreet::Cobrand::Lincolnshire;
-use parent 'FixMyStreet::Cobrand::UKCouncils';
+use parent 'FixMyStreet::Cobrand::Whitelabel';
 
 use strict;
 use warnings;
diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index e2bdbb01a..e2bdbb01a 100755..100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
diff --git a/templates/web/base/main_nav_items.html b/templates/web/base/main_nav_items.html
index 75fdecd9d..4b031cbaa 100644
--- a/templates/web/base/main_nav_items.html
+++ b/templates/web/base/main_nav_items.html
@@ -27,8 +27,8 @@
     END;
 
     reports_uri = '/reports';
-    IF body_name;
-       body_name = body_name | uri;
+    IF c.cobrand.council_area;
+       body_name = c.cobrand.council_area | uri;
        reports_uri = "${reports_uri}/${body_name}";
     END;
 
diff --git a/templates/web/bexley/main_nav_items.html b/templates/web/bexley/main_nav_items.html
index 44edd68a8..9522238f4 100644
--- a/templates/web/bexley/main_nav_items.html
+++ b/templates/web/bexley/main_nav_items.html
@@ -16,8 +16,8 @@
     END;
 
     reports_uri = '/reports';
-    IF body_name;
-       body_name = body_name | uri;
+    IF c.cobrand.council_area;
+       body_name = c.cobrand.council_area | uri;
        reports_uri = "${reports_uri}/${body_name}";
     END;
 
diff --git a/templates/web/bristol/footer.html b/templates/web/bristol/footer.html
deleted file mode 100644
index 794dbe457..000000000
--- a/templates/web/bristol/footer.html
+++ /dev/null
@@ -1,23 +0,0 @@
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="container">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
-            </div>
-        </div>
-    </div> <!-- .wrapper -->
-
-    [% IF pagefooter %]
-      <div class="bristol_footer">
-        <footer role="contentinfo" class="clearfix">
-            [% INCLUDE 'front/footer-marketing.html' %]
-        </footer>
-      </div>
-    [% END %]
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
diff --git a/templates/web/bristol/footer_extra.html b/templates/web/bristol/footer_extra.html
new file mode 100644
index 000000000..ea586e26d
--- /dev/null
+++ b/templates/web/bristol/footer_extra.html
@@ -0,0 +1,5 @@
+<div class="bristol_footer">
+    <footer role="contentinfo" class="clearfix">
+        [% INCLUDE 'front/footer-marketing.html' %]
+    </footer>
+</div>
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index 5ac94ba83..914ba3ace 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -9,7 +9,7 @@
 
         <div class="nav-wrapper">
             <div class="container">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 %]
+                [% INCLUDE "main_nav.html" hide_privacy_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/buckinghamshire/footer.html b/templates/web/buckinghamshire/footer.html
deleted file mode 100644
index 81553e00e..000000000
--- a/templates/web/buckinghamshire/footer.html
+++ /dev/null
@@ -1,23 +0,0 @@
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="container">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
-            </div>
-        </div>
-    </div> <!-- .wrapper -->
-
-    [% IF pagefooter %]
-      <div class="bucks_footer">
-        <footer role="contentinfo" class="clearfix">
-            [% INCLUDE 'front/footer-marketing.html' %]
-        </footer>
-      </div>
-    [% END %]
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
diff --git a/templates/web/buckinghamshire/front/footer-marketing.html b/templates/web/buckinghamshire/front/footer-marketing.html
deleted file mode 100644
index e69de29bb..000000000
--- a/templates/web/buckinghamshire/front/footer-marketing.html
+++ /dev/null
diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html
deleted file mode 100644
index e8a54e462..000000000
--- a/templates/web/eastherts/footer.html
+++ /dev/null
@@ -1,54 +0,0 @@
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="container">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
-            </div>
-        </div>
-    </div> <!-- .wrapper -->
-
-    [% IF pagefooter %]
-	<div class="footer clearfix">
-		<div class="container">
-			<div class="footer__left"><img src="https://www.eastherts.gov.uk/image/29958/EastHertsLogo-Footer/original.png" width="250" height="75" alt="EastHertsLogo-Footer" title="EastHertsLogo-Footer" class="footer__logo" />
-				<div class="footer__socialmedia">
-				
-				<a href="https://www.facebook.com" rel="external" title="Facebook"><img src="https://www.eastherts.gov.uk/image/29956/Facebook/original.png" width="40" height="40" alt="Facebook" title="Facebook" />
-				</a>
-				
-				<a href="https://www.twitter.com" rel="external" title="Twitter"><img src="https://www.eastherts.gov.uk/image/29959/Twitter/original.png" width="40" height="40" alt="Twitter" title="Twitter" />
-				</a><img src="https://www.eastherts.gov.uk/image/29957/RSS/original.png" width="40" height="40" alt="RSS" title="RSS" />
-				</div>
-			</div>
-			<div class="footer__right">
-		<div class="footer__navigation">
-				<ul>
-							<li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34224/Site-map" class="footer__navlink">Site map</a>
-							</li>
-							<li class="footer__navitem"><a href="/article/34226/Terms--Conditions" class="footer__navlink">Terms & Conditions</a>
-							</li>
-							<li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34230/Privacy--Cookies" class="footer__navlink">Privacy & Cookies</a>
-							</li>
-							<li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34378/Privacy-Data-Protection-and-Fraud-Prevention" class="footer__navlink">Privacy, Data Protection and Fraud Prevention</a>
-							</li>
-							<li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34376/Comments-Compliments-and-Complaints" class="footer__navlink" accesskey="7">Comments, Compliments and Complaints</a>
-							</li>
-				</ul>
-		</div>
-				<div class="footer__copyright">
-					<p>&copy; 2017 mySociety</p>
-				</div>
-				<div class="footer__goss">
-					<a href="https://www.fixmystreet.com/pro/">Powered by FixMyStreet</a>
-				</div>
-			</div>
-		</div>
-	</div>
-    [% END %]
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
diff --git a/templates/web/eastherts/footer_extra.html b/templates/web/eastherts/footer_extra.html
new file mode 100644
index 000000000..de0a9fab0
--- /dev/null
+++ b/templates/web/eastherts/footer_extra.html
@@ -0,0 +1,36 @@
+<div class="footer clearfix">
+    <div class="container">
+        <div class="footer__left"><img src="https://www.eastherts.gov.uk/image/29958/EastHertsLogo-Footer/original.png" width="250" height="75" alt="EastHertsLogo-Footer" title="EastHertsLogo-Footer" class="footer__logo" />
+            <div class="footer__socialmedia">
+            
+            <a href="https://www.facebook.com" rel="external" title="Facebook"><img src="https://www.eastherts.gov.uk/image/29956/Facebook/original.png" width="40" height="40" alt="Facebook" title="Facebook" />
+            </a>
+            
+            <a href="https://www.twitter.com" rel="external" title="Twitter"><img src="https://www.eastherts.gov.uk/image/29959/Twitter/original.png" width="40" height="40" alt="Twitter" title="Twitter" />
+            </a><img src="https://www.eastherts.gov.uk/image/29957/RSS/original.png" width="40" height="40" alt="RSS" title="RSS" />
+            </div>
+        </div>
+        <div class="footer__right">
+    <div class="footer__navigation">
+            <ul>
+                        <li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34224/Site-map" class="footer__navlink">Site map</a>
+                        </li>
+                        <li class="footer__navitem"><a href="/article/34226/Terms--Conditions" class="footer__navlink">Terms & Conditions</a>
+                        </li>
+                        <li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34230/Privacy--Cookies" class="footer__navlink">Privacy & Cookies</a>
+                        </li>
+                        <li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34378/Privacy-Data-Protection-and-Fraud-Prevention" class="footer__navlink">Privacy, Data Protection and Fraud Prevention</a>
+                        </li>
+                        <li class="footer__navitem"><a href="https://www.eastherts.gov.uk/article/34376/Comments-Compliments-and-Complaints" class="footer__navlink" accesskey="7">Comments, Compliments and Complaints</a>
+                        </li>
+            </ul>
+    </div>
+            <div class="footer__copyright">
+                <p>&copy; 2017 mySociety</p>
+            </div>
+            <div class="footer__goss">
+                <a href="https://www.fixmystreet.com/pro/">Powered by FixMyStreet</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html
deleted file mode 100644
index 7cc4f185c..000000000
--- a/templates/web/greenwich/footer.html
+++ /dev/null
@@ -1,20 +0,0 @@
-                    [% IF pagefooter %]
-                    <footer role="contentinfo">
-                        [% INCLUDE 'front/footer-marketing.html' %]
-                    </footer>
-                    [% END %]
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="container">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name %]
-            </div>
-        </div>
-    </div> <!-- .wrapper -->
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html
index cfe485af1..a38e166a9 100644
--- a/templates/web/greenwich/header_logo.html
+++ b/templates/web/greenwich/header_logo.html
@@ -15,4 +15,4 @@
         <li><a href="/">FixMyStreet</a></li>
     </ul>
 
-    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name hide_privacy_link=1 ul_id="fms-menu-desktop" ul_class="" omit_wrapper=1 %]
+    [% INCLUDE "main_nav.html" hide_privacy_link=1 ul_id="fms-menu-desktop" ul_class="" omit_wrapper=1 %]
diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html
index 5a53fb978..15ed6611c 100644
--- a/templates/web/hart/footer.html
+++ b/templates/web/hart/footer.html
@@ -6,7 +6,7 @@
 
     <div class="nav-wrapper clearfix">
       <div class="container container--hart">
-        [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area ul_class="nav-menu nav-menu--first" hide_privacy_link=1 %]
+        [% INCLUDE "main_nav.html" ul_class="nav-menu nav-menu--first" hide_privacy_link=1 %]
       </div>
       <div class="container">
             <div id="main-nav--hart" role="navigation">
@@ -31,76 +31,9 @@
                     </li>
                 </ul>
             </div>
-            <div class="sign-in">
-                [% IF c.user_exists %]
-                    <p>
-                        [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
-                        <a href="/auth/sign_out">[% loc('sign out') %]</a>
-                    </p>
-                [% END %]
-            </div>
         </div>
     </div>
 
-    <footer id="hart-footer">
-      <div id="footer-inner" class="container">
-        <div id="footer-row-1" class="clearfix row">
-          <p class="desk-only">
-            <strong>©</strong>
-            <a href="http://www.hart.gov.uk/disclaimer" title="More information on the Disclaimer" class="hart">Hart District Council</a>
-            <a href="http://www.gov.uk/" title="GOV.UK">GOV.UK</a>
-          </p>
-          <ul id="footer-nav">
-              <li> <a href="http://www.hart.gov.uk/Accessibility">Accessibility</a> </li>
-              <li class="mob-only"> <a href="http://www.gov.uk/" title="GOV.UK">GOV.UK</a> </li>
-              <li> <a href="http://www.hart.gov.uk/privacy">Privacy</a> </li>
-              <li class="mob-only"> <a href="http://www3.basingstoke.gov.uk/ccmwa/chat/a6f6143d-407f-4f99-b673-6feb98b54815">Web Chat</a> </li>
-              <li class="mob-only"> <a href="https://www.hart.gov.uk/contact-us">Contact us</a> </li>
-              <li class="mob-only"> <a href="https://www.hart.gov.uk/feedback">Feedback</a> </li>
-              <li class="mob-only bottom"> <a href="https://www.hart.gov.uk/user/login?current=node/1">Login</a> </li>
-              <li class="mob-only bottom"> <a href="https://www.hart.gov.uk/user/register">Register</a> </li>
-          </ul>
-        </div>
-        <div id="footer-row-2" class="clearfix row">
-          <ul id="footer-images">
-            <li>
-              <a href="https://www.facebook.com/HartDistrictCouncil">
-                <img alt="Facebook" src="/cobrands/hart/facebook-logo.png" style="width: 50px; height: 50px;">
-              </a>
-            </li>
-            <li>
-              <a href="https://twitter.com/HartCouncil">
-                <img alt="Twitter" src="/cobrands/hart/twitter-logo.png" style="width: 50px; height: 50px;">
-              </a>
-            </li>
-            <li>
-              <a href="https://www.youtube.com/channel/UCtkLOTkot4Z24Mr9C4I3t-A">
-                <img alt="YouTube" src="/cobrands/hart/youtube-logo.png" style="width: 50px; height: 50px;">
-              </a>
-            </li>
-            <li>
-              <a href="https://www.instagram.com/hartcouncil/">
-                <img alt="Instagram" src="/cobrands/hart/instagram-logo.png" style="width: 50px; height: 50px;">
-              </a>
-            </li>
-            <li class="web-chat">
-              <a href="http://www3.basingstoke.gov.uk/ccmwa/chat/a6f6143d-407f-4f99-b673-6feb98b54815">
-                <span class="desk-only">Web Chat</span>
-                <img alt="Web chat" src="/cobrands/hart/chat.png" style="height: 50px; width: 50px;">
-              </a>
-            </li>
-          </ul>
-        </div>
-        <div id="footer-row-3" class="clearfix row">
-          <p class="mob-only">
-            <strong>©</strong>
-            <a href="http://www.hart.gov.uk/disclaimer" title="More information on the Disclaimer" class="hart">Hart District Council</a>
-          </p>
-          <a href="https://www.fixmystreet.com/pro/">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a>
-        </div>
-      </div>
-    </footer>
-
     [% INCLUDE 'common_footer_tags.html' %]
 
 </div>
diff --git a/templates/web/hart/footer_extra.html b/templates/web/hart/footer_extra.html
new file mode 100644
index 000000000..5e9db575f
--- /dev/null
+++ b/templates/web/hart/footer_extra.html
@@ -0,0 +1,58 @@
+<footer id="hart-footer">
+  <div id="footer-inner" class="container">
+    <div id="footer-row-1" class="clearfix row">
+      <p class="desk-only">
+        <strong>©</strong>
+        <a href="http://www.hart.gov.uk/disclaimer" title="More information on the Disclaimer" class="hart">Hart District Council</a>
+        <a href="http://www.gov.uk/" title="GOV.UK">GOV.UK</a>
+      </p>
+      <ul id="footer-nav">
+          <li> <a href="http://www.hart.gov.uk/Accessibility">Accessibility</a> </li>
+          <li class="mob-only"> <a href="http://www.gov.uk/" title="GOV.UK">GOV.UK</a> </li>
+          <li> <a href="http://www.hart.gov.uk/privacy">Privacy</a> </li>
+          <li class="mob-only"> <a href="http://www3.basingstoke.gov.uk/ccmwa/chat/a6f6143d-407f-4f99-b673-6feb98b54815">Web Chat</a> </li>
+          <li class="mob-only"> <a href="https://www.hart.gov.uk/contact-us">Contact us</a> </li>
+          <li class="mob-only"> <a href="https://www.hart.gov.uk/feedback">Feedback</a> </li>
+          <li class="mob-only bottom"> <a href="https://www.hart.gov.uk/user/login?current=node/1">Login</a> </li>
+          <li class="mob-only bottom"> <a href="https://www.hart.gov.uk/user/register">Register</a> </li>
+      </ul>
+    </div>
+    <div id="footer-row-2" class="clearfix row">
+      <ul id="footer-images">
+        <li>
+          <a href="https://www.facebook.com/HartDistrictCouncil">
+            <img alt="Facebook" src="/cobrands/hart/facebook-logo.png" style="width: 50px; height: 50px;">
+          </a>
+        </li>
+        <li>
+          <a href="https://twitter.com/HartCouncil">
+            <img alt="Twitter" src="/cobrands/hart/twitter-logo.png" style="width: 50px; height: 50px;">
+          </a>
+        </li>
+        <li>
+          <a href="https://www.youtube.com/channel/UCtkLOTkot4Z24Mr9C4I3t-A">
+            <img alt="YouTube" src="/cobrands/hart/youtube-logo.png" style="width: 50px; height: 50px;">
+          </a>
+        </li>
+        <li>
+          <a href="https://www.instagram.com/hartcouncil/">
+            <img alt="Instagram" src="/cobrands/hart/instagram-logo.png" style="width: 50px; height: 50px;">
+          </a>
+        </li>
+        <li class="web-chat">
+          <a href="http://www3.basingstoke.gov.uk/ccmwa/chat/a6f6143d-407f-4f99-b673-6feb98b54815">
+            <span class="desk-only">Web Chat</span>
+            <img alt="Web chat" src="/cobrands/hart/chat.png" style="height: 50px; width: 50px;">
+          </a>
+        </li>
+      </ul>
+    </div>
+    <div id="footer-row-3" class="clearfix row">
+      <p class="mob-only">
+        <strong>©</strong>
+        <a href="http://www.hart.gov.uk/disclaimer" title="More information on the Disclaimer" class="hart">Hart District Council</a>
+      </p>
+      <a href="https://www.fixmystreet.com/pro/">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a>
+    </div>
+  </div>
+</footer>
diff --git a/templates/web/hounslow/main_nav_items.html b/templates/web/hounslow/main_nav_items.html
index f333e08f3..053ca39e6 100644
--- a/templates/web/hounslow/main_nav_items.html
+++ b/templates/web/hounslow/main_nav_items.html
@@ -27,8 +27,8 @@
     END;
 
     reports_uri = '/reports';
-    IF body_name;
-       body_name = body_name | uri;
+    IF c.cobrand.council_area;
+       body_name = c.cobrand.council_area | uri;
        reports_uri = "${reports_uri}/${body_name}";
     END;
 
diff --git a/templates/web/lincolnshire/footer.html b/templates/web/lincolnshire/footer.html
deleted file mode 100644
index 69ab0b51e..000000000
--- a/templates/web/lincolnshire/footer.html
+++ /dev/null
@@ -1,23 +0,0 @@
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="container">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
-            </div>
-        </div>
-    </div> <!-- .wrapper -->
-
-    [% IF pagefooter %]
-      <div>
-        <footer role="contentinfo">
-            [% INCLUDE 'front/footer-marketing.html' %]
-        </footer>
-      </div>
-    [% END %]
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
diff --git a/templates/web/lincolnshire/front/footer-marketing.html b/templates/web/lincolnshire/front/footer-marketing.html
deleted file mode 100644
index e69de29bb..000000000
--- a/templates/web/lincolnshire/front/footer-marketing.html
+++ /dev/null
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index c9c02bb5d..c96c21d00 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -4,27 +4,11 @@
 
         <div class="nav-wrapper">
             <div class="container">
-                <div id="main-nav" role="navigation">
-                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area omit_wrapper=1 hide_privacy_link=1 %]
-                </div>
+                [% INCLUDE "main_nav.html" hide_privacy_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
 
-    <footer class="occlss-page-footer" id="occlss-footer">
-      <div class="occlss-wrapper occlss-page-footer__wraper">
-        <div class="occlss-layout occlss-layout--gutter-s">
-          <div class="occlss-layout__col s-cms-content-footer">
-            <h4>Oxfordshire County Council</h4>
-            <p>County Hall, New Road, Oxford, OX1 1ND</p>
-            <p><a href="/privacy">Privacy and cookies</a></p>
-          </div>
-        </div>
-      </div>
-    </footer>
-
-</div> <!-- oxford-wrapper -->
-
     [% INCLUDE 'common_footer_tags.html' %]
 
 </body>
diff --git a/templates/web/oxfordshire/footer_extra.html b/templates/web/oxfordshire/footer_extra.html
new file mode 100644
index 000000000..e8830fc95
--- /dev/null
+++ b/templates/web/oxfordshire/footer_extra.html
@@ -0,0 +1,13 @@
+    <footer class="occlss-page-footer" id="occlss-footer">
+      <div class="occlss-wrapper occlss-page-footer__wraper">
+        <div class="occlss-layout occlss-layout--gutter-s">
+          <div class="occlss-layout__col s-cms-content-footer">
+            <h4>Oxfordshire County Council</h4>
+            <p>County Hall, New Road, Oxford, OX1 1ND</p>
+            <p><a href="/privacy">Privacy and cookies</a></p>
+          </div>
+        </div>
+      </div>
+    </footer>
+
+</div> <!-- oxford-wrapper -->
diff --git a/templates/web/oxfordshire/main_nav_items.html b/templates/web/oxfordshire/main_nav_items.html
index 6c45bd785..a57dd1aad 100644
--- a/templates/web/oxfordshire/main_nav_items.html
+++ b/templates/web/oxfordshire/main_nav_items.html
@@ -19,8 +19,8 @@
     END;
 
     reports_uri = '/reports';
-    IF body_name;
-       body_name = body_name | uri;
+    IF c.cobrand.council_area;
+       body_name = c.cobrand.council_area | uri;
        reports_uri = "${reports_uri}/${body_name}";
     END;
 
diff --git a/templates/web/rutland/front/footer-marketing.html b/templates/web/rutland/front/footer-marketing.html
index f6418e54d..f6418e54d 100755..100644
--- a/templates/web/rutland/front/footer-marketing.html
+++ b/templates/web/rutland/front/footer-marketing.html
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index 149ad171b..bf7608899 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -64,7 +64,7 @@
 
           <div class="nav-wrapper">
             <div class="container">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 %]
+                [% INCLUDE "main_nav.html" hide_privacy_link=1 %]
             </div>
           </div>
         </div>
diff --git a/templates/web/warwickshire/footer.html b/templates/web/warwickshire/footer.html
deleted file mode 100644
index 6f4007781..000000000
--- a/templates/web/warwickshire/footer.html
+++ /dev/null
@@ -1,57 +0,0 @@
-            </div>[%# close div.content %]
-        </div>[%# close div#mysociety %]
-    </div>[%# close div#wrapper.container.wrapper %]
-
-    <footer>
-        <div class="container">
-            <div class="row">
-                <div class="span3">
-                    <aside class="widget widget_text" id="text-7">
-                        <div class="textwidget">
-                            <div style="text-align:center;padding-top:5px;">
-                                <img alt="" src="//www.warwickshire.gov.uk/wp-content/uploads/2014/08/WCC+logo.png" style="width:auto !important;">
-                            </div>
-                        </div>
-                    </aside>
-                </div>
-                <div class="span3">
-                    <aside class="widget widget_text" id="text-3">
-                        <div class="textwidget">
-                            <p><a href="//www.warwickshire.gov.uk/accessibility">Accessibility</a></p>
-                            <p><a href="//www.warwickshire.gov.uk/help">Help using the website</a></p>
-                            <p><a href="//www.warwickshire.gov.uk/disclaimer">Privacy and disclaimer</a></p>
-                            <p><a href="//www.warwickshire.gov.uk/contactus">Contact us</a></p>
-                            <p><a href="//www.warwickshire.gov.uk/az">A-Z of services</a></p>
-                        </div>
-                    </aside>
-                </div>
-                <div class="span2">
-                    <aside class="widget widget_text" id="text-4">
-                        <div class="textwidget">
-                            <p><a href="//www.warwickshire.gov.uk/socialnetworking">Social media</a></p>
-                            <p><a href="//www.warwickshire.gov.uk/?page_id=976766">Services for...</a></p>
-                            <p><a href="//www.warwickshire.gov.uk/customerservice">Customer service and complaints</a></p>
-                        </div>
-                    </aside>
-                </div>
-                <div class="span2">
-                    <aside class="widget widget_text" id="text-13">
-                        <div class="textwidget">
-                            <a href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"><img src="https://www.warwickshire.gov.uk/wp-content/uploads/2016/05/keep-me-posted-white-on-trans-155x39.png"></a>
-                        </div>
-                    </aside>
-                </div>
-            </div>
-            <div class="row">
-                <div class="span4"></div>
-                <div class="span4" style="text-align:center;">
-                    <p>&copy; Warwickshire County Council</p>
-                </div>
-                <div class="span4"></div>
-            </div>
-        </div>
-    </footer>
-
-    [% INCLUDE 'common_footer_tags.html' %]
-    </body>
-</html>
diff --git a/templates/web/warwickshire/footer_extra.html b/templates/web/warwickshire/footer_extra.html
new file mode 100644
index 000000000..a002676b8
--- /dev/null
+++ b/templates/web/warwickshire/footer_extra.html
@@ -0,0 +1,49 @@
+<footer>
+    <div class="container">
+        <div class="row">
+            <div class="span3">
+                <aside class="widget widget_text" id="text-7">
+                    <div class="textwidget">
+                        <div style="text-align:center;padding-top:5px;">
+                            <img alt="" src="//www.warwickshire.gov.uk/wp-content/uploads/2014/08/WCC+logo.png" style="width:auto !important;">
+                        </div>
+                    </div>
+                </aside>
+            </div>
+            <div class="span3">
+                <aside class="widget widget_text" id="text-3">
+                    <div class="textwidget">
+                        <p><a href="//www.warwickshire.gov.uk/accessibility">Accessibility</a></p>
+                        <p><a href="//www.warwickshire.gov.uk/help">Help using the website</a></p>
+                        <p><a href="//www.warwickshire.gov.uk/disclaimer">Privacy and disclaimer</a></p>
+                        <p><a href="//www.warwickshire.gov.uk/contactus">Contact us</a></p>
+                        <p><a href="//www.warwickshire.gov.uk/az">A-Z of services</a></p>
+                    </div>
+                </aside>
+            </div>
+            <div class="span2">
+                <aside class="widget widget_text" id="text-4">
+                    <div class="textwidget">
+                        <p><a href="//www.warwickshire.gov.uk/socialnetworking">Social media</a></p>
+                        <p><a href="//www.warwickshire.gov.uk/?page_id=976766">Services for...</a></p>
+                        <p><a href="//www.warwickshire.gov.uk/customerservice">Customer service and complaints</a></p>
+                    </div>
+                </aside>
+            </div>
+            <div class="span2">
+                <aside class="widget widget_text" id="text-13">
+                    <div class="textwidget">
+                        <a href="https://public.govdelivery.com/accounts/UKWarwickshire/subscriber/new"><img src="https://www.warwickshire.gov.uk/wp-content/uploads/2016/05/keep-me-posted-white-on-trans-155x39.png"></a>
+                    </div>
+                </aside>
+            </div>
+        </div>
+        <div class="row">
+            <div class="span4"></div>
+            <div class="span4" style="text-align:center;">
+                <p>&copy; Warwickshire County Council</p>
+            </div>
+            <div class="span4"></div>
+        </div>
+    </div>
+</footer>
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 5470d401a..08e849947 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -46,7 +46,7 @@
 
     [% INCLUDE 'warwickshire_masthead.html' %]
 
-    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_all_reports_link=1 ul_class='container' %]
+    [% INCLUDE "main_nav.html" hide_all_reports_link=1 ul_class='container' %]
 
     <div id="wrapper" class="container wrapper">
         <div id="mysociety">