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 =================================================================== --- sites/oxford.openguides.org/templates/display_metadata.tt 2007-07-05 21:08:44 UTC (rev 1111) +++ sites/oxford.openguides.org/templates/display_metadata.tt 2007-07-05 21:19:19 UTC (rev 1112) @@ -87,7 +87,11 @@ <li class="categories_list"> <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> [% END %] @@ -96,7 +100,11 @@ <li class="locales_list"> <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> [% END %]
Modified: sites/oxford.openguides.org/templates/map_index.tt =================================================================== --- sites/oxford.openguides.org/templates/map_index.tt 2007-07-05 21:08:44 UTC (rev 1111) +++ sites/oxford.openguides.org/templates/map_index.tt 2007-07-05 21:19:19 UTC (rev 1112) @@ -11,9 +11,9 @@ [% FOREACH node = nodes %] [% 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 %] [% END %] @@ -51,9 +51,9 @@ [% FOREACH node = nodes %] [% 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); [% IF metadata.source %]
Modified: sites/oxford.openguides.org/templates/node.tt =================================================================== --- sites/oxford.openguides.org/templates/node.tt 2007-07-05 21:08:44 UTC (rev 1111) +++ sites/oxford.openguides.org/templates/node.tt 2007-07-05 21:19:19 UTC (rev 1112) @@ -45,6 +45,7 @@ </script> [% END %]
+<div id="node_title"> [% IF current %] [% IF backlinks_in_title AND is_indexable_node %] <h2 class="node_name"><a href="[% cgi_url %]?action=index;index_type=[% CGI.escape(index_type) %];index_value=[% 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="[% 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 %]
<!-- NODE CONTENT STARTS --> @@ -123,6 +129,7 @@ [% IF latitude AND longitude %] <small> (Latitude: + <!-- titles using the wgs84 versions here are for microformats --> <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr> Longitude: <abbr class="longitude" title="[% wgs84_long %]">[% longitude %]</abbr>)