7 files changed, 11 insertions, 117 deletions
diff --git a/templates/web/default/maps/fms.html b/templates/web/default/maps/fms.html
index 36fd48467..6e6d747bf 100644
--- a/templates/web/default/maps/fms.html
+++ b/templates/web/default/maps/fms.html
@@ -3,6 +3,9 @@
 <script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-bing-ol.js"></script>
+<!--[if lte IE 6]>
+  <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" />
+<![endif]-->
 [% END %]
 
 [% map_html = BLOCK %]
diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html
index 45551c3d5..b84799fdd 100644
--- a/templates/web/default/maps/openlayers.html
+++ b/templates/web/default/maps/openlayers.html
@@ -86,7 +86,7 @@ var fixmystreet = {
 <a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]">
 [%- END -%]
 <img border="0" class="pin" src="[% c.uri_for('/i/pin' _ cols.${pin.colour} _ '.gif') %]"
-    alt="[% loc('Problem') %]" style="top:[% pin.py - 59 %]px; left:[% pin.px %]px; position: absolute;">
+    alt="[% loc('Problem') %]" style="top:[% pin.py - 59 %]px; left:[% pin.px - 2 %]px; position: absolute;">
 [%- IF pin.id -%]
 </a>
 [% END %]
diff --git a/templates/web/default/maps/osm-streetview.html b/templates/web/default/maps/osm-streetview.html
index ba8d1fba4..9de99c253 100644
--- a/templates/web/default/maps/osm-streetview.html
+++ b/templates/web/default/maps/osm-streetview.html
@@ -2,6 +2,9 @@
 <script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-streetview.js"></script>
+<!--[if lte IE 6]>
+  <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" />
+<![endif]-->
 [% END %]
 
 [% map_html = BLOCK %]
diff --git a/templates/web/default/maps/osm.html b/templates/web/default/maps/osm.html
index c6529566e..e2762ee26 100644
--- a/templates/web/default/maps/osm.html
+++ b/templates/web/default/maps/osm.html
@@ -2,6 +2,9 @@
 <script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenStreetMap.js"></script>
+<!--[if lte IE 6]>
+  <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" />
+<![endif]-->
 [% END %]
 
 [% map_html = BLOCK %]
