aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/base/admin/header.html3
-rw-r--r--templates/web/base/admin/report_edit.html2
-rw-r--r--templates/web/base/common_header_tags.html24
-rw-r--r--templates/web/base/header.html11
-rw-r--r--templates/web/base/maps/noscript_map.html17
-rw-r--r--templates/web/base/maps/openlayers.html2
-rw-r--r--templates/web/bristol/header_extra.html2
-rw-r--r--templates/web/bromley/header_extra.html2
-rw-r--r--templates/web/eastsussex/header.html.template8
-rw-r--r--templates/web/fiksgatami/header.html10
-rw-r--r--templates/web/fixmystreet-uk-councils/header_extra.html2
-rw-r--r--templates/web/fixmystreet.com/about/council.html22
-rw-r--r--templates/web/fixmystreet.com/header_extra.html6
-rw-r--r--templates/web/hart/header.html10
-rw-r--r--templates/web/oxfordshire/header.html10
-rw-r--r--templates/web/warwickshire/header.html20
-rw-r--r--templates/web/zurich/header.html12
17 files changed, 79 insertions, 84 deletions
diff --git a/templates/web/base/admin/header.html b/templates/web/base/admin/header.html
index ddaa4aa44..517b984e3 100644
--- a/templates/web/base/admin/header.html
+++ b/templates/web/base/admin/header.html
@@ -1,6 +1,7 @@
[%
SET bodyclass = bodyclass || 'fullwidthpage';
- INCLUDE 'header.html' admin = 1, bodyclass = bodyclass _ ' admin';
+ SET admin = 1;
+ INCLUDE 'header.html' bodyclass = bodyclass _ ' admin';
%]
<style type="text/css">
dt { clear: left; float: left; font-weight: bold; }
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index 677c2a171..351cf86f1 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -1,5 +1,5 @@
[%
- PROCESS "maps/${map.type}.html";
+ PROCESS "maps/${map.type}.html" admin = 1;
INCLUDE 'admin/header.html'
title = tprintf(loc('Editing problem %d'), problem.id ),
bodyclass = 'mappage with-notes';
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index 8cd342042..184e2c297 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -1,28 +1,30 @@
[% USE date %][% USE Math %]
+[% SET start = c.config.ADMIN_BASE_URL IF admin %]
+
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="cobrand" content="[% c.cobrand.moniker %]">
<script type="text/javascript" src="[% start %]/js/translation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script>
-<script type="text/javascript" src="[% start %]/jslib/jquery-1.7.2.min.js"></script>
-<script type="text/javascript" src="[% start %][% version('/js/validation_rules.js') %]"></script>
-<script src="[% start %][% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript" src="[% start %][% version('/js/dropzone.min.js') %]"></script>
+<script type="text/javascript" src="[% version('/jslib/jquery-1.7.2.min.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/validation_rules.js') %]"></script>
+<script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript" src="[% version('/js/dropzone.min.js') %]"></script>
-<script type="text/javascript" src="[% start %][% version('/js/geo.min.js') %]"></script>
-<script type="text/javascript" src="[% start %][% version('/js/fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% start %][% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script>
[% IF admin %]
- <script src="[% start %]/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js"></script>
- <link rel="stylesheet" href="[% start %]/js/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.min.css" />
- <script type="text/javascript" src="[% start %][% version('/js/fixmystreet-admin.js') %]"></script>
+ <script src="[% version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js') %]"></script>
+ <link rel="stylesheet" href="[% version('/js/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.min.css') %]">
+ <script type="text/javascript" src="[% version('/js/fixmystreet-admin.js') %]"></script>
[% END %]
[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %]
[% IF moderating %]
- <script type="text/javascript" src="[% start %][% version('/js/moderate.js') %]"></script>
+ <script type="text/javascript" src="[% version('/js/moderate.js') %]"></script>
[% END %]
[% map_js %]
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index 3117b819f..b57f5d50f 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -16,8 +16,7 @@
<meta name="mobileoptimized" content="0">
[% INCLUDE 'header_opengraph.html' %]
- [% SET start = c.config.ADMIN_BASE_URL IF admin;
-
+ [%
# For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts
# it stylesheets under fixmystreet.com
IF c.cobrand.moniker == 'fixmystreet';
@@ -25,14 +24,14 @@
ELSE;
SET css_dir = c.cobrand.moniker;
END %]
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]">
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)">
[% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]">
<![endif]-->
- <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
[% extra_js %]
diff --git a/templates/web/base/maps/noscript_map.html b/templates/web/base/maps/noscript_map.html
index aaaa217c9..edcba28a6 100644
--- a/templates/web/base/maps/noscript_map.html
+++ b/templates/web/base/maps/noscript_map.html
@@ -1,3 +1,4 @@
+[% SET start = c.config.ADMIN_BASE_URL IF admin -%]
<div class="noscript">
<div id="[% nsm_prefix %]drag">
<[% map.img_type %]
@@ -39,13 +40,13 @@
SET zoom_out = '#' IF map.zoom <= 0;
%]
<div style="position: absolute; left: 4px; top: 4px;" class="olControlPanZoom olControlNoSelect" unselectable="on">
- <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/north-mini.png" border="0"></a></div>
- <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/west-mini.png" border="0"></a></div>
- <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/east-mini.png" border="0"></a></div>
- <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/south-mini.png" border="0"></a></div>
- <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-plus-mini.png" border="0"></a></div>
- <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-world-mini.png" border="0"></a></div>
- <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/js/OpenLayers-2.13.1/img/zoom-minus-mini.png" border="0"></a></div>
+ <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers-2.13.1/img/north-mini.png" border="0"></a></div>
+ <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers-2.13.1/img/west-mini.png" border="0"></a></div>
+ <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers-2.13.1/img/east-mini.png" border="0"></a></div>
+ <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers-2.13.1/img/south-mini.png" border="0"></a></div>
+ <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers-2.13.1/img/zoom-plus-mini.png" border="0"></a></div>
+ <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers-2.13.1/img/zoom-world-mini.png" border="0"></a></div>
+ <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="[% start %]/js/OpenLayers-2.13.1/img/zoom-minus-mini.png" border="0"></a></div>
</div>
[% END %]
@@ -55,7 +56,7 @@
[% IF pin.id %]
<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]">
[%- END -%]
-<img border="0" class="pin" src="[% c.uri_for( c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png') %]"
+<img border="0" class="pin" src="[% start %][% c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png' %]"
alt="[% loc('Problem') %]" style="top:[% pin.py - 64 %]px; left:[% pin.px - 24 %]px; position: absolute;">
[%- IF pin.id -%]
</a>
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index 1e7ae5ce8..698ae2dab 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -18,7 +18,7 @@ var fixmystreet = {
[% IF map.zoom -%]
'zoom': [% map.zoom %],
[%- END %]
- 'pin_prefix': '[% c.cobrand.path_to_pin_icons %]',
+ 'pin_prefix': '[% c.config.ADMIN_BASE_URL IF admin %][% c.cobrand.path_to_pin_icons %]',
'numZoomLevels': [% map.numZoomLevels %],
'zoomOffset': [% map.zoomOffset %],
'map_type': [% map.map_type %],
diff --git a/templates/web/bristol/header_extra.html b/templates/web/bristol/header_extra.html
index d03e34e1f..fd20823ae 100644
--- a/templates/web/bristol/header_extra.html
+++ b/templates/web/bristol/header_extra.html
@@ -1,2 +1,2 @@
-<script src="[% start %][% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script>
+<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script>
[% INCLUDE 'tracking_code.html' %]
diff --git a/templates/web/bromley/header_extra.html b/templates/web/bromley/header_extra.html
index c7fe5f3e3..57066dbe8 100644
--- a/templates/web/bromley/header_extra.html
+++ b/templates/web/bromley/header_extra.html
@@ -1 +1 @@
-<script src="[% start %][% version('/cobrands/bromley/a-z-nav.js') %]" charset="utf-8"></script> \ No newline at end of file
+<script src="[% version('/cobrands/bromley/a-z-nav.js') %]" charset="utf-8"></script>
diff --git a/templates/web/eastsussex/header.html.template b/templates/web/eastsussex/header.html.template
index 325d1b6e6..2963dc642 100644
--- a/templates/web/eastsussex/header.html.template
+++ b/templates/web/eastsussex/header.html.template
@@ -3,16 +3,16 @@
<head>
{MetadataDesktop}
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
[% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
<![endif]-->
[% INCLUDE 'common_header_tags.html' %]
[% extra_js %]
- <script src="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script>
+ <script src="[% version('/cobrands/' _ c.cobrand.moniker _ '/report-form.js') %]"></script>
[% IF c.req.uri.host == 'osm.fixmystreet.com' %]
<link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index f22e97fef..0459ed5d7 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -12,16 +12,14 @@
[% INCLUDE 'header_opengraph.html' %]
-[% SET start = c.config.ADMIN_BASE_URL IF admin %]
-
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
[% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
<![endif]-->
- <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
[% extra_js %]
diff --git a/templates/web/fixmystreet-uk-councils/header_extra.html b/templates/web/fixmystreet-uk-councils/header_extra.html
index 9e614f177..cf8fa7301 100644
--- a/templates/web/fixmystreet-uk-councils/header_extra.html
+++ b/templates/web/fixmystreet-uk-councils/header_extra.html
@@ -1 +1 @@
-<script src="[% start %][% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script>
+<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script>
diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html
index 32a86ef25..8552d0d86 100644
--- a/templates/web/fixmystreet.com/about/council.html
+++ b/templates/web/fixmystreet.com/about/council.html
@@ -25,7 +25,7 @@
<p>And it worked. Residents loved the easy interface; councils welcomed the shift to digital. Now we’ve developed FixMyStreet for Councils, allowing you to bring the award-winning FixMyStreet experience directly to your own council website’s users.</p>
<p>FixMyStreet for Councils creates a council-branded, seamless fault-reporting interface for your site, integrating directly with your back-office systems, and available via web or mobile.</p>
</div>
- <img class="flush-image flush-image--bottom" src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/responsive.png') %]" alt="" />
+ <img class="flush-image flush-image--bottom" src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/responsive.png') %]" alt="" />
</div>
</div>
<div class="councils-section">
@@ -51,7 +51,7 @@
<p>Patchy coverage in some parts of your borough? That’s fine: the FixMyStreet for Councils apps will store any report as it’s made, then send it off once there is access to a connection.</p>
<p>We know that not everyone’s on an iPhone or Android device. No problem - your reporting interface can also be accessed via any smartphone browser, as a mobile-optimised website</p>
</div>
- <img class="flush-image flush-image--bottom" src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/iphone.png') %]" alt="" />
+ <img class="flush-image flush-image--bottom" src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/iphone.png') %]" alt="" />
</div>
</div>
@@ -83,7 +83,7 @@
<p>You can tell us which types of reports are not your responsibility, and where we should route them instead.</p>
<p>And you can tailor the text that we use at every step (or use ours - we’ve worked hard on it!).</p>
</div>
- <img class="flush-image flush-image--bottom-right" src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart.png') %]" alt="" />
+ <img class="flush-image flush-image--bottom-right" src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart.png') %]" alt="" />
</div>
</div>
@@ -116,14 +116,14 @@
</div>
<div class="client-logos">
- <a href="http://fix.bromley.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/bromley-logo.png') %]" alt="" /></a><!--
- --><a href="http://warwickshire.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/warwickshire-logo.png') %]" alt="" /></a><!--
- --><a href="http://fixmystreet.stevenage.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/stevenage-logo.png') %]" alt="" /></a><!--
- --><a href="http://hart.fixmystreet.com/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart-logo.png') %]" alt="" /></a><!--
- --><a href="http://fixmystreet.oxfordshire.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/oxfordshire-logo.png') %]" alt="" /></a><!--
- --><a href="https://www.zueriwieneu.ch/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/zurich-logo.png') %]" alt="" /></a><!--
- --><a href="http://eastsussex.fixmystreet.com/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png') %]" alt="" /></a><!--
- --><a href="https://fix.angus.gov.uk/"><img src="[% start %][% version('/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png') %]" alt="" /></a>
+ <a href="http://fix.bromley.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/bromley-logo.png') %]" alt="" /></a><!--
+ --><a href="http://warwickshire.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/warwickshire-logo.png') %]" alt="" /></a><!--
+ --><a href="http://fixmystreet.stevenage.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/stevenage-logo.png') %]" alt="" /></a><!--
+ --><a href="http://hart.fixmystreet.com/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/hart-logo.png') %]" alt="" /></a><!--
+ --><a href="http://fixmystreet.oxfordshire.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/oxfordshire-logo.png') %]" alt="" /></a><!--
+ --><a href="https://www.zueriwieneu.ch/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/zurich-logo.png') %]" alt="" /></a><!--
+ --><a href="http://eastsussex.fixmystreet.com/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/east-sussex-logo.png') %]" alt="" /></a><!--
+ --><a href="https://fix.angus.gov.uk/"><img src="[% version('/cobrands/fixmystreet.com/images/fms-for-councils/angus-logo.png') %]" alt="" /></a>
</div>
</div>
diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html
index d37c141f2..08f1251aa 100644
--- a/templates/web/fixmystreet.com/header_extra.html
+++ b/templates/web/fixmystreet.com/header_extra.html
@@ -1,11 +1,11 @@
<meta name='theme-color' content='#ffd000'>
<link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/fixmystreet.com/favicon.ico">
-<script src="[% start %][% version('/js/jquery.cookie.min.js') %]"></script>
-<script src="[% start %][% version('/cobrands/fixmystreet.com/js.js') %]"></script>
+<script src="[% version('/js/jquery.cookie.min.js') %]"></script>
+<script src="[% version('/cobrands/fixmystreet.com/js.js') %]"></script>
[%# We are conducting an A/B experiment %]
-[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %]
+[% IF c.config.BASE_URL == "https://www.fixmystreet.com" AND not admin %]
<script src="//www.google-analytics.com/cx/api.js?experiment=ZwMlZkAhSbK_tP_QG64QrQ"></script>
<script>
var variation = cxApi.chooseVariation(),
diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html
index 23264066c..a1472105d 100644
--- a/templates/web/hart/header.html
+++ b/templates/web/hart/header.html
@@ -12,17 +12,15 @@
[% INCLUDE 'header_opengraph.html' %]
-[% SET start = c.config.ADMIN_BASE_URL IF admin %]
-
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
<link rel="stylesheet" href="[% version('/cobrands/hart/hart.css') %]">
[% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
<![endif]-->
- <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
[% extra_js %]
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 0e4281df4..f9761aa96 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -10,16 +10,14 @@
<meta name="HandHeldFriendly" content="true">
<meta name="mobileoptimized" content="0">
-[% SET start = c.config.ADMIN_BASE_URL IF admin %]
-
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
[% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
<![endif]-->
- <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
[% extra_js %]
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 4877e9a7c..14d1db37a 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -10,22 +10,22 @@
<link rel="shortcut icon" href="/cobrands/warwickshire/gamma/images/favicon.ico" />
<!-- Style -->
- <link rel="stylesheet" type="text/css" href="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/style.css') %]" />
- <link rel="stylesheet" type="text/css" href="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap-responsive.css') %]">
+ <link rel="stylesheet" type="text/css" href="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/style.css') %]" />
+ <link rel="stylesheet" type="text/css" href="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap-responsive.css') %]">
<!-- Scripts -->
- <script src="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/modernizr-2.6.2-respond-1.1.0.min.js') %]" type="text/javascript"></script>
- <script src="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/jquery-1.9.0.min.js') %]" type="text/javascript"></script>
- <script src="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap.min.js') %]" type="text/javascript"></script>
- <script src="[% start %][% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/main.js') %]" type="text/javascript"></script>
+ <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/modernizr-2.6.2-respond-1.1.0.min.js') %]" type="text/javascript"></script>
+ <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/jquery-1.9.0.min.js') %]" type="text/javascript"></script>
+ <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/bootstrap.min.js') %]" type="text/javascript"></script>
+ <script src="[% version ('/cobrands/' _ c.cobrand.moniker _ '/gamma/main.js') %]" type="text/javascript"></script>
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
[% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
<![endif]-->
- <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index a5efaabda..bf4d7e478 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -10,20 +10,18 @@
<meta name="HandHeldFriendly" content="true">
<meta name="mobileoptimized" content="0">
-[% SET start = c.config.ADMIN_BASE_URL IF admin %]
-
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="screen and (min-width:48em)">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="screen and (min-width:48em)">
[% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
<![endif]-->
<link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css">
- <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+ <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
- <script src="[% start %][% version('/cobrands/zurich/validation_rules.js') %]"></script>
+ <script src="[% version('/cobrands/zurich/validation_rules.js') %]"></script>
[% extra_js %]
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 19:20:18 +0000