openguides-commits June 2007

openguides-commits@lists.openguides.org

1 participants
59 discussions

r1060 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 17:02:07 +0100 (Sun, 10 Jun 2007) New Revision: 1060 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt Log: Revert broken commit (there is no <os:map_link> tag) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/Changes 2007-06-10 16:02:07 UTC (rev 1060) @@ -16,7 +16,6 @@ Respect redirect=0 (#104). If an unknown action is supplied to wiki.cgi, redirect to action=display (partial fix for #102) - Include <os:map_link> in node RDF (fixes #26). 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-10 16:02:07 UTC (rev 1060) @@ -81,7 +81,7 @@ foreach my $var ( qw( phone fax website opening_hours_text address postcode city country latitude longitude username - os_x os_y summary map_link ) ) { + os_x os_y summary ) ) { my $val = $metadata{$var}[0] || $defaults{$var} || ""; $tt_vars{$var} = $val; } @@ -103,7 +103,7 @@ # Check for geospatialness and define container object as appropriate. my $is_geospatial; foreach my $var ( qw( os_x os_y latitude longitude address postcode - opening_hours_text map_link ) ) { + opening_hours_text ) ) { $is_geospatial = 1 if $tt_vars{$var}; } Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/t/21_rdf.t 2007-06-10 16:02:07 UTC (rev 1060) @@ -15,7 +15,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 28; +plan tests => 27; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; @@ -56,7 +56,6 @@ opening_hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", - map_link => "http://pubsite.com/calthorpe/get_there.htm", summary => "a nice pub", } ); @@ -82,10 +81,6 @@ qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); -like( $rdfxml, - qr|<os:map_link rdf:resource="http://pubsite.com/calthorpe/get_there.htm" />|, - "includes map link" ); - like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, "last username to edit used as contributor" ); Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/templates/node_rdf.tt 2007-06-10 16:02:07 UTC (rev 1060) @@ -77,10 +77,6 @@ <os:y>[% os_y %]</os:y> [% END %] - [% IF map_link %] - <os:map_link rdf:resource="[% map_link %]" /> - [% END %] - [% END %] [% IF phone OR fax OR website OR opening_hours_text %]

1 0

r1059 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 16:31:06 +0100 (Sun, 10 Jun 2007) New Revision: 1059 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt Log: Include <os:map_link> in node RDF (fixes #26) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 15:29:55 UTC (rev 1058) +++ trunk/Changes 2007-06-10 15:31:06 UTC (rev 1059) @@ -16,6 +16,7 @@ Respect redirect=0 (#104). If an unknown action is supplied to wiki.cgi, redirect to action=display (partial fix for #102) + Include <os:map_link> in node RDF (fixes #26). 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-10 15:29:55 UTC (rev 1058) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-10 15:31:06 UTC (rev 1059) @@ -81,7 +81,7 @@ foreach my $var ( qw( phone fax website opening_hours_text address postcode city country latitude longitude username - os_x os_y summary ) ) { + os_x os_y summary map_link ) ) { my $val = $metadata{$var}[0] || $defaults{$var} || ""; $tt_vars{$var} = $val; } @@ -103,7 +103,7 @@ # Check for geospatialness and define container object as appropriate. my $is_geospatial; foreach my $var ( qw( os_x os_y latitude longitude address postcode - opening_hours_text ) ) { + opening_hours_text map_link ) ) { $is_geospatial = 1 if $tt_vars{$var}; } Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2007-06-10 15:29:55 UTC (rev 1058) +++ trunk/t/21_rdf.t 2007-06-10 15:31:06 UTC (rev 1059) @@ -15,7 +15,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 27; +plan tests => 28; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; @@ -56,6 +56,7 @@ opening_hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", + map_link => "http://pubsite.com/calthorpe/get_there.htm", summary => "a nice pub", } ); @@ -81,6 +82,10 @@ qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); +like( $rdfxml, + qr|<os:map_link rdf:resource="http://pubsite.com/calthorpe/get_there.htm" />|, + "includes map link" ); + like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, "last username to edit used as contributor" ); Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-10 15:29:55 UTC (rev 1058) +++ trunk/templates/node_rdf.tt 2007-06-10 15:31:06 UTC (rev 1059) @@ -77,6 +77,10 @@ <os:y>[% os_y %]</os:y> [% END %] + [% IF map_link %] + <os:map_link rdf:resource="[% map_link %]" /> + [% END %] + [% END %] [% IF phone OR fax OR website OR opening_hours_text %]

1 0

r1058 - trunk
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: dom Date: 2007-06-10 16:29:55 +0100 (Sun, 10 Jun 2007) New Revision: 1058 Modified: trunk/Build.PL Log: Clarify error message with missing build deps (patch from andrewb) (fixes #211) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2007-06-10 15:21:02 UTC (rev 1057) +++ trunk/Build.PL 2007-06-10 15:29:55 UTC (rev 1058) @@ -9,7 +9,7 @@ require OpenGuides::Config; }; -die "Config::Tiny is required to configure this application.\n" if $@; +die "Problem loading OpenGuides module or a missing module\n\n$@.\n" if $@; print <<EOF;

1 0

r1057 - trunk
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: dom Date: 2007-06-10 16:21:02 +0100 (Sun, 10 Jun 2007) New Revision: 1057 Modified: trunk/Changes trunk/wiki.cgi Log: If an unknown action is used redirect to action=display, preserving other args (see #102) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 14:47:11 UTC (rev 1056) +++ trunk/Changes 2007-06-10 15:21:02 UTC (rev 1057) @@ -14,6 +14,8 @@ Only display the google maps preference if node maps are enabled (#192). Respect redirect=0 (#104). + If an unknown action is supplied to wiki.cgi, redirect to + action=display (partial fix for #102) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2007-06-10 14:47:11 UTC (rev 1056) +++ trunk/wiki.cgi 2007-06-10 15:21:02 UTC (rev 1057) @@ -186,7 +186,7 @@ print $q->redirect( $redir_target ); } elsif ($action eq 'about') { $guide->display_about(format => $format); - } else { # Default is to display a node. + } elsif ($action eq 'display') { if ( $format and $format eq "rdf" ) { display_node_rdf( node => $node ); } elsif ( $format and $format eq 'raw' ) { @@ -220,7 +220,23 @@ ); } } + } else { + # Fallback: redirect to the display page, preserving all vars + # except for the action, which we override. + # Note: $q->Vars needs munging if we need to support any + # multi-valued params + my $params = $q->Vars; + $params->{'action'} = 'display'; + my $redir_target = $script_url . $script_name . '?'; + my @args = map { "$_=" . $params->{$_} } keys %{$params}; + $redir_target .= join ';', @args; + + print $q->redirect( + -uri => $redir_target, + -status => 303 + ); } + }; if ($@) {

1 0

r1056 - in trunk: . lib t
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 15:47:11 +0100 (Sun, 10 Jun 2007) New Revision: 1056 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/t/51_display_node.t Log: Check for definedness of redirect parameter before defaulting to 1 (closes #104). Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 14:27:19 UTC (rev 1055) +++ trunk/Changes 2007-06-10 14:47:11 UTC (rev 1056) @@ -13,6 +13,7 @@ Support alternative database ports Only display the google maps preference if node maps are enabled (#192). + Respect redirect=0 (#104). 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-10 14:27:19 UTC (rev 1055) +++ trunk/lib/OpenGuides.pm 2007-06-10 14:47:11 UTC (rev 1056) @@ -175,7 +175,7 @@ my $wiki = $self->wiki; my $config = $self->config; my $oldid = $args{oldid} || ''; - my $do_redirect = $args{redirect} || 1; + my $do_redirect = defined($args{redirect}) ? $args{redirect} : 1; my %tt_vars; Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2007-06-10 14:27:19 UTC (rev 1055) +++ trunk/t/51_display_node.t 2007-06-10 14:47:11 UTC (rev 1056) @@ -12,7 +12,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 7; +plan tests => 9; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( @@ -47,3 +47,14 @@ like( $output, qr{\Q<a href="wiki.cgi?action=edit;id=My_Home_Page"\E>Edit\s+this\s+page</a>}, "...and home page has an edit link" ); my %tt_vars = $guide->display_node( return_tt_vars => 1 ); ok( defined $tt_vars{recent_changes}, "...and recent_changes is set for the home node even if we have changed its name" ); + +$wiki->write_node( 'Redirect Test', '#REDIRECT Test Page', undef ); + +$output = $guide->display_node( id => 'Redirect Test', return_output => 1 ); + +like( $output, qr{^\QLocation: http://example.com/wiki.cgi?id=Test_Page;oldid=Redirect_Test}ms, + '#REDIRECT redirects correctly' ); + +$output = $guide->display_node( id => 'Redirect Test', return_output => 1, redirect => 0 ); + +unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' );

1 0

r1055 - trunk/templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: kake Date: 2007-06-10 15:27:19 +0100 (Sun, 10 Jun 2007) New Revision: 1055 Modified: trunk/templates/footer.tt Log: Remove <p> element which wraps <div id=footer_delete_link>, since it's invalid markup and it wasn't doing anything anyway (fixes #221). Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2007-06-10 13:45:21 UTC (rev 1054) +++ trunk/templates/footer.tt 2007-06-10 14:27:19 UTC (rev 1055) @@ -21,10 +21,8 @@ [% TRY %] [% INCLUDE custom_footer_credits.tt %] [% CATCH %] + [% INCLUDE delete_link %] <p> - [% INCLUDE delete_link %] - </p> - <p> Powered by <a href="[% full_cgi_url%]?action=about">OpenGuides [% openguides_version %]</a>. </p> [% IF licence_name %]

1 0

r1054 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: dom Date: 2007-06-10 14:45:21 +0100 (Sun, 10 Jun 2007) New Revision: 1054 Added: trunk/t/50_http_response_codes.t Modified: trunk/MANIFEST trunk/lib/OpenGuides/Template.pm Log: Add support in output routine for specifying HTTP status code (see #102) Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-10 01:50:29 UTC (rev 1053) +++ trunk/MANIFEST 2007-06-10 13:45:21 UTC (rev 1054) @@ -114,6 +114,7 @@ t/47_navbar_placement.t t/48_google_analytics.t t/49_custom_header.t +t/50_http_response_codes.t t/51_display_node.t t/52_display_diffs.t t/53_show_index.t Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-10 01:50:29 UTC (rev 1053) +++ trunk/lib/OpenGuides/Template.pm 2007-06-10 13:45:21 UTC (rev 1054) @@ -109,6 +109,8 @@ Content-Type: defaults to C<text/html> and is omitted if the C<content_type> arg is explicitly set to the blank string. +The HTTP response code may be explictly set with the C<http_status> arg. + =cut sub output { @@ -180,19 +182,31 @@ $tt_vars = { %$tt_vars, %{ $args{vars} || {} } }; my $header = ""; - unless ( defined $args{content_type} and $args{content_type} eq "" ) { - my $content_type; - if ($args{content_type}) { - $content_type = $args{content_type}; + my %cgi_header_args; + + if ( defined $args{content_type} and $args{content_type} eq "" ) { + $cgi_header_args{'-type'} = ''; + } else { + if ( $args{content_type} ) { + $cgi_header_args{'-type'} = $args{content_type}; } else { - $content_type = "text/html"; + $cgi_header_args{'-type'} = "text/html"; } - if ($tt_vars->{http_charset}) { - $content_type .= "; charset=".$tt_vars->{http_charset}; + if ( $tt_vars->{http_charset} ) { + $cgi_header_args{'-type'} .= "; charset=".$tt_vars->{http_charset}; } - $header = CGI::header( -type => $content_type, -cookie => $args{cookies} ); + # XXX should possibly not be inside this block, but retaining + # existing functionality for now. See + # http://dev.openguides.org/ticket/220 + $cgi_header_args{'-cookie'} = $args{cookies}; } + if ( $args{http_status} ) { + $cgi_header_args{'-status'} = $args{http_status}; + } + + $header = CGI::header( %cgi_header_args ); + # vile hack my %field_vars = OpenGuides::Template->extract_metadata_vars( wiki => $args{wiki}, Added: trunk/t/50_http_response_codes.t =================================================================== --- trunk/t/50_http_response_codes.t (rev 0) +++ trunk/t/50_http_response_codes.t 2007-06-10 13:45:21 UTC (rev 1054) @@ -0,0 +1,39 @@ +use strict; +use Cwd; +use OpenGuides; +use OpenGuides::Template; +use OpenGuides::Test; +use Test::More tests => 3; + +my $config = OpenGuides::Test->make_basic_config; +$config->template_path( cwd . "/t/templates" ); + +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; + +eval { + OpenGuides::Template->output( wiki => $wiki, + config => $config, + template => "15_test.tt" ); +}; +is( $@, "", "is happy doing output" ); + +my $output = OpenGuides::Template->output( + wiki => $wiki, + config => $config, + template => "15_test.tt" +); + +unlike( $output, qr/^Status:/, + "HTTP status not printed when not explicitly specified "); + +# Now supply a http status + +$output = OpenGuides::Template->output( + wiki => $wiki, + config => $config, + template => "15_test.tt", + http_status => '404' +); +like( $output, qr/^Status: 404/, + "Correct HTTP status printed when specified" );

1 0

r1053 - trunk/templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 02:50:29 +0100 (Sun, 10 Jun 2007) New Revision: 1053 Modified: trunk/templates/edit_form.tt trunk/templates/missing_metadata.tt trunk/templates/moderate_confirm.tt trunk/templates/preferences.tt Log: Sync up up label tags and form element id attributes (closes #217) Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2007-06-09 21:54:06 UTC (rev 1052) +++ trunk/templates/edit_form.tt 2007-06-10 01:50:29 UTC (rev 1053) @@ -47,7 +47,7 @@ <legend>Main information</legend> <div class="edit_form_group" id="content_group"> - <label for="content"> + <label for="content_textarea"> [% IF conflict %] Current content: [% ELSE %] Modified: trunk/templates/missing_metadata.tt =================================================================== --- trunk/templates/missing_metadata.tt 2007-06-09 21:54:06 UTC (rev 1052) +++ trunk/templates/missing_metadata.tt 2007-06-10 01:50:29 UTC (rev 1053) @@ -31,17 +31,17 @@ </div> <div> <label for="metadata_value">Metadata Value:</label> - <input name="metadata_value" value="[% metadata_value %]" /> + <input name="metadata_value" id="metadata_value" value="[% metadata_value %]" />       <i>Optional, eg 'pub' when metadata value is Category</i> </div> <div> <label for="exclude_locales">Exclude Locales:</label> - <input type="checkbox" name="exclude_locales" [% IF exclude_locales %]checked="true"[% END %] /> + <input type="checkbox" name="exclude_locales" id="exclude_locales" [% IF exclude_locales %]checked="true"[% END %] /> </div> <div> <label for="exclude_categories">Exclude Categories:</label> - <input type="checkbox" name="exclude_categories" [% IF exclude_categories %]checked="true"[% END %] /> + <input type="checkbox" name="exclude_categories" id="exclude_categories" [% IF exclude_categories %]checked="true"[% END %] /> </div> <div> <input type="submit" value="Find Nodes" /> Modified: trunk/templates/moderate_confirm.tt =================================================================== --- trunk/templates/moderate_confirm.tt 2007-06-09 21:54:06 UTC (rev 1052) +++ trunk/templates/moderate_confirm.tt 2007-06-10 01:50:29 UTC (rev 1053) @@ -24,13 +24,13 @@ <input type="hidden" name="id" value="[% node_param %]" /> [% IF moderation_action == 'set_moderation' %] <label for="moderation_flag">Moderation Required:</label> - <input type="checkbox" name="moderation_flag" [% IF moderation_flag %]checked="yes"[% END %] /> + <input type="checkbox" name="moderation_flag" id="moderation_flag" [% IF moderation_flag %]checked="yes"[% END %] /> <br /> [% ELSE %] <input type="hidden" name="version" value="[% version %]" /> [% END %] - <strong>Password:</strong> - <input type="password" name="password" /> + <strong><label for="password">Password:</label></strong> + <input type="password" name="password" id="password" /> <input type="submit" value="Go!" /> </form> Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2007-06-09 21:54:06 UTC (rev 1052) +++ trunk/templates/preferences.tt 2007-06-10 01:50:29 UTC (rev 1053) @@ -79,7 +79,7 @@ <p> <label for="default_edit_type">Default edit type:</label> - <select name="default_edit_type"> + <select name="default_edit_type" id="default_edit_type"> [% IF default_edit_type == 'normal' %] <option value="normal" selected="1">Normal edit</option> <option value="tidying">Minor tidying</option> @@ -92,7 +92,7 @@ <p> <label for="cookie_expires">Preferences expire:</label> - <select name="cookie_expires"> + <select name="cookie_expires" id="cookie_expires"> [% IF cookie_expires == 'never' %] <option value="month">in one month</option> <option value="year">in one year</option>

1 0

r1052 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: kake Date: 2007-06-09 22:54:06 +0100 (Sat, 09 Jun 2007) New Revision: 1052 Modified: trunk/lib/OpenGuides/RDF.pm Log: Fix bug introduced in my last commit (forgot to run tests, sorry). Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-09 21:33:04 UTC (rev 1051) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-09 21:54:06 UTC (rev 1052) @@ -113,6 +113,15 @@ : "rdf:Description"; $tt_vars{is_geospatial} = $is_geospatial; + # Fix up lat and long. + eval { + @tt_vars{ qw( wgs84_long wgs84_lat ) } = + OpenGuides::Utils->get_wgs84_coords( + longitude => $tt_vars{longitude}, + latitude => $tt_vars{latitude}, + config => $config ); + }; + # Timestamp of last edited. my $timestamp = $node_data{last_modified}; if ( $timestamp ) {

1 0

r1051 - trunk/templates
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: kake Date: 2007-06-09 22:33:04 +0100 (Sat, 09 Jun 2007) New Revision: 1051 Modified: trunk/templates/navbar_tools.tt trunk/templates/node.tt trunk/templates/node_rdf.tt trunk/templates/rdf_index.tt Log: Finish changing from use of "latitude" and "longitude" template variables to "wgs84_lat" and "wgs84_long" (the first lot of this was accidentally committed in [1049], sorry). Fixes #176. Modified: trunk/templates/navbar_tools.tt =================================================================== --- trunk/templates/navbar_tools.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/navbar_tools.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -5,8 +5,8 @@ <li><a href="[% script_url %]newpage.cgi">Create New Page</a></li> <li><a href="[% full_cgi_url %]?action=random">Random Page</a></li> <li><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a></li> - [% IF geocache_link AND latitude AND longitude %] - <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% latitude %];origin_long=[% longitude %]">Look for nearby geocaches</a></li> + [% IF geocache_link AND wgs84_lat AND wgs84_long %] + <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% wgs84_lat %];origin_long=[% wgs84_long %]">Look for nearby geocaches</a></li> [% END %] </ul> </div> Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/node.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -47,7 +47,7 @@ <span class="node_name">[% node_name %]</span></em> </h2> [% END %] -[% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %] +[% IF not (content || coord_field_1_value || coord_field_2_value || wgs84_lat || wgs84_long) %] </div> 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>? [% ELSE %] @@ -86,7 +86,7 @@ </form> </div> [% END %] -[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %] +[% IF (wgs84_lat AND wgs84_long) OR (os_x AND os_y) OR (osie_x AND osie_y) %] <div id="coordinates" class="geo"> [% END %] [% IF os_x AND os_y %] @@ -108,15 +108,15 @@ </small>     [% END %] -[% IF latitude AND longitude %] +[% IF wgs84_lat AND wgs84_long %] <small> (Latitude: - <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr> + <abbr class="latitude" title="[% wgs84_lat %]">[% wgs84_lat %]</abbr> Longitude: - <abbr class="longitude" title="[% wgs84_long %]">[% longitude %]</abbr>) + <abbr class="longitude" title="[% wgs84_long %]">[% wgs84_long %]</abbr>) </small> [% END %] -[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%] +[% IF (wgs84_lat AND wgs84_long) OR (os_x AND os_y) OR (osie_x AND osie_y)%] </div> [% END %] <div id="rdf_link"> Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/node_rdf.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -67,9 +67,9 @@ </foaf:based_near> [% END %] - [% IF latitude AND longitude %] - <geo:lat>[% latitude %]</geo:lat> - <geo:long>[% longitude %]</geo:long> + [% IF wgs84_lat AND wgs84_long %] + <geo:lat>[% wgs84_lat %]</geo:lat> + <geo:long>[% wgs84_long %]</geo:long> [% END %] [% IF os_x AND os_y %] Modified: trunk/templates/rdf_index.tt =================================================================== --- trunk/templates/rdf_index.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/rdf_index.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -24,7 +24,7 @@ [%- FOREACH node = nodes %] [% metadata = node.node_data.metadata %] - [%- IF metadata.os_x.list.first || metadata.os_y.list.first || metadata.latitude.list.first || metadata.longitude.list.first || + [%- IF metadata.os_x.list.first || metadata.os_y.list.first || metadata.wgs84_lat.list.first || metadata.wgs84_long.list.first || metadata.locale.list.first || metadata.address.list.first || metadata.postcode.list.first || metadata.map_link.list.first -%] [% nodeType = 'geo:SpatialThing' %] [%- ELSE -%] @@ -35,9 +35,9 @@ <[% nodeType %] rdf:about="[% full_cgi_url %]?id=[% node.param %];format=rdf#obj"> <rdfs:seeAlso rdf:resource="[% full_cgi_url %]?id=[% node.param %];format=rdf" /> <dc:title>[% node.name %]</dc:title> - [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] - <geo:lat>[% metadata.latitude.list.first %]</geo:lat> - <geo:long>[% metadata.longitude.list.first %]</geo:long> + [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %] + <geo:lat>[% metadata.wgs84_lat.list.first %]</geo:lat> + <geo:long>[% metadata.wgs84_long.list.first %]</geo:long> [% END %] <link>[% full_cgi_url %]?[% node.param %]</link> </[% nodeType %]>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits June 2007