Changeset 1076

Timestamp:

06/12/07 23:39:09 (16 months ago)

Author:

dom

Message:

Sync with 0.60 templates

Location:

sites/oxford.openguides.org/templates

Files:

• custom_header.tt (added)
• display_metadata.tt (modified) (4 diffs)
• display_metadata.tt.old (deleted)
• header.tt (deleted)
• map_index.tt (modified) (1 diff)
• navbar.tt (deleted)
• navbar_this_page.tt (added)
• needing_moderation.tt (deleted)

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

@@ -6 +6 @@
 <div id="metadata" class="vcard">
 [% IF node_image %]
-        <div id="node_image_box">
-                <img id="node_image" src="[% node_image %]" alt="Picture of [% node_name %]" />
-        </div>
+  <div id="node_image_box">
+    [% IF node_image_url %]<a href="[% node_image_url %]">[% END %]
+    <img id="node_image" src="[% node_image %]"
+         alt="Picture of [% node_name %]" />
+    [% IF node_image_url %]</a>[% END %]
+    [% IF node_image_copyright %]
+      <div id="node_image_copyright">
+        [% IF node_image_licence %]
+          <a href="[% node_image_licence %]">&copy;
+            [% node_image_copyright %]</a>
+        [% ELSE %]
+          &copy; [% node_image_copyright %]
+        [% END %]
+      </div>
+    [% END %]
+  </div>
 [% ELSE %]
-        <span id="node_no_image" />
+  <span id="node_no_image" />
 [% END %]
 
-  <!--- For the vcard --->
+  <!-- For the vcard -->
   <span class="fn" style="display:none">[% node_name %]</span>
 [% IF phone OR fax OR address OR postcode OR formatted_website_text
@@ -21 +34 @@
     [% IF phone %]
       <li class="telephone">
-        <span class="metadata_label">Telephone (area code 01865 if omitted):</span> <span class="tel">[% CGI.escapeHTML(phone) %]</span>
+        <span class="metadata_label">Telephone (01865 if omitted):</span> <span class="tel">[% CGI.escapeHTML(phone) %]</span>
       </li>
     [% END %]
     [% IF fax %]
       <li class="fax">
-        <span class="metadata_label">Fax: (area code 01865 if omitted)</span> [% CGI.escapeHTML(fax) %]
+        <span class="metadata_label">Fax (01865 if omitted):</span> [% CGI.escapeHTML(fax) %]
       </li>
     [% END %]
@@ -36 +49 @@
           <a href="[% map_link %]">(map of this place)</a>
         [% ELSIF os_x AND os_y %]
-          <a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]
-&amp;[% os_y %]&amp;arrow=yes">(map of this place)</a>
-
+          <a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&amp;[% os_y %]&amp;arrow=yes">(map of this place)</a>
         [% END %]
       </li>
@@ -44 +55 @@
       <li class="map">
         <span class="metadata_label"><a href="[% map_link %]">Map of this place</a></span>
+      </li>
+    [% ELSIF os_x AND os_y %]
+      <li class="map">
+        <span class="metadata_label"><a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&amp;[% os_y %]&amp;arrow=yes">(map of this place)</a></span>
       </li>
     [% END %]

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

@@ -1 @@
-[% INCLUDE header.tt page_title = "Map of all nodes" %]
+[% INCLUDE header.tt page_title = criterion.name || "Map of all nodes" %]
 [% INCLUDE banner.tt %]
 <div id="content">