Author: kake Date: 2012-07-29 20:58:36 +0100 (Sun, 29 Jul 2012) New Revision: 1432

Modified: trunk/Changes trunk/t/904_leaflet.t trunk/templates/header.tt Log: Updated URLs for Leaflet JavaScript and CSS.

Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-07-22 13:18:29 UTC (rev 1431) +++ trunk/Changes 2012-07-29 19:58:36 UTC (rev 1432) @@ -3,9 +3,12 @@ More detailed changelogs can be found at http://dev.openguides.org/log/trunk.

+0.70 ? + Updated URLs for Leaflet JavaScript and CSS. + 0.69 07 July 2012 The output of the "show_missing_metadata" action is now alphabetised. - There's also now an option to view the results on a map. (#296 & #294) + There's also now an option to view the results on a map. (#296 & #294). Fixed a JavaScript escaping issue for nodes with apostrophes in names.

0.68 21 May 2012

Modified: trunk/t/904_leaflet.t =================================================================== --- trunk/t/904_leaflet.t 2012-07-22 13:18:29 UTC (rev 1431) +++ trunk/t/904_leaflet.t 2012-07-29 19:58:36 UTC (rev 1432) @@ -78,7 +78,7 @@ $output = $guide->display_node( id => "Red Lion", return_output => 1 ); unlike( $output, qr/<script.*I like using deprecated code/, "...but not when Leaflet switched on." ); -like( $output, qr|http://code.leafletjs.com/.*leaflet.js%7C, +like( $output, qr|http://cdn.leafletjs.com/.*leaflet.js%7C, "Leaflet JavaScript is included when Leaflet switched on." ); like( $output, qr|http://example.com/static/map-leaflet.js%7C, "...as is our own Leaflet map JavaScript." );

Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2012-07-22 13:18:29 UTC (rev 1431) +++ trunk/templates/header.tt 2012-07-29 19:58:36 UTC (rev 1432) @@ -33,9 +33,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://code.leafletjs.com/leaflet-0.3.1/leaflet.css" /> + <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.3.1/leaflet.css" /> <!--[if lte IE 8]> - <link rel="stylesheet" href="http://code.leafletjs.com/leaflet-0.3.1/leaflet.ie.css" /> + <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.3.1/leaflet.ie.css" /> <![endif]--> [% END %]

@@ -75,7 +75,7 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script> - <script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js" + <script src="http://cdn.leafletjs.com/leaflet-0.3.1/leaflet.js" type="text/javascript"></script> <script src="[% config.static_url %]map-leaflet.js" type="text/javascript"></script>