Merge tag 'v2.0.4' into fiksgatami-dev

4 files changed, 13 insertions, 39 deletions

diff --git a/templates/web/angus/footer.html b/templates/web/angus/footer.html
index 9a7e1dd6d..ec91aaa71 100644
--- a/templates/web/angus/footer.html
+++ b/templates/web/angus/footer.html
@@ -4,9 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--main' %]
-                </div>
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/angus/main_menu.html b/templates/web/angus/main_menu.html
deleted file mode 100644
index 3a07c61cd..000000000
--- a/templates/web/angus/main_menu.html
+++ /dev/null
@@ -1,24 +0,0 @@
-[%
-    SET base = "";
-    SET base = c.cobrand.base_url IF admin;
-%]
-<ul class="nav-menu [% extra_class %]">
-    <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/Angus'
-        %]span[% ELSE %]a href="[% base %]/reports/Angus"[% END
-        %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports/Angus' ? '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>
diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html
index aed4d1764..1516ae05e 100644
--- a/templates/web/angus/maps/fms.html
+++ b/templates/web/angus/maps/fms.html
@@ -1,11 +1,11 @@
-[% map_js = BLOCK %]
-<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.angus.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script>
-<script src="[% version('/cobrands/fixmystreet/assets.js') %]"></script>
-<script src="[% version('/cobrands/angus/js.js') %]"></script>
-[% END %]
-
-[% map_html = INCLUDE maps/openlayers.html include_key = 1 %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.angus.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-bing-ol.js'),
+    version('/js/map-fms.js'),
+    version('/cobrands/fixmystreet/assets.js'),
+    version('/cobrands/angus/js.js'),
+];
+map_html = INCLUDE maps/openlayers.html include_key = 1
+%]
diff --git a/templates/web/angus/post_header_extra.html b/templates/web/angus/post_header_extra.html
index 16a82de3e..43ba8af92 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_menu.html' extra_class = 'nav-menu--breadcrumb' %]
+    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 ul_class="nav-menu nav-menu--breadcrumb" omit_wrapper=1 %]
   </div>
 </div>