Author: kake
Date: 2012-08-24 17:14:32 +0100 (Fri, 24 Aug 2012)
New Revision: 1436
Modified:
trunk/Changes
trunk/static/map-leaflet.js
trunk/templates/header.tt
Log:
Updated to version 0.4 of Leaflet.
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2012-08-19 09:13:28 UTC (rev 1435)
+++ trunk/Changes 2012-08-24 16:14:32 UTC (rev 1436)
@@ -18,7 +18,8 @@
content: "]";
color: black;
}
- Updated URLs for Leaflet JavaScript and CSS.
+ Updated to use version 0.4 of Leaflet (needed for plugins used on a
+ couple of live guides).
Added meta descriptions to headers of map and list index pages
(fixes #301).
Implemented new @INDEX_LIST_NO_PREFIX macro.
Modified: trunk/static/map-leaflet.js
===================================================================
--- trunk/static/map-leaflet.js 2012-08-19 09:13:28 UTC (rev 1435)
+++ trunk/static/map-leaflet.js 2012-08-24 16:14:32 UTC (rev 1436)
@@ -2,11 +2,13 @@
var positions = [], markers = [];
var gicon = L.Icon.extend( {
- iconUrl: 'http://maps.google.com/mapfiles/ms/micons/red-dot.png',
- shadowUrl: null,
- iconSize: new L.Point( 32, 32 ),
- iconAnchor: new L.Point( 15, 32 ),
- popupAnchor: new L.Point( 0, -30 )
+ options: {
+ iconUrl: 'http://maps.google.com/mapfiles/ms/micons/red-dot.png',
+ shadowUrl: null,
+ iconSize: new L.Point( 32, 32 ),
+ iconAnchor: new L.Point( 15, 32 ),
+ popupAnchor: new L.Point( 0, -30 )
+ }
} );
$(
Modified: trunk/templates/header.tt
===================================================================
--- trunk/templates/header.tt 2012-08-19 09:13:28 UTC (rev 1435)
+++ trunk/templates/header.tt 2012-08-24 16:14:32 UTC (rev 1436)
@@ -37,9 +37,9 @@
<link rel="stylesheet" href="[% config.static_url
%]openguides-base.css" type="text/css" title="Basic OpenGuides
stylesheet" />
[% END %]
[% IF config.use_leaflet %]
- <link rel="stylesheet"
href="http://cdn.leafletjs.com/leaflet-0.3.1/leaflet.css" />
+ <link rel="stylesheet"
href="http://cdn.leafletjs.com/leaflet-0.4/leaflet.css" />
<!--[if lte IE 8]>
- <link rel="stylesheet"
href="http://cdn.leafletjs.com/leaflet-0.3.1/leaflet.ie.css" />
+ <link rel="stylesheet"
href="http://cdn.leafletjs.com/leaflet-0.4/leaflet.ie.css" />
<![endif]-->
[% END %]
@@ -79,7 +79,7 @@
<script
src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js&…
type="text/javascript"></script>
- <script
src="http://cdn.leafletjs.com/leaflet-0.3.1/leaflet.js"
+ <script
src="http://cdn.leafletjs.com/leaflet-0.4/leaflet.js"
type="text/javascript"></script>
<script src="[% config.static_url %]map-leaflet.js"
type="text/javascript"></script>