Author: dom Date: 2007-06-12 23:39:09 +0100 (Tue, 12 Jun 2007) New Revision: 1076
Added: sites/oxford.openguides.org/templates/custom_header.tt sites/oxford.openguides.org/templates/navbar_this_page.tt Removed: sites/oxford.openguides.org/templates/display_metadata.tt.old sites/oxford.openguides.org/templates/header.tt sites/oxford.openguides.org/templates/navbar.tt sites/oxford.openguides.org/templates/needing_moderation.tt Modified: sites/oxford.openguides.org/templates/display_metadata.tt sites/oxford.openguides.org/templates/map_index.tt Log: Sync with 0.60 templates
Added: sites/oxford.openguides.org/templates/custom_header.tt =================================================================== --- sites/oxford.openguides.org/templates/custom_header.tt (rev 0) +++ sites/oxford.openguides.org/templates/custom_header.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -0,0 +1,3 @@ +[% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] + <script src="http://media.mapnik.org/js/mapnik.js" type="text/javascript"></script> +[% END %]
Modified: sites/oxford.openguides.org/templates/display_metadata.tt =================================================================== --- sites/oxford.openguides.org/templates/display_metadata.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/display_metadata.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -5,14 +5,27 @@ node_image %] <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 %]">© + [% node_image_copyright %]</a> + [% ELSE %] + © [% 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 OR hours_text OR map_link %] @@ -20,12 +33,12 @@
[% 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 %] [% IF address %] @@ -35,15 +48,17 @@ [% IF map_link %] <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 %] -&[% os_y %]&arrow=yes">(map of this place)</a> - + <a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">(map of this place)</a> [% END %] </li> [% ELSIF map_link %] <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 %]&[% os_y %]&arrow=yes">(map of this place)</a></span> + </li> [% END %] [% IF postcode %] <li class="postcode">
Deleted: sites/oxford.openguides.org/templates/display_metadata.tt.old =================================================================== --- sites/oxford.openguides.org/templates/display_metadata.tt.old 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/display_metadata.tt.old 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,86 +0,0 @@ -[% USE CGI %] -<!-- METADATA STARTS --> - -<div id="metadata"> -[% IF phone OR fax OR address OR postcode OR formatted_website_text - OR hours_text OR map_link %] - <ul id="general_metadata"> - - [% IF phone %] - <li class="telephone"> - <label>Telephone (area code 01865 if omitted):</label> [% CGI.escapeHTML(phone) %] - </li> - [% END %] - [% IF fax %] - <li class="fax"> - <label>Fax: (area code 01865 if omitted)</label> [% CGI.escapeHTML(fax) %] - </li> - [% END %] - [% IF address %] - <li class="address"> - <label>Address:</label> - [% IF map_link %] - [<a href="[% map_link %]">[% CGI.escapeHTML(address) %]</a>] - [% ELSIF os_x AND os_y %] - [<a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">[% CGI.escapeHTML(address) %]</a>] - [% ELSE %] - [% CGI.escapeHTML(address) %] - [% END %] - </li> - [% ELSIF map_link %] - <li class="map"> - <label>Map:</label> - [<a href="[% map_link %]">[% CGI.escapeHTML(map_link) %]</a>] - </li> - [% ELSIF os_x AND os_y %] - <li class="map"> - [<a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">http://www.streetmap.co.uk/streetmap.dll?grid2map?[% CGI.escapeHTML(os_x) %]&[% CGI.escapeHTML(os_y) %]&arrow=yes</a>] - </li> - [% END %] - [% IF postcode %] - <li class="postcode"> - <label>Postcode:</label> - [% CGI.escapeHTML(postcode) %] - </li> - [% END %] - [% IF formatted_website_text %] - <li class="website_link"> - <label>Website:</label> [% formatted_website_text %] - </li> - [% END %] - [% IF hours_text %] - <li class="opening_hours"> - <label>Opening Hours:</label> - [% CGI.escapeHTML(hours_text) %] - </li> - [% END %] - </ul> -[% END %] - -[% IF (categories.size AND categories.size > 0) - OR (locales.size AND locales.size > 0) %] - <ul id="categories_and_locales"> - [% IF categories.size AND categories.size > 0 %] - <li class="categories_list"> - <label>Categories:</label> - [% FOREACH category = categories %] - <a href="[% category.url %]">[% category.name %]</a> - [% "/" UNLESS loop.last %] - [% END %] - </li> - [% END %] - - [% IF locales.size AND locales.size > 0 %] - <li class="locales_list"> - <label>Locale:</label> - [% FOREACH locale = locales %] - <a href="[% locale.url %]">[% locale.name %]</a> - [% "/" UNLESS loop.last %] - [% END %] - </li> - [% END %] - </ul> -[% END %] -</div> - -<!-- METADATA ENDS -->
Deleted: sites/oxford.openguides.org/templates/header.tt =================================================================== --- sites/oxford.openguides.org/templates/header.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/header.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,52 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="[% language %]"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - [% IF page_title %] - <title>[% page_title %]</title> - [% ELSE %] - <title>[% node_name %] - [% site_name %]</title> - [% END %] - [% IF contact_email %] - <link rev="made" href="mailto:[% contact_email %]" /> - [% END %] - [% IF summary %] - <meta name="description" content="[% summary %]" /> - [% END %] - [% IF stylesheet %] - <link rel="stylesheet" href="[% stylesheet %]" type="text/css" title="Stylesheet for [% site_name %]" /> - [% END %] - [% IF feed_base %] - <link rel="alternate" type="application/rss+xml" title="Page as RSS" href="[% feed_base %];format=rss" /> - <link rel="alternate" type="application/atom+xml" title="Page as Atom" href="[% feed_base %];format=atom" /> - [% END %] - [% IF latitude AND longitude %] - <meta name="ICBM" content="[% latitude %], [% longitude %]" /> - <meta name="DC.title" content="[% site_name %]" /> - [% END %] - <link rel="alternate" type="application/rss+xml" title="[% site_name %] - Recent Changes (RSS 1.0)" href="[% full_cgi_url %]?action=rc;format=rss" /> - <link rel="alternate" type="application/atom+xml" title="[% site_name %] - Recent Changes (Atom)" href="[% full_cgi_url %]?action=rc;format=atom" /> - [% IF deter_robots %] - <meta name="robots" content="noindex,nofollow" /> - [% END %] - [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] - <script src="http://maps.google.com/maps?file=api&v=2&key=[% gmaps_api_key %]" type="text/javascript"></script> - <script src="http://media.mapnik.org/js/mapnik.js" type="text/javascript"></script> - [% END %] -</head> -<body> - [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] - <script defer="defer" type="text/javascript"> - //<![CDATA[ - var baseIcon = new GIcon(); - baseIcon.image = "http://www.google.com/mapfiles/marker.png"; - baseIcon.shadow = "http://www.google.com/mapfiles/shadow50.png"; - baseIcon.iconSize = new GSize(10, 17); - baseIcon.shadowSize = new GSize(20, 17); - baseIcon.iconAnchor = new GPoint(5, 17); - baseIcon.infoWindowAnchor = new GPoint(9, 2); - baseIcon.infoShadowAnchor = new GPoint(9, 12); - //]]> - </script> - [% END %]
Modified: sites/oxford.openguides.org/templates/map_index.tt =================================================================== --- sites/oxford.openguides.org/templates/map_index.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/map_index.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,4 +1,4 @@ -[% 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"> <a href="" id="permalink">Link to this page</a>
Deleted: sites/oxford.openguides.org/templates/navbar.tt =================================================================== --- sites/oxford.openguides.org/templates/navbar.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/navbar.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,60 +0,0 @@ -<div id="navbar"> - - <strong><a href="[% full_cgi_url %]">Back to home</a></strong> - - <div class="navbar_group"> - <div class="navbar_group_title">Tools:</div> - <div class="navbar_item"><a href="[% full_cgi_url %]?RecentChanges">Recent Changes</a> <span class="hidden">/</span></div> - <div class="navbar_item"><a href="newpage.cgi">Create a new page</a> <span class="hidden">/</span></div> - <div class="navbar_item"><a href="[% full_cgi_url %]?action=random">Random Page</a> <span class="hidden">/</span></div> - <div class="navbar_item"><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a> <span class="hidden">/</span></div> - [% IF geocache_link AND latitude AND longitude %] - <div class="navbar_item"><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% latitude %];origin_long=[% longitude %]">Look for nearby geocaches</a></div> - [% END %] - </div> - - [% UNLESS omit_help_links %] - <div class="navbar_group"> - <div class="navbar_group_title">Help: <span class="hidden">/</span></div> - <div class="navbar_item"><a href="[% full_cgi_url %]?FAQ">FAQ</a> <span class="hidden">/</span></div> - <div class="navbar_item"><a href="[% full_cgi_url %]?How_To_Get_Started">How To Get Started</a> <span class="hidden">/</span></div> - [% IF formatting_rules_link %] - <div class="navbar_item"><a href="[% formatting_rules_link %]">[% formatting_rules_node %]</a> <span class="hidden">/</span></div> - [% END %] - <div class="navbar_item"><a href="[% full_cgi_url %]?Wiki_Etiquette">Wiki Etiquette</a> <span class="hidden">/</span></div> - </div> - [% END %] - - <div class="navbar_group"> - <div class="navbar_group_title">Options:</div> - <div class="navbar_item"><a href="preferences.cgi">Set username/prefs</a></div> - </div> - - <div class="navbar_group"> - <div class="navbar_group_title">Search:</div> - <div class="navbar_item"> - <form method="post" action="search.cgi" enctype="application/x-www-form-urlencoded"> - <input type="hidden" name="action" value="search" /> - <input type="text" size="15" name="search" id="nav_search" value="Search text" onfocus="this.value=''" /> <label for="nav_search" class="hidden">Search text</label> - <input type="submit" value="Go" class="form_button" /> - </form> - </div> - <div class="navbar_item"> - <a href="search.cgi">Advanced Search</a> - </div> - </div> - - [% UNLESS not_editable %] - <div class="navbar_group"> - <div class="navbar_group_title">This page:</div> - <div class="edit_page_link"><a href="[% full_cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></div> - <div class="navbar_item"> - <a href="[% cgi_url %]?action=show_backlinks;id=[% node_param %]">Pages that link to here</a> - </div> - <div class="navbar_item"> - <a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi?[% node_param %]">Jump to Vegan Oxford entry</a> - </div> - </div> - [% END %] - -</div>
Added: sites/oxford.openguides.org/templates/navbar_this_page.tt =================================================================== --- sites/oxford.openguides.org/templates/navbar_this_page.tt (rev 0) +++ sites/oxford.openguides.org/templates/navbar_this_page.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -0,0 +1,17 @@ +[% UNLESS not_editable %] + <div id="navbar_this_page"> + <div class="navbar_group_title">This page:</div> + <ul> + <li><a class="edit_page_link" href="[% source_site or full_cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></li> + <li><a href="[% full_cgi_url %]?action=show_backlinks;id=[% node_param %]">Show pages linking here</a></li> + [% IF version AND version > 1 %] + <li><a href="[% full_cgi_url %]?action=list_all_versions;id=[% node_param %]">List all revisions</a></li> + [% END %] + <li><a href="[% full_cgi_url %]?id=[% node_param %];format=rdf">RDF/XML version</a></li> + [% IF enable_page_deletion %] + <li><a href="[% full_cgi_url %]?id=[% node_param %];action=delete">Delete (admin only)</a></li> + [% END %] + <li><a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi?[% node_param %]">Jump to Vegan Oxford entry</a></li> + </ul> + </div> +[% END %]
Deleted: sites/oxford.openguides.org/templates/needing_moderation.tt =================================================================== --- sites/oxford.openguides.org/templates/needing_moderation.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/needing_moderation.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,27 +0,0 @@ -[% INCLUDE header.tt page_title = "Pages Needing Moderation - $site_name" %] -[% INCLUDE banner.tt %] -<div id="content"> -[% INCLUDE navbar.tt %] -<div id="maincontent"> -<h2>Pages Needing Moderation</h2> -<p> -These are nodes which have been created/edited, but not yet moderated. -</p> -<table id="needing_moderation" style="width:90%"> -<tr><th>Node name</th><th>Pending Version</th><th>Latest Moderated Version</th><th>Action</th></tr> - [% FOREACH node = nodes %] - <tr> - <td>[% node.name %]</td> - <td align="center">[% node.version %]</td> - <td align="center">[% node.moderated_version %]</td> - <td><a href="[% node.moderate_url %]">Moderate this version</a> - or <a href="[% node.delete_url %]">Delete this version</a> - or <a href="[% node.view_url %]">View this version</a> - or <a href="[% node.diff_url %]">See changes</a> - </td> - </tr> - [% END %] -</table> - -</div> -[% INCLUDE footer.tt %]
openguides-commits@lists.openguides.org
-
svnadmin＠urchin.earth.li