Author: kake Date: 2007-06-09 19:46:46 +0100 (Sat, 09 Jun 2007) New Revision: 1049

Modified: trunk/MANIFEST trunk/templates/header.tt trunk/templates/map_index.tt Log: Add test to MANIFEST that I forgot to add in [1045].

Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-09 18:40:16 UTC (rev 1048) +++ trunk/MANIFEST 2007-06-09 18:46:46 UTC (rev 1049) @@ -121,6 +121,7 @@ t/55_node_history.t t/56_diffs_with_macros.t t/57_random_page.t +t/58_recent_changes_navbar.t t/61_bug_textareas.t t/62_bug_trailing_whitespace.t t/63_bug_map_link_no_address.t

Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2007-06-09 18:40:16 UTC (rev 1048) +++ trunk/templates/header.tt 2007-06-09 18:46:46 UTC (rev 1049) @@ -33,9 +33,9 @@ <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="geo.position" content="[% latitude %], [% longitude %]" /> + [% IF wgs84_lat AND wgs84_long %] + <meta name="ICBM" content="[% wgs84_lat %], [% wgs84_long %]" /> + <meta name="geo.position" content="[% wgs84_lat %], [% wgs84_long %]" /> [% 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" />

Modified: trunk/templates/map_index.tt =================================================================== --- trunk/templates/map_index.tt 2007-06-09 18:40:16 UTC (rev 1048) +++ trunk/templates/map_index.tt 2007-06-09 18:46:46 UTC (rev 1049) @@ -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 %] @@ -39,9 +39,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 %]