diff --git a/templates/web/default/maps/pins_js.html b/templates/web/default/maps/pins_js.html
index 4a5814b15..355fffaba 100644
--- a/templates/web/default/maps/pins_js.html
+++ b/templates/web/default/maps/pins_js.html
@@ -1,4 +1,4 @@
 [ [% FOR pin IN map.pins -%]
-    [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', '[% pin.title %]' ]
+    [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', "[% pin.title | escape_js %]" ]
     [%- IF !loop.last %],[% END %]
 [% END %] ]
diff --git a/templates/web/default/maps/tilma/openlayers.html b/templates/web/default/maps/tilma/openlayers.html
deleted file mode 100644
index c8ae53bfe..000000000
--- a/templates/web/default/maps/tilma/openlayers.html
+++ /dev/null
@@ -1,26 +0,0 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-OpenLayers.js"></script>
-<script type="text/javascript" src="/js/map-tilma-ol.js"></script>
-<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
-[% END %]
-
-[% map_html = BLOCK %]
-<script type="text/javascript">
-var fixmystreet = {
-    'tilewidth': [% map.tilewidth %],
-    'tileheight': [% map.tilewidth %],
-    'latitude': [% map.latitude %],
-    'longitude': [% map.longitude %],
-    'pins': [% INCLUDE maps/pins_js.html %],
-    'tile_type': '[% map.tile_type %]',
-    'maxResolution': [% map.maxResolution %]
-};
-</script>
-<div id="map_box">
-    [% pre_map %]
-    <div id="map">
-        [% '<div id="watermark"></div>' IF map.watermark %]
-    </div>
-    <p id="copyright">[% map.copyright %]</p>
-[% END %]
diff --git a/templates/web/default/maps/tilma/original.html b/templates/web/default/maps/tilma/original.html
deleted file mode 100644
index 5a07683ac..000000000
--- a/templates/web/default/maps/tilma/original.html
+++ /dev/null
@@ -1,89 +0,0 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="/js/map-tilma.js"></script>
-[% END %]
-
-[% map_html = BLOCK %]
-
-[% IF !map.tiles %]
-    <div id="map_box">
-        <div id="map"><div id="drag">
-            [% loc("Unable to fetch the map tiles from the tile server.") %]
-        </div></div>
-    [% RETURN %]
-[% END %]
-
-[% IF map.clickable %]
-<input type="hidden" name="x" id="formX" value="[% map.x %]">
-<input type="hidden" name="y" id="formY" value="[% map.y %]">
-    [% map.img_type = 'input type="image"' %]
-[% ELSE %]
-    [% map.img_type = 'img' %]
-[% END %]
-<script type="text/javascript">
-[% c.cobrand.root_path_js %]
-var fixmystreet = {
-    'all_pins': [% all_pins || "''" | html %],
-    'x': [% map.x - 3 %],
-    'y': [% map.y - 3 %],
-    'start_x': [% map.px %],
-    'start_y': [% map.py %],
-    'tile_type': '[% map.tile_type %]',
-    'tilewidth': [% map.tilewidth %],
-    'tileheight': [% map.tilewidth %]
-};
-</script>
-<div id="map_box">
-    [% pre_map %]
-    <div id="map"><div id="drag">
-        <[% map.img_type %]
-            alt="NW map tile" id="t2.2" name="tile_[% map.x - 1 %].[% map.y %]" src="[% map.url %][% map.tileids.0.0 %]" style="top:0px; left:0;"><[% map.img_type %]
-            alt="NE map tile" id="t2.3" name="tile_[% map.x %].[% map.y %]" src="[% map.url %][% map.tileids.0.1 %]" style="top:0px; left:[% map.tilewidth %]px;"><br><[% map.img_type %]
-            alt="SW map tile" id="t3.2" name="tile_[% map.x - 1 %].[% map.y - 1 %]" src="[% map.url %][% map.tileids.1.0 %]" style="top:[% map.tilewidth %]px; left:0;"><[% map.img_type %]
-            alt="SE map tile" id="t3.3" name="tile_[% map.x %].[% map.y - 1 %]" src="[% map.url %][% map.tileids.1.1 %]" style="top:[% map.tilewidth %]px; left:[% map.tilewidth %]px;">
-        <div id="pins">[% FOR pin IN map.pins %][% INCLUDE pin %][% END %]</div>
-        </div>
-        [% '<div id="watermark"></div>' IF map.watermark %]
-        [% INCLUDE compass %]
-    </div>
-    <p id="copyright">[% map.copyright %]</p>
-[% END %]
-
-
-[% BLOCK pin %]
-
-[% num = '' IF !num or num > 9;
-   cols = {
-    red = 'R', green = 'G', blue = 'B', purple = 'P',
-   }
-%]
-[% IF pin.id %]
-<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]">
-[%- END -%]
-<img class="pin" src="[% c.uri_for('/i/pin' _ cols.${pin.colour} _ num _ '.gif') %]"
-    alt="[% loc('Problem') %]" style="top:[% pin.py - 59 %]px; left:[% pin.px %]px; position: absolute;">
-[%- IF pin.id -%]
-</a>
-[% END %]
-
-[% END %]
-
-
-[% BLOCK compass %]
-        <table cellpadding="0" cellspacing="0" border="0" id="compass">
-            <tr valign="bottom">
-                <td align="right"><a href="[% c.req.uri_with( { x => map.x - 1, y => map.y + 1 } ) %]"><img src="[% c.uri_for('/i/arrow-northwest.gif') %]" alt="NW" width=11 height=11></a></td>
-                <td align="center"><a href="[% c.req.uri_with( { x => map.x, y => map.y + 1 } ) %]"><img src="[% c.uri_for('/i/arrow-north.gif') %]" vspace="3" alt="N" width=13 height=11></a></td>
-                <td><a href="[% c.req.uri_with( { x => map.x + 1, y => map.y + 1 } ) %]"><img src="[% c.uri_for('/i/arrow-northeast.gif') %]" alt="NE" width=11 height=11></a></td>
-            </tr>
-            <tr>
-                <td><a href="[% c.req.uri_with( { x => map.x - 1, y => map.y } ) %]"><img src="[% c.uri_for('/i/arrow-west.gif') %]" hspace="3" alt="W" width=11 height=13></a></td>
-                <td align="center"><a href="$recentre"><img src="[% c.uri_for('/i/rose.gif') %]" alt="Recentre" width=35 height=34></a></td>
-                <td><a href="[% c.req.uri_with( { x => map.x + 1, y => map.y } ) %]"><img src="[% c.uri_for('/i/arrow-east.gif') %]" hspace="3" alt="E" width=11 height=13></a></td>
-            </tr>
-            <tr valign="top">
-                <td align="right"><a href="[% c.req.uri_with( { x => map.x - 1, y => map.y - 1 } ) %]"><img src="[% c.uri_for('/i/arrow-southwest.gif') %]" alt="SW" width=11 height=11></a></td>
-                <td align="center"><a href="[% c.req.uri_with( { x => map.x, y => map.y - 1 } ) %]"><img src="[% c.uri_for('/i/arrow-south.gif') %]" vspace="3" alt="S" width=13 height=11></a></td>
-                <td><a href="[% c.req.uri_with( { x => map.x + 1, y => map.y - 1 } ) %]"><img src="[% c.uri_for('/i/arrow-southeast.gif') %]" alt="SE" width=11 height=11></a></td>
-            </tr>
-        </table>
-[% END %]