15 files changed, 39 insertions, 41 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 99d409362..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/validation_rules.js?[% Math.int( date.now / 3600 ) %]"></script>
 <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 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/front/javascript.html b/templates/web/base/front/javascript.html
index 13aa5216c..869e5f676 100644
--- a/templates/web/base/front/javascript.html
+++ b/templates/web/base/front/javascript.html
@@ -6,7 +6,7 @@ yepnope.addPrefix( 'preload', function ( resource ) {
 });
 Modernizr.load({
     load: [
-        "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
+        "preload![% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]",
         "preload![% version('/js/map-OpenLayers.js') %]",
         "preload![% version('/js/map-OpenStreetMap.js') %]",
         "preload![% version('/js/jquery.ba-hashchange.min.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/js/validation_rules.html b/templates/web/base/js/validation_rules.html
deleted file mode 100644
index 5295a53ca..000000000
--- a/templates/web/base/js/validation_rules.html
+++ /dev/null
@@ -1,5 +0,0 @@
-    validation_rules = {
-        title: { required: true },
-        detail: { required: true },
-        update: { required: true }
-    };
diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html
index 7c1942d0d..95ec233e8 100644
--- a/templates/web/base/maps/bing.html
+++ b/templates/web/base/maps/bing.html
@@ -1,6 +1,6 @@
 [% 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.fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.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/jquery.ba-hashchange.min.js') %]"></script>
diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html
index ed5547227..aeb8343d0 100644
--- a/templates/web/base/maps/fms.html
+++ b/templates/web/base/maps/fms.html
@@ -1,6 +1,6 @@
 [% 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.fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.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>
diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html
index 543918692..ec3383d5e 100644
--- a/templates/web/base/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
@@ -1,6 +1,6 @@
 [% map_js = BLOCK %]
 <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3"></script>
-<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.google.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.google.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-google-ol.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script>
diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html
index 58f872527..698fa186d 100644
--- a/templates/web/base/maps/mapquest-attribution.html
+++ b/templates/web/base/maps/mapquest-attribution.html
@@ -1,5 +1,5 @@
 [% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenStreetMap.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script>
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/base/maps/osm-streetview.html b/templates/web/base/maps/osm-streetview.html
index 7840884bd..e7811ba40 100644
--- a/templates/web/base/maps/osm-streetview.html
+++ b/templates/web/base/maps/osm-streetview.html
@@ -1,5 +1,5 @@
 [% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-streetview.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script>
diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html
index d6d395c22..27397141d 100644
--- a/templates/web/base/maps/osm-toner-lite.html
+++ b/templates/web/base/maps/osm-toner-lite.html
@@ -1,5 +1,5 @@
 [% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
 <script type="text/javascript" src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js?v1.3.0"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-toner-lite.js') %]"></script>
diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html
index 58f872527..698fa186d 100644
--- a/templates/web/base/maps/osm.html
+++ b/templates/web/base/maps/osm.html
@@ -1,5 +1,5 @@
 [% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script>
+<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/map-OpenStreetMap.js') %]"></script>
 <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script>