From svnadmin@urchin.earth.li Wed Jan  2 17:22:32 2013
From: svnadmin@urchin.earth.li
To: openguides-commits@lists.openguides.org
Subject: [openguides-commits] r1454 - sites/oxford.openguides.org/templates
Date: Wed, 02 Jan 2013 17:22:32 +0000
Message-ID: <E1TqS1Q-0000Vt-BM@urchin.earth.li>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7545072179074274900=="

--===============7545072179074274900==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: dom
Date: 2013-01-02 17:22:32 +0000 (Wed, 02 Jan 2013)
New Revision: 1454

Removed:
   sites/oxford.openguides.org/templates/custom_header.tt
   sites/oxford.openguides.org/templates/display_metadata.tt
   sites/oxford.openguides.org/templates/map_index.tt
   sites/oxford.openguides.org/templates/node.tt
Log:
remove stuff related to mapnik


Deleted: sites/oxford.openguides.org/templates/custom_header.tt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sites/oxford.openguides.org/templates/custom_header.tt	2013-01-02 16:37:0=
6 UTC (rev 1453)
+++ sites/oxford.openguides.org/templates/custom_header.tt	2013-01-02 17:22:3=
2 UTC (rev 1454)
@@ -1,3 +0,0 @@
-[% IF enable_gmaps AND display_google_maps AND gmaps_api_key %]
-    <script src=3D"http://oxford.openguides.org/resources/mapnik.js" type=3D=
"text/javascript"></script>
-[% END %]

Deleted: sites/oxford.openguides.org/templates/display_metadata.tt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sites/oxford.openguides.org/templates/display_metadata.tt	2013-01-02 16:3=
7:06 UTC (rev 1453)
+++ sites/oxford.openguides.org/templates/display_metadata.tt	2013-01-02 17:2=
2:32 UTC (rev 1454)
@@ -1,115 +0,0 @@
-[% USE CGI %]
-<!-- METADATA STARTS -->
-[% IF phone OR fax OR address OR postcode OR formatted_website_text
-       OR hours_text OR map_link OR categories.size OR locales.size OR
-       node_image %]
-<div id=3D"metadata" class=3D"vcard">
-[% IF node_image %]
-  <div id=3D"node_image_box">
-    [% IF node_image_url %]<a href=3D"[% node_image_url %]">[% END %]
-    <img id=3D"node_image" src=3D"[% node_image %]"
-         alt=3D"Picture of [% node_name %]" />
-    [% IF node_image_url %]</a>[% END %]
-    [% IF node_image_copyright %]
-      <div id=3D"node_image_copyright">
-        [% IF node_image_licence %]
-          <a href=3D"[% node_image_licence %]">&copy;
-            [% node_image_copyright %]</a>
-        [% ELSE %]
-          &copy; [% node_image_copyright %]
-        [% END %]
-      </div>
-    [% END %]
-  </div>
-[% ELSE %]
-  <span id=3D"node_no_image" />
-[% END %]
-
-  <!-- For the vcard -->
-  <span class=3D"fn" style=3D"display:none">[% node_name %]</span>
-[% IF phone OR fax OR address OR postcode OR formatted_website_text
-      OR hours_text OR map_link %]=20
-  <ul id=3D"general_metadata">
-
-    [% IF phone %]
-      <li class=3D"telephone">
-        <span class=3D"metadata_label">Telephone (01865 if omitted):</span> =
<span class=3D"tel">[% CGI.escapeHTML(phone) %]</span>
-      </li>
-    [% END %]
-    [% IF fax %]
-      <li class=3D"fax">
-        <span class=3D"metadata_label">Fax (01865 if omitted):</span> [% CGI=
.escapeHTML(fax) %]
-      </li>
-    [% END %]
-    [% IF address %]
-      <li class=3D"address">
-        <span class=3D"metadata_label">Address:</span>
-        <span class=3D"adr"><span class=3D"street-address">[% CGI.escapeHTML=
(address) %]</span></span><!--, [% default_city %] --> [%# uncomment at left =
to show city %]
-        [% IF map_link %]
-          <a href=3D"[% map_link %]">(map of this place)</a>
-        [% ELSIF os_x AND os_y %]
-          <a href=3D"http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os=
_x %]&amp;[% os_y %]&amp;arrow=3Dyes">(map of this place)</a>
-        [% END %]
-      </li>
-    [% ELSIF map_link %]
-      <li class=3D"map">
-        <span class=3D"metadata_label"><a href=3D"[% map_link %]">Map of thi=
s place</a></span>
-      </li>
-    [% ELSIF os_x AND os_y %]
-      <li class=3D"map">
-        <span class=3D"metadata_label"><a href=3D"http://www.streetmap.co.uk=
/streetmap.dll?grid2map?[% os_x %]&amp;[% os_y %]&amp;arrow=3Dyes">(map of th=
is place)</a></span>
-      </li>
-    [% END %]
-    [% IF postcode %]
-      <li class=3D"postcode">
-        <span class=3D"metadata_label">Postcode:</span>
-        <span class=3D"adr"><span class=3D"postal-code">[% CGI.escapeHTML(po=
stcode) %]</span></span>
-      </li>
-    [% END %]
-    [% IF formatted_website_text %]
-      <li class=3D"website_link">
-        <span class=3D"metadata_label">Website:</span> <span class=3D"url">[=
% formatted_website_text %]</span>
-      </li>
-    [% END %]
-    [% IF hours_text %]
-      <li class=3D"opening_hours">
-        <span class=3D"metadata_label">Opening Hours:</span>
-        [% CGI.escapeHTML(hours_text) %]
-      </li>
-    [% END %]
-  </ul>
-[% END %]
-
-[% IF (categories.size AND categories.size > 0)
-   OR (locales.size AND locales.size > 0) %]
-  <ul id=3D"categories_and_locales">
-    [% IF categories.size AND categories.size > 0 %]
-      <li class=3D"categories_list">
-        <span class=3D"metadata_label">Categories:</span>
-        [% FOREACH category =3D categories %]
-          [% IF category.url !=3D "" %]
-            <a href=3D"[% category.url %]" class=3D"category">[% category.na=
me %]</a>[%- "," UNLESS loop.last %]
-          [% ELSE %]
-            [% category.name %][%- "," UNLESS loop.last %]
-          [% END %]
-        [% END %]
-      </li>
-    [% END %]
-
-    [% IF locales.size AND locales.size > 0 %]
-      <li class=3D"locales_list">
-        <span class=3D"metadata_label">Locales:</span>
-        [% FOREACH locale =3D locales %]
-          [% IF locale.url !=3D "" %]
-            <a href=3D"[% locale.url %]" class=3D"addr locality">[% locale.n=
ame %]</a>[%- "," UNLESS loop.last %]
-          [% ELSE %]
-            [% locale.name %][%- "," UNLESS loop.last %]
-          [% END %]
-        [% END %]
-      </li>
-    [% END %]
-  </ul>
-[% END %]
-</div>
-[% END %]
-<!-- METADATA ENDS -->

Deleted: sites/oxford.openguides.org/templates/map_index.tt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sites/oxford.openguides.org/templates/map_index.tt	2013-01-02 16:37:06 UT=
C (rev 1453)
+++ sites/oxford.openguides.org/templates/map_index.tt	2013-01-02 17:22:32 UT=
C (rev 1454)
@@ -1,85 +0,0 @@
-[% INCLUDE header.tt page_title =3D criterion.name || "Map of all nodes" %]
-[% INCLUDE banner.tt %]
-<div id=3D"content">
-<a href=3D"" id=3D"permalink">Link to this page</a>
-
-<div id=3D"maincontent">
-
-[% IF gmaps_api_key %]
-  <ul style=3D"height:400px; overflow:auto;float:right; width:30%;">
-  [% i =3D 0 %]
-  [% FOREACH node =3D nodes %]
-    [% metadata =3D node.node_data.metadata %]
-    [% i =3D i + 1 %]
-    [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %]
-      [% NEXT IF metadata.wgs84_lat.list.first.match('m') %]
-      [% NEXT IF metadata.wgs84_long.list.first.match('m') %]
-      <li><a href=3D'#' onclick=3D"marker[% i %].openInfoWindowHtml(htmlStri=
ng[% i %]); return false;">[% node.name %]</a>[% IF metadata.city.list.first =
%], [% metadata.city.list.first %][% END %]</li>
-    [% END %]
-  [% END %]
-  </ul>
-
-  <table width=3D"100%" height=3D"100%">
-  <tr><td><div id=3D"map" style=3D" width: 65%; height: 450px"></div></td></=
tr>
-  </table>
-
-  <script defer=3D"defer" type=3D"text/javascript">
-    //<![CDATA[
-      var map =3D new GMap2(document.getElementById("map"));
-     =20
-      var copycol =3D new GCopyrightCollection("");
-      var copy =3D new GCopyright(1, new GLatLngBounds(new GLatLng(-90,-180)=
,new GLatLng(90,180)), 0, "&copy;2007 <a href=3D'http://www.openstreetmap.org=
>OpenStreetMap</a> contributors");
-      copycol.addCopyright(copy);
-      var tileMapnik =3D new GTileLayer(copycol,1,18);
-      tileMapnik.myBaseURL =3D "http://tile.openstreetmap.org/";
-      tileMapnik.getTileUrl=3DMapnikGetTileUrl;
-      tileMapnik.isPng =3D function () { return true;}
-      tileMapnik.getOpacity =3D function() {return 1.0;}
-
-      var layer0 =3D [tileMapnik];
-      var mapnikMap =3D new GMapType(layer0, G_SATELLITE_MAP.getProjection()=
, "OSM", G_SATELLITE_MAP);
-      map.addMapType(mapnikMap);
-    =20
-      map.addControl(new GLargeMapControl());
-      map.addControl(new GMapTypeControl());
-     =20
-      map.setCenter(new GLatLng([% IF lat %][% lat %][% ELSE %][% centre_lat=
 %][% END %],[% IF long %][% long %][% ELSE %][% centre_long %][% END %]), [%=
 IF zoom %][% zoom %][% ELSE %][% default_gmaps_zoom %][% END %]);
-      //map.centerAndZoom(new GPoint([% IF long %][% long %][% ELSE %][% cen=
tre_long %][% END %],[% IF lat %][% lat %][% ELSE %][% centre_lat %][% END %]=
), [% IF zoom %][% zoom %][% ELSE %][% default_gmaps_zoom %][% END %]);
-      map.setMapType(mapnikMap);
-
-      [% i =3D 0 %]
-      [% FOREACH node =3D nodes %]
-        [% i =3D i + 1 %]
-        [% metadata =3D node.node_data.metadata %]
-        [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.fir=
st %]
-        [% NEXT IF metadata.wgs84_lat.list.first.match('m') %]
-        [% NEXT IF metadata.wgs84_long.list.first.match('m') %]
-          var point[% i %] =3D new GPoint([% metadata.wgs84_long.list.first =
%], [% metadata.wgs84_lat.list.first %]);=20
-          var marker[% i %] =3D new GMarker(point[% i %],baseIcon);
-          [% IF metadata.source %]
-            [% source_url =3D metadata.source.list.first.match('^(.*?)\?(?:\=
?|$)').first %]
-          [% END %]
-          var htmlString[% i %] =3D "<a href=3D\"?[% node.param %]\">[% node=
.name %]</a>&nbsp;<a style=3D'text-decoration:none;' href=3D\"[% source_url %=
]?id=3D[% node.param %];action=3Dedit\">(edit)</a><br />[% metadata.address.l=
ist.first %]<br />[% metadata.city.list.first %]";
-          GEvent.addListener(marker[% i %], "click", function() {=20
-            marker[% i %].openInfoWindowHtml(htmlString[% i %]);=20
-            });=20
-          map.addOverlay(marker[% i %]);=20
-        [% END %]
-      [% END %]
-      function map_recenter() {
-        var center =3D map.getCenterLatLng();
-        var link =3D document.getElementById('permalink');
-        var zoom =3D map.getZoomLevel();
-        link.href =3D "?action=3Dindex;format=3Dmap&long=3D"+center.x+"&lat=
=3D"+center.y+"&zoom=3D"+zoom;
-      }
-      GEvent.addListener(map, "moveend", map_recenter );
-    //]]>
-  </script>
-[% ELSE %]
-  Sorry, this guide doesn't have Google Maps functionality enabled.
-[% END %]
-
-</div>
-</div>
-
-[% INCLUDE footer.tt %]

