Tidy up front page and map copyright templates.

8 files changed, 39 insertions, 28 deletions

diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html
index d76e20817..804710ad1 100644
--- a/templates/web/base/maps/mapquest-attribution.html
+++ b/templates/web/base/maps/mapquest-attribution.html
@@ -10,5 +10,4 @@
 
 [% map_html = BLOCK %]
 [% INCLUDE maps/openlayers.html %]
-<div class="olControlAttribution" style="position: absolute;">Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a></div>
 [% END %]
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index d01e98138..48eb896e8 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -49,7 +49,7 @@ var fixmystreet = {
         [% INCLUDE compass %]
     </noscript></div>
     [% IF map.copyright %]
-    <p id="copyright">[% map.copyright %]</p>
+    <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div>
     [% END %]
 
 
diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html
index 3e1e1aec8..0b2db1a53 100644
--- a/templates/web/base/maps/osm.html
+++ b/templates/web/base/maps/osm.html
@@ -10,5 +10,4 @@
 
 [% map_html = BLOCK %]
 [% INCLUDE maps/openlayers.html %]
-<div class="olControlAttribution" style="position: absolute;">&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors</div>
 [% END %]
diff --git a/templates/web/bromley/front/pre-steps.html b/templates/web/bromley/front/pre-steps.html
new file mode 100644
index 000000000..a5523c862
--- /dev/null
+++ b/templates/web/bromley/front/pre-steps.html
@@ -0,0 +1,5 @@
+<p>This is primarily for reporting physical problems that can be fixed
+like graffiti, cleansing issues or road defects. To report other
+kinds of problems like missed bins use our
+<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
+</p>
diff --git a/templates/web/fixmystreet.com/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html
new file mode 100644
index 000000000..0ccaa0870
--- /dev/null
+++ b/templates/web/fixmystreet.com/front/javascript.html
@@ -0,0 +1,15 @@
+<script>
+yepnope.addPrefix( 'preload', function ( resource ) {
+    resource.noexec = true;
+    return resource;
+});
+Modernizr.load({
+    load: [
+        "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
+        "preload![% version('/js/map-OpenLayers.js') %]",
+        "preload![% version('/js/map-bing-ol.js') %]",
+        "preload![% version('/js/map-fms.js') %]",
+        "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
+    ]
+});
+</script>
diff --git a/templates/web/fixmystreet/front/javascript.html b/templates/web/fixmystreet/front/javascript.html
new file mode 100644
index 000000000..13aa5216c
--- /dev/null
+++ b/templates/web/fixmystreet/front/javascript.html
@@ -0,0 +1,15 @@
+[%# Assume using OpenStreetMap maps %]
+<script>
+yepnope.addPrefix( 'preload', function ( resource ) {
+    resource.noexec = true;
+    return resource;
+});
+Modernizr.load({
+    load: [
+        "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
+        "preload![% version('/js/map-OpenLayers.js') %]",
+        "preload![% version('/js/map-OpenStreetMap.js') %]",
+        "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
+    ]
+});
+</script>
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index f92518022..0441b3efb 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -1,20 +1,4 @@
-[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %]
-[% map_js = BLOCK %]
-<script>
-yepnope.addPrefix( 'preload', function ( resource ) {
-    resource.noexec = true;
-    return resource;
-});
-Modernizr.load({
-    load: [
-        "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
-        "preload![% version('/js/map-OpenLayers.js') %]",
-        "preload![% version('/js/map-bing-ol.js') %]",
-        "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
-    ]
-});
-</script>
-[% END %]
+[% map_js = PROCESS 'front/javascript.html' %]
 
 [% pre_container_extra = PROCESS 'around/postcode_form.html' %]
 [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %]
@@ -23,13 +7,7 @@ Modernizr.load({
     <p class="form-error">[% error %]</p>
 [% END %]
 
-[% IF c.cobrand.moniker == 'bromley' %]
-<p>This is primarily for reporting physical problems that can be fixed
-like graffiti, cleansing issues or road defects. To report other
-kinds of problems like missed bins use our
-<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
-</p>
-[% END %]
+[% TRY %][% PROCESS 'front/pre-steps.html' %][% CATCH file %][% END %]
 
 <div class="tablewrapper">
     <div id="front-howto">
diff --git a/templates/web/zerotb/index.html b/templates/web/zerotb/index.html
index 754dcbabc..4d0d6555c 100644
--- a/templates/web/zerotb/index.html
+++ b/templates/web/zerotb/index.html
@@ -9,7 +9,7 @@ Modernizr.load({
     load: [
         "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
         "preload![% version('/js/map-OpenLayers.js') %]",
-        "preload![% version('/js/map-bing-ol.js') %]",
+        "preload![% version('/js/map-OpenStreetMap.js') %]",
         "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
     ]
 });