Merge branch 'csssss-part-i'

13 files changed, 13 insertions, 20 deletions

diff --git a/templates/web/angus/footer.html b/templates/web/angus/footer.html
index ec91aaa71..84ab05b35 100644
--- a/templates/web/angus/footer.html
+++ b/templates/web/angus/footer.html
@@ -4,7 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/angus/post_header_extra.html b/templates/web/angus/post_header_extra.html
index 43ba8af92..81673aae5 100644
--- a/templates/web/angus/post_header_extra.html
+++ b/templates/web/angus/post_header_extra.html
@@ -9,6 +9,6 @@
 
 <div class="wrapper wrapper__main_menu">
   <div class="container">
-    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 ul_class="nav-menu nav-menu--breadcrumb" omit_wrapper=1 %]
+    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area ul_class="nav-menu nav-menu--breadcrumb" omit_wrapper=1 %]
   </div>
 </div>
diff --git a/templates/web/base/main_nav.html b/templates/web/base/main_nav.html
index 31bd61af5..b8a3165a4 100644
--- a/templates/web/base/main_nav.html
+++ b/templates/web/base/main_nav.html
@@ -20,12 +20,6 @@
     <div id="main-nav" role="navigation">
 [% END %]
 
-    [% UNLESS hide_mysoc_link %]
-        <ul class="nav-menu nav-menu--mysoc">
-            <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li>
-        </ul>
-    [% END %]
-
     <ul class="[% ul_class %]"[% " id='" _ ul_id _ "'" IF ul_id %]>
         [% INCLUDE 'main_nav_items.html' %]
     </ul>
diff --git a/templates/web/bristol/footer.html b/templates/web/bristol/footer.html
index 52f2d50df..57814b01a 100644
--- a/templates/web/bristol/footer.html
+++ b/templates/web/bristol/footer.html
@@ -4,7 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index f9b844ce5..b5247bb9e 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -9,7 +9,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html
index fb39c29c2..7a40acd42 100644
--- a/templates/web/eastherts/footer.html
+++ b/templates/web/eastherts/footer.html
@@ -4,7 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html
index 03dbc0330..0534054cb 100644
--- a/templates/web/greenwich/footer.html
+++ b/templates/web/greenwich/footer.html
@@ -9,7 +9,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name hide_mysoc_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html
index 6359eba3b..cfe485af1 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_mysoc_link=1 hide_privacy_link=1 ul_id="fms-menu-desktop" ul_class="" omit_wrapper=1 %]
+    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name 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 e759e15a2..d3dd77640 100644
--- a/templates/web/hart/footer.html
+++ b/templates/web/hart/footer.html
@@ -7,7 +7,7 @@
     <div class="nav-wrapper clearfix">
         <div class="main-menu-wrapper">
             <div class="main-menu">
-              [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 ul_class="clearfix" hide_privacy_link=1 %]
+              [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area ul_class="clearfix" hide_privacy_link=1 %]
             </div>
         </div>
         <div class="nav-wrapper-2 clearfix">
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index dd90cab01..bc9494b13 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -10,11 +10,10 @@
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
                 <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--mysoc">
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area omit_wrapper=1 hide_privacy_link=1 %]
+                    <ul class="nav-menu">
                         <li><a id="mysoc-logo" href="https://www.fixmystreet.com/about/council">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li>
                     </ul>
-
-                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 omit_wrapper=1 hide_privacy_link=1 %]
                 </div>
             </div>
         </div>
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 452a71e88..492a29bb7 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -37,7 +37,7 @@
         <div id="navigation">
             <div class="menubar">
                 <div class="menu-inner">
-                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 omit_wrapper=1 ul_class="menu" %]
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 omit_wrapper=1 ul_class="menu" %]
                 </div>
             </div>
         </div>
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index e8551fecb..d225f13b8 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -89,7 +89,7 @@
 
 
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 583606ef8..52eb4f0e8 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -172,7 +172,7 @@
         <div class="container navbar-container">
             <div class="navbar" id="mega-menu-navbar">
                 <div class="navbar-inner">
-                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_all_reports_link=1 omit_wrapper=1 ul_class="menu nav" ul_id="mega-menu" %]
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_all_reports_link=1 omit_wrapper=1 ul_class="menu nav" ul_id="mega-menu" %]
                 </div>
             </div>
         </div>