Deleted: sites/oxford.openguides.org/templates/node.tt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sites/oxford.openguides.org/templates/node.tt	2013-01-02 16:37:06 UTC (re=
v 1453)
+++ sites/oxford.openguides.org/templates/node.tt	2013-01-02 17:22:32 UTC (re=
v 1454)
@@ -1,177 +0,0 @@
-[% USE CGI %]
-[% INCLUDE header.tt %]
-[% INCLUDE banner.tt %]
-<div id=3D"content">
-[% IF !config.content_above_navbar_in_html %]
-  [% INCLUDE navbar.tt %]
-[% END %]
-<div id=3D"maincontent" class=3D"hreview">
-[% IF oldid %]
-<div id=3D"redirect_message">(redirected from <a href=3D"[% full_cgi_url %]?=
id=3D[% oldid %];redirect=3D0">[% oldid.replace('_', ' ') %]</a>)</div>
-[% END %]
-
-[% IF wgs84_lat AND wgs84_long AND display_google_maps and gmaps_api_key %]
-  <div id=3D"map" style=3D"float:right; width: 300px; height: 200px"></div>
-  <script defer=3D"defer" type=3D"text/javascript">
-  //<![CDATA[
-    var map =3D new GMap2(document.getElementById("map"));
-    new GKeyboardHandler(map);
-    var copycol =3D new GCopyrightCollection("");
-    var copy =3D new GCopyright(1, new GLatLngBounds(new GLatLng(-90,-180),n=
ew GLatLng(90,180)), 0, "<a href=3D'http://www.openstreetmap.org>OpenStreetMa=
p</a>");
-    copycol.addCopyright(copy);
-    var tileMapnik =3D new GTileLayer(copycol,1,18);
-    tileMapnik.myBaseURL =3D "http://tile.openstreetmap.org/";
-    tileMapnik.getTileUrl=3DMapnikGetTileUrl;
-    tileMapnik.isPng =3D function () { return true;}
-    tileMapnik.getOpacity =3D function() {return 1.0;}
-
-    var layer0 =3D [tileMapnik];
-    var mapnikMap =3D new GMapType(layer0, G_SATELLITE_MAP.getProjection(), =
"OSM", G_SATELLITE_MAP);
-    map.addMapType(mapnikMap);
-   =20
-
-    map.addControl(new GMapTypeControl());
-    map.setCenter(new GLatLng([% wgs84_lat %], [% wgs84_long %]), 14);
-    map.setMapType(mapnikMap);
-    map.addControl(new GSmallMapControl());
-    var point0 =3D new GPoint([% wgs84_long %], [% wgs84_lat %]);
-    var marker0 =3D new GMarker(point0,baseIcon);
-    GEvent.addListener(marker0, "click", function() {
-      marker0.openInfoWindowHtml("[% node_name %]");
-      });
-    map.addOverlay(marker0);
-   =20
-  //]]>
-  </script>
-[% END %]
-
-<div id=3D"node_title">
-[% IF current %]
-  [% IF backlinks_in_title AND is_indexable_node %]
-    <h2 class=3D"node_name"><a href=3D"[% cgi_url %]?action=3Dindex;index_ty=
pe=3D[% CGI.escape(index_type) %];index_value=3D[% CGI.escape(index_value) %]=
">[% node_name %]</a></h2>
-  [% ELSIF backlinks_in_title %]
-    <h2 class=3D"node_name"><a href=3D"[% cgi_url %]?action=3Dshow_backlinks=
;id=3D[% CGI.escape(node_name) %]">[% node_name %]</a></h2>
-  [% ELSE %]
-    <h2 class=3D"node_name">[% node_name %]</h2>
-  [% END %]
-[% ELSE %]
-  <h2><em>
-  [% IF moderated %]
-    Historical
-  [% ELSE %]
-    Un-moderated
-  [% END %]
-    version [% version %] of
-    <span class=3D"node_name">[% node_name %]</span></em>
-  </h2>
-[% END %]
-[% IF not (content || coord_field_1_value || coord_field_2_value || latitude=
 || longitude) %]
-</div>
-<div id=3D"nonexistent_node_message">We don't have a node called "[% node_pa=
ram %]". Would you like to <a href=3D"[% full_cgi_url %]?action=3Dedit;id=3D[=
% node_param %]">create it</a>?</div>
-[% ELSE %]
-<div id=3D"title_edit_link">
-<a href=3D"[% full_cgi_url %]?action=3Dedit;id=3D[% node_param %]">Edit this=
 page</a>
-</div>
-</div>
-[% INCLUDE display_metadata.tt %]
-
-<!-- NODE CONTENT STARTS -->
-<div id=3D"content_text" class=3D"description">
-[% content %]
-</div>
-<!-- NODE CONTENT ENDS -->
-
-[% TRY %]
-  [% INCLUDE custom_node.tt %]
-[% CATCH %]
-[% END %]
-                         =20
-[% IF coord_field_1_value AND coord_field_2_value %]
-  <br clear=3D"all" />
-  <div id=3D"find_within_distance">
-    <form action=3D"search.cgi">
-      <label for=3D"distance">Find all things within</label>
-      <select name=3D"[% dist_field %]" id=3D"distance">
-        <option value=3D"500">500 metres</option>
-        <option value=3D"1000">1 kilometre</option>
-        <option value=3D"1500">1.5 kilometres</option>
-        <option value=3D"2000">2 kilometres</option>
-      </select>
-      of here.
-      <input type=3D"hidden" name=3D"[% coord_field_1 %]" value=3D"[% coord_=
field_1_value %]" />
-      <input type=3D"hidden" name=3D"[% coord_field_2 %]" value=3D"[% coord_=
field_2_value %]" />
-      <input type=3D"submit" name=3D"Go" value=3D"Go" class=3D"form_button" =
/>
-    </form>
-  </div>
-[% END %]
-[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %]
-<div id=3D"coordinates" class=3D"geo">
-[% END %]
-[% IF os_x AND os_y %]
-  <small>OS X co-ord:=20
-    <abbr class=3D"osgb_x" title=3D"[% CGI.escapeHTML(os_x) %]">[% CGI.escap=
eHTML(os_x) %]</abbr>
-  </small>
-  &nbsp;&nbsp;&nbsp;
-  <small>OS Y co-ord:=20
-    <abbr class=3D"osgb_y" title=3D"[% CGI.escapeHTML(os_y) %]">[% CGI.escap=
eHTML(os_y) %]</abbr>
-  </small>
-  &nbsp;&nbsp;&nbsp;
-[% ELSIF osie_x AND osie_y %]
-  <small>OS IE X co-ord:=20
-    <abbr class=3D"osie_x" title=3D"[% CGI.escapeHTML(osie_x) %]">[% CGI.esc=
apeHTML(osie_x) %]</abbr>
-  </small>
-  &nbsp;&nbsp;&nbsp;
-  <small>OS IE Y co-ord:=20
-    <abbr class=3D"osie_y" title=3D"[% CGI.escapeHTML(osie_y) %]">[% CGI.esc=
apeHTML(osie_y) %]</abbr>
-  </small>
-  &nbsp;&nbsp;&nbsp;
-[% END %]
-[% IF latitude AND longitude %]
-  <small>
-    (Latitude:=20
-    <!-- titles using the wgs84 versions here are for microformats -->
-    <abbr class=3D"latitude" title=3D"[% wgs84_lat %]">[% latitude %]</abbr>
-	Longitude:=20
-	<abbr class=3D"longitude" title=3D"[% wgs84_long %]">[% longitude %]</abbr>)
-  </small>
-[% END %]
-[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%]
-</div>
-[% END %]
-<div id=3D"rdf_link">
-  <a href=3D"[% cgi_url %]?id=3D[% node_param %];format=3Drdf">RDF/XML for t=
his
-  node</a>
-  [% IF rss_locale_url %]
-    / <a href=3D"[% rss_locale_url %]">RSS feed for this locale</a>
-  [% END %]
-  [% IF rss_category_url %]
-    / <a href=3D"[% rss_category_url %]">RSS feed for this category</a>
-  [% END %]
-</div>
-<div id=3D"version">
-[% IF current %]
-  Last edited [% last_modified %]
-  [% IF version =3D=3D 1 %]
-    (version [% version %])
-  [% ELSE %]
-    (version [% version %];
-    <a href=3D"[% cgi_url %]?id=3D[% node_param %];version=3D[% version - 1 =
%];diffversion=3D[% version %]">diff</a>).
-  [% END %]
-[% ELSE %]
-  This is version <span class=3D"version">[% version %]</span>=20
-  (as of [% last_modified %]).=20
-  <a href=3D"[% cgi_url %]?[% node_param %]">View current version.</a>=20
-[% END %]
-[% IF version AND version > 1 %]
-<a href=3D"[% cgi_url %]?action=3Dlist_all_versions;id=3D[% node_param %]">L=
ist all
-versions.</a>
-[% END %]
-</div>
-[% END %]
-</div>
-
-[% IF config.content_above_navbar_in_html %]
-  [% INCLUDE navbar.tt %]
-[% END %]
-
-[% INCLUDE footer.tt %]



--===============7545072179074274900==--