Changeset 1112 for sites/oxford.openguides.org

Timestamp:

07/05/07 22:19:19 (17 months ago)

Author:

dom

Message:

Merge with 0.61

Location:

sites/oxford.openguides.org/templates

Files:

• display_metadata.tt (modified) (2 diffs)
• map_index.tt (modified) (2 diffs)
• node.tt (modified) (3 diffs)

sites/oxford.openguides.org/templates/display_metadata.tt

@@ -88 +88 @@
         <span class="metadata_label">Categories:</span>
         [% FOREACH category = categories %]
-          <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %]
+          [% IF category.url != "" %]
+            <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %]
+          [% ELSE %]
+            [% category.name %][%- "," UNLESS loop.last %]
+          [% END %]
         [% END %]
       </li>
@@ -97 +101 @@
         <span class="metadata_label">Locales:</span>
         [% FOREACH locale = locales %]
-          <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %]
+          [% IF locale.url != "" %]
+            <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %]
+          [% ELSE %]
+            [% locale.name %][%- "," UNLESS loop.last %]
+          [% END %]
         [% END %]
       </li>

sites/oxford.openguides.org/templates/map_index.tt

@@ -12 +12 @@
     [% metadata = node.node_data.metadata %]
     [% i = 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='#' onclick="marker[% i %].openInfoWindowHtml(htmlString[% i %]); return false;">[% node.name %]</a>[% IF metadata.city.list.first %], [% metadata.city.list.first %][% END %]</li>
     [% END %]
@@ -52 +52 @@
         [% i = i + 1 %]
         [% metadata = 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.first %]
+        [% NEXT IF metadata.wgs84_lat.list.first.match('m') %]
+        [% NEXT IF metadata.wgs84_long.list.first.match('m') %]
           var point[% i %] = new GPoint([% metadata.wgs84_long.list.first %], [% metadata.wgs84_lat.list.first %]); 
           var marker[% i %] = new GMarker(point[% i %],baseIcon);

sites/oxford.openguides.org/templates/node.tt

@@ -46 +46 @@
 [% END %]
 
+<div id="node_title">
 [% IF current %]
   [% IF backlinks_in_title AND is_indexable_node %]
@@ -66 +67 @@
 [% 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="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>?
+</div>
+<div id="nonexistent_node_message">We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>?</div>
 [% ELSE %]
+<div id="title_edit_link">
+<a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">Edit this page</a>
+</div>
+</div>
 [% INCLUDE display_metadata.tt %]
 
@@ -124 +130 @@
   <small>
     (Latitude: 
+    <!-- titles using the wgs84 versions here are for microformats -->
     <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr>
         Longitude: