diff options
Diffstat (limited to 'templates/web/bristol')
| -rw-r--r-- | templates/web/bristol/footer.html | 23 | ||||
| -rw-r--r-- | templates/web/bristol/footer_extra_js.html | 10 | ||||
| -rw-r--r-- | templates/web/bristol/maps/bristol.html | 14 |
3 files changed, 15 insertions, 32 deletions
diff --git a/templates/web/bristol/footer.html b/templates/web/bristol/footer.html index c71d7151b..52f2d50df 100644 --- a/templates/web/bristol/footer.html +++ b/templates/web/bristol/footer.html @@ -4,28 +4,7 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> - <div id="main-nav" role="navigation"> - <ul class="nav-menu nav-menu--main"> - <li><[% IF c.req.uri.path == '/' - %]span[% ELSE %]a href="/"[% 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="/my"[% END - %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports/Bristol' - %]span[% ELSE %]a href="/reports/Bristol"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports/Bristol' ? '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>[% - %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' - %]span[% ELSE %]a href="/privacy"[% END - %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> - </ul> - </div> + [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %] </div> </div> </div> <!-- .wrapper --> diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html index 6ba5e3100..1cfcf00f6 100644 --- a/templates/web/bristol/footer_extra_js.html +++ b/templates/web/bristol/footer_extra_js.html @@ -1,4 +1,6 @@ -<script src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script> -<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> -<script src="[% version('/cobrands/fixmystreet/assets.js') %]"></script> -<script src="[% version('/cobrands/bristol/js.js') %]"></script> +[% scripts.push( + version('/js/OpenLayers.Projection.OrdnanceSurvey.js') + version('/cobrands/fixmystreet-uk-councils/js.js'), + version('/cobrands/fixmystreet/assets.js'), + version('/cobrands/bristol/js.js'), +) %] diff --git a/templates/web/bristol/maps/bristol.html b/templates/web/bristol/maps/bristol.html index f49571a1d..08f6fba1c 100644 --- a/templates/web/bristol/maps/bristol.html +++ b/templates/web/bristol/maps/bristol.html @@ -1,9 +1,11 @@ -[% map_js = BLOCK %] -<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.bristol.js') %]"></script> -<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> -<script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script> -<script type="text/javascript" src="[% version('/js/map-wmts-bristol.js') %]"></script> -[% END %] +[% +map_js = [ + version('/js/OpenLayers/OpenLayers.bristol.js'), + version('/js/map-OpenLayers.js'), + version('/js/map-wmts-base.js'), + version('/js/map-wmts-bristol.js'), +] +%] [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] |