From svnadmin@urchin.earth.li Thu Jul  5 22:19:20 2007
From: svnadmin@urchin.earth.li
To: openguides-commits@lists.openguides.org
Subject: [openguides-commits] r1112 - sites/oxford.openguides.org/templates
Date: Thu, 05 Jul 2007 22:19:19 +0100
Message-ID: <E1I6YjP-0007Gz-Vk@urchin.earth.li>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6604167027927633647=="

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

Author: dom
Date: 2007-07-05 22:19:19 +0100 (Thu, 05 Jul 2007)
New Revision: 1112

Modified:
   sites/oxford.openguides.org/templates/display_metadata.tt
   sites/oxford.openguides.org/templates/map_index.tt
   sites/oxford.openguides.org/templates/node.tt
Log:
Merge with 0.61


Modified: 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	2007-07-05 21:0=
8:44 UTC (rev 1111)
+++ sites/oxford.openguides.org/templates/display_metadata.tt	2007-07-05 21:1=
9:19 UTC (rev 1112)
@@ -87,7 +87,11 @@
       <li class=3D"categories_list">
         <span class=3D"metadata_label">Categories:</span>
         [% FOREACH category =3D categories %]
-          <a href=3D"[% category.url %]" class=3D"category">[% category.name=
 %]</a>[%- "," UNLESS loop.last %]
+          [% 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 %]
@@ -96,7 +100,11 @@
       <li class=3D"locales_list">
         <span class=3D"metadata_label">Locales:</span>
         [% FOREACH locale =3D locales %]
-          <a href=3D"[% locale.url %]" class=3D"addr locality">[% locale.nam=
e %]</a>[%- "," UNLESS loop.last %]
+          [% 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 %]

Modified: 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	2007-07-05 21:08:44 UT=
C (rev 1111)
+++ sites/oxford.openguides.org/templates/map_index.tt	2007-07-05 21:19:19 UT=
C (rev 1112)
@@ -11,9 +11,9 @@
   [% FOREACH node =3D nodes %]
     [% metadata =3D node.node_data.metadata %]
     [% i =3D i + 1 %]
-    [% IF metadata.latitude.list.first AND metadata.longitude.list.first %]
-      [% NEXT IF metadata.latitude.list.first.match('m') %]
-      [% NEXT IF metadata.longitude.list.first.match('m') %]
+    [% 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 %]
@@ -51,9 +51,9 @@
       [% FOREACH node =3D nodes %]
         [% i =3D i + 1 %]
         [% metadata =3D node.node_data.metadata %]
-        [% IF metadata.latitude.list.first AND metadata.longitude.list.first=
 %]
-        [% NEXT IF metadata.latitude.list.first.match('m') %]
-        [% NEXT IF metadata.longitude.list.first.match('m') %]
+        [% 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 %]

Modified: 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	2007-07-05 21:08:44 UTC (re=
v 1111)
+++ sites/oxford.openguides.org/templates/node.tt	2007-07-05 21:19:19 UTC (re=
v 1112)
@@ -45,6 +45,7 @@
   </script>
 [% END %]
=20
+<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>
@@ -65,8 +66,13 @@
   </h2>
 [% END %]
 [% IF not (content || coord_field_1_value || coord_field_2_value || latitude=
 || longitude) %]
-We don't have a node called "[% node_param %]". Would you like to <a href=3D=
"[% full_cgi_url %]?action=3Dedit;id=3D[% node_param %]">create it</a>?
+</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 %]
=20
 <!-- NODE CONTENT STARTS -->
@@ -123,6 +129,7 @@
 [% 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>)



--===============6604167027927633647==--