[UK] Use council_area by default if set.

16 files changed, 15 insertions, 97 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index 2aaa5d776..3ecf2e6b9 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/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 0d9fd2d2a..000000000
--- a/templates/web/bristol/footer.html
+++ /dev/null
@@ -1,15 +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 -->
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
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 0d9fd2d2a..000000000
--- a/templates/web/buckinghamshire/footer.html
+++ /dev/null
@@ -1,15 +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 -->
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html
deleted file mode 100644
index 0d9fd2d2a..000000000
--- a/templates/web/eastherts/footer.html
+++ /dev/null
@@ -1,15 +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 -->
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
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 e800bbdda..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">
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 0d9fd2d2a..000000000
--- a/templates/web/lincolnshire/footer.html
+++ /dev/null
@@ -1,15 +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 -->
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index d7481c47d..c96c21d00 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -4,9 +4,7 @@
 
         <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 -->
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/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/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">