openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1084 - in trunk: . lib/OpenGuides templates
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: ilmari Date: 2007-06-16 22:33:16 +0100 (Sat, 16 Jun 2007) New Revision: 1084 Modified: trunk/lib/OpenGuides/CGI.pm trunk/preferences.cgi trunk/templates/preferences.tt Log: Preferences cleanup - Separate preference defaulting from cookie parsing. - Remove duplicate preference defaulting from the cgi. - Use the prefs template variable in the template. Modified: trunk/lib/OpenGuides/CGI.pm =================================================================== --- trunk/lib/OpenGuides/CGI.pm 2007-06-16 21:28:40 UTC (rev 1083) +++ trunk/lib/OpenGuides/CGI.pm 2007-06-16 21:33:16 UTC (rev 1084) @@ -155,6 +155,12 @@ if ( $cookies{$cookie_name} ) { %data = $cookies{$cookie_name}->value; # call ->value in list context } + + return $class->get_prefs_from_hash( %data ); +} + +sub get_prefs_from_hash { + my ($class, %data) = @_; my %defaults = ( username => "Anonymous", include_geocache_link => 0, Modified: trunk/preferences.cgi =================================================================== --- trunk/preferences.cgi 2007-06-16 21:28:40 UTC (rev 1083) +++ trunk/preferences.cgi 2007-06-16 21:33:16 UTC (rev 1084) @@ -22,28 +22,10 @@ } sub set_preferences { - my $username = $cgi->param("username") || ""; - my $gc_link = $cgi->param("include_geocache_link") || 0; - my $pre_above = $cgi->param("preview_above_edit_box") || 0; - my $latlong_trad = $cgi->param("latlong_traditional") || 0; - my $omit_hlplnks = $cgi->param("omit_help_links") || 0; - my $rc_minor_eds = $cgi->param("show_minor_edits_in_rc") || 0; - my $edit_type = $cgi->param("default_edit_type") || "normal"; - my $expires = $cgi->param("cookie_expires") || "month"; - my $track_rc = $cgi->param("track_recent_changes_views") || 0; - my $gmaps = $cgi->param("display_google_maps") || 0; + my %prefs = OpenGuides::CGI->get_prefs_from_hash( $cgi->Vars ); my $prefs_cookie = OpenGuides::CGI->make_prefs_cookie( config => $config, - username => $username, - include_geocache_link => $gc_link, - preview_above_edit_box => $pre_above, - latlong_traditional => $latlong_trad, - omit_help_links => $omit_hlplnks, - show_minor_edits_in_rc => $rc_minor_eds, - default_edit_type => $edit_type, - cookie_expires => $expires, - track_recent_changes_views => $track_rc, - display_google_maps => $gmaps + %prefs, ); my @cookies = ( $prefs_cookie ); # If they've asked not to have their recent changes visits tracked, @@ -62,29 +44,17 @@ cookies => \@cookies, vars => { not_editable => 1, - username => $username, - include_geocache_link => $gc_link, - preview_above_edit_box => $pre_above, - latlong_traditional => $latlong_trad, - omit_help_links => $omit_hlplnks, - show_minor_edits_in_rc => $rc_minor_eds, - default_edit_type => $edit_type, - cookie_expires => $expires, - track_recent_changes_views => $track_rc, - display_google_maps => $gmaps + %prefs, } ); } sub show_form { - # Get defaults for form fields from cookies. - my %prefs = OpenGuides::CGI->get_prefs_from_cookie( config => $config ); - print OpenGuides::Template->output( wiki => $wiki, config => $config, template => "preferences.tt", - vars => { %prefs, + vars => { not_editable => 1, show_form => 1 } Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2007-06-16 21:28:40 UTC (rev 1083) +++ trunk/templates/preferences.tt 2007-06-16 21:33:16 UTC (rev 1084) @@ -13,7 +13,7 @@ <h1>Preferences</h1> <p> - [% IF preview_above_edit_box %] + [% IF prefs.preview_above_edit_box %] <input type="checkbox" id="preview_above" name="preview_above_edit_box" value="1" checked /> [% ELSE %] <input type="checkbox" id="preview_above" name="preview_above_edit_box" value="1" /> @@ -22,7 +22,7 @@ </p> <p> - [% IF include_geocache_link %] + [% IF prefs.include_geocache_link %] <input type="checkbox" id="geocache" name="include_geocache_link" value="1" checked /> [% ELSE %] <input type="checkbox" id="geocache" name="include_geocache_link" value="1" /> @@ -31,7 +31,7 @@ </p> <p> - [% IF latlong_traditional %] + [% IF prefs.latlong_traditional %] <input type="checkbox" id="latlong" name="latlong_traditional" value="1" checked /> [% ELSE %] <input type="checkbox" id="latlong" name="latlong_traditional" value="1" /> @@ -40,7 +40,7 @@ </p> <p> - [% IF omit_help_links %] + [% IF prefs.omit_help_links %] <input type="checkbox" id="omit_help" name="omit_help_links" value="1" checked /> [% ELSE %] <input type="checkbox" id="omit_help" name="omit_help_links" value="1" /> @@ -49,7 +49,7 @@ </p> <p> - [% IF show_minor_edits_in_rc %] + [% IF prefs.show_minor_edits_in_rc %] <input type="checkbox" id="show_minor" name="show_minor_edits_in_rc" value="1" checked /> [% ELSE %] <input type="checkbox" id="show_minor" name="show_minor_edits_in_rc" value="1" /> @@ -58,7 +58,7 @@ </p> <p> - [% IF track_recent_changes_views %] + [% IF prefs.track_recent_changes_views %] <input type="checkbox" id="track_recent_changes_views" name="track_recent_changes_views" value="1" checked="1" /> [% ELSE %] <input type="checkbox" id="track_recent_changes_views" name="track_recent_changes_views" value="1" /> @@ -68,7 +68,7 @@ [% IF gmaps_api_key AND config.show_gmap_in_node_display %] <p> - [% IF display_google_maps %] + [% IF prefs.display_google_maps %] <input type="checkbox" id="display_google_maps" name="display_google_maps" value="1" checked="1" /> [% ELSE %] <input type="checkbox" id="display_google_maps" name="display_google_maps" value="1" /> @@ -80,7 +80,7 @@ <p> <label for="default_edit_type">Default edit type:</label> <select name="default_edit_type" id="default_edit_type"> - [% IF default_edit_type == 'normal' %] + [% IF prefs.default_edit_type == 'normal' %] <option value="normal" selected="1">Normal edit</option> <option value="tidying">Minor tidying</option> [% ELSE %] @@ -93,11 +93,11 @@ <p> <label for="cookie_expires">Preferences expire:</label> <select name="cookie_expires" id="cookie_expires"> - [% IF cookie_expires == 'never' %] + [% IF prefs.cookie_expires == 'never' %] <option value="month">in one month</option> <option value="year">in one year</option> <option value="never" selected="1">never</option> - [% ELSIF cookie_expires == "year" %] + [% ELSIF prefs.cookie_expires == "year" %] <option value="month">in one month</option> <option value="year" selected="1">in one year</option> <option value="never">never</option> @@ -120,7 +120,7 @@ <p>Username set to “[% username %]”.</p> <p>Preview area shown - [% IF preview_above_edit_box %] + [% IF prefs.preview_above_edit_box %] above [% ELSE %] below @@ -132,7 +132,7 @@ included in navbar.</p> <p>Latitude and longitude displayed as - [% IF latlong_traditional %] + [% IF prefs.latlong_traditional %] degrees and minutes. [% ELSE %] decimal. @@ -140,7 +140,7 @@ </p> <p>Help links will - [% IF omit_help_links %] not [% END %] + [% IF prefs.omit_help_links %] not [% END %] be included in navbar. </p> @@ -152,14 +152,14 @@ [% UNLESS track_recent_changes_views %] not [% END %] be tracked.</p> - [% IF gmaps_api_key AND config.show_gmap_in_node_display %] + [% IF prefs.gmaps_api_key AND config.show_gmap_in_node_display %] <p>Google Maps will [% UNLESS display_google_maps %] not [% END %] be displayed.</p> [% END %] <p>Default edit type set to - [% IF default_edit_type == 'normal' %] + [% IF prefs.default_edit_type == 'normal' %] “Normal edit”. [% ELSE %] “Minor tidying”. @@ -167,9 +167,9 @@ </p> <p>Your preferences will - [% IF cookie_expires == 'never' %] + [% IF prefs.cookie_expires == 'never' %] never expire. - [% ELSIF cookie_expires == 'year' %] + [% ELSIF prefs.cookie_expires == 'year' %] expire in one year. [% ELSE %] expire in one month.

1 0

r1083 - trunk/templates
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: ilmari Date: 2007-06-16 22:28:40 +0100 (Sat, 16 Jun 2007) New Revision: 1083 Modified: trunk/templates/edit_form.tt Log: Fix duplicate IDs between preview and input. Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2007-06-16 20:32:05 UTC (rev 1082) +++ trunk/templates/edit_form.tt 2007-06-16 21:28:40 UTC (rev 1083) @@ -138,12 +138,12 @@ <div class="edit_form_group" id="summary_group"> [% IF conflict %] - <label for="summary">Current summary:</label> + <label for="summary_input">Current summary:</label> [% ELSE %] - <label for="summary">One-line summary of this page:</label> + <label for="summary_input">One-line summary of this page:</label> [% END %] <div class="edit_box"> - <input type="text" size="50" id="summary" name="summary" + <input type="text" size="50" id="summary_input" name="summary" value="[% summary %]" /> </div> [% IF conflict %]

1 0

r1082 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: ilmari Date: 2007-06-16 21:32:05 +0100 (Sat, 16 Jun 2007) New Revision: 1082 Modified: trunk/lib/OpenGuides/Template.pm Log: Make the user preferences available to the templates. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-16 19:45:04 UTC (rev 1081) +++ trunk/lib/OpenGuides/Template.pm 2007-06-16 20:32:05 UTC (rev 1082) @@ -94,6 +94,8 @@ =item * C<licence_info_url> +=item * C<prefs> (the preferences from the user cookie) + =back =over @@ -149,6 +151,7 @@ my $tt_vars = { config => $config, + prefs => \%cookie_data, site_name => $config->site_name, cgi_url => $script_name, script_url => $script_url,

1 0

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

16 Jun '07

Author: ilmari Date: 2007-06-16 20:45:04 +0100 (Sat, 16 Jun 2007) New Revision: 1081 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt Log: List all contributors in RDF version of nodes (fixes #106) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-16 17:30:53 UTC (rev 1080) +++ trunk/Changes 2007-06-16 19:45:04 UTC (rev 1081) @@ -19,6 +19,7 @@ Added new div#nonexistent_node_message for displaying message when someone tries to view a nonexistent node. Validate input geodata (#22) + List all contributors in RDF version of nodes (#106). 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-16 17:30:53 UTC (rev 1080) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-16 19:45:04 UTC (rev 1081) @@ -82,7 +82,7 @@ ); foreach my $var ( qw( phone fax website opening_hours_text address - postcode city country latitude longitude username + postcode city country latitude longitude os_x os_y summary ) ) { my $val = $metadata{$var}[0] || $defaults{$var} || ""; $tt_vars{$var} = $val; @@ -133,9 +133,6 @@ $tt_vars{timestamp} = $time->strftime("%Y-%m-%dT%H:%M:%S"); } - $tt_vars{user_id} = $tt_vars{username}; - $tt_vars{user_id} =~ s/\s/_/g; - $tt_vars{node_uri} = $self->{make_node_url}->( $node_name ); $tt_vars{node_uri_with_version} = $self->{make_node_url}->( $node_name, @@ -157,6 +154,28 @@ } } + my @revisions = $wiki->list_node_all_versions( + name => $node_name, + with_content => 0, + with_metadata => 1, + ); + + # We want all users who have edited the page listed as contributors, + # but only once each + foreach my $rev ( @revisions ) { + my $username = $rev->{metadata}{username}; + next unless defined $username && length $username; + + my $user_id = $username; + $user_id =~ s/\s+/_/g; + + $tt_vars{contributors}{$username} ||= + { + username => encode_entities_numeric($username), + user_id => encode_entities_numeric($user_id), + }; + } + # OK, we've set all our template variables; now process the template. my $template_path = $config->template_path; my $custom_template_path = $config->custom_template_path || ""; Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2007-06-16 17:30:53 UTC (rev 1080) +++ trunk/t/21_rdf.t 2007-06-16 19:45:04 UTC (rev 1081) @@ -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; @@ -24,6 +24,7 @@ $config->site_name( "Wiki::Toolkit Test Site" ); $config->default_city( "London" ); $config->default_country( "United Kingdom" ); +$config->geo_handler( 3 ); eval { require Wiki::Toolkit::Search::Plucene; }; if ( $@ ) { $config->use_plucene ( 0 ) }; @@ -49,6 +50,22 @@ node => "Calthorpe Arms", content => "CAMRA-approved pub near King's Cross", comment => "Stub page, please update!", + username => "Anonymous", + postcode => "WC1X 8JR", + locales => "Bloomsbury\r\nSt Pancras", + phone => "test phone number", + website => "test website", + hours_text => "test hours", + latitude => "51.524193", + longitude => "-0.114436", + summary => "a really nice pub", +); + +OpenGuides::Test->write_data( + guide => $guide, + node => "Calthorpe Arms", + content => "CAMRA-approved pub near King's Cross", + comment => "Stub page, please update!", username => "Kake", postcode => "WC1X 8JR", locales => "Bloomsbury\r\nSt Pancras", @@ -83,8 +100,10 @@ like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, "last username to edit used as contributor" ); +like( $rdfxml, qr|<foaf:Person rdf:ID="Anonymous">|, + "... as well as previous usernames" ); -like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" ); +like( $rdfxml, qr|<wiki:version>2</wiki:version>|, "version picked up" ); like( $rdfxml, qr|<rdf:Description rdf:about="">|, "sets the 'about' correctly" ); Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-16 17:30:53 UTC (rev 1080) +++ trunk/templates/node_rdf.tt 2007-06-16 19:45:04 UTC (rev 1081) @@ -18,11 +18,13 @@ <dc:date>[% timestamp %]</dc:date> <dcterms:modified>[% timestamp %]</dcterms:modified> + [% FOREACH contributor = contributors.values %] <dc:contributor> - <foaf:Person rdf:ID="[% user_id %]"> - <foaf:nick>[% username %]</foaf:nick> + <foaf:Person rdf:ID="[% contributor.user_id %]"> + <foaf:nick>[% contributor.username %]</foaf:nick> </foaf:Person> </dc:contributor> + [% END %] <dc:source rdf:resource="[% node_uri %]" /> <wiki:version>[% version %]</wiki:version>

1 0

r1080 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: ilmari Date: 2007-06-16 18:30:53 +0100 (Sat, 16 Jun 2007) New Revision: 1080 Modified: trunk/lib/OpenGuides/Template.pm Log: Make sure coordinates are non-empty as well as defined. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-16 15:41:13 UTC (rev 1079) +++ trunk/lib/OpenGuides/Template.pm 2007-06-16 17:30:53 UTC (rev 1080) @@ -423,19 +423,19 @@ $os_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( defined $os_x && defined $os_y ) { + if ( defined $os_x && length $os_x && defined $os_y && length $os_y ) { my $point = Geography::NationalGrid::GB->new( Easting =>$os_x, Northing=>$os_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( defined $lat && defined $long ) { + } elsif ( defined $lat && length $lat && defined $long && length $long ) { my $point = Geography::NationalGrid::GB->new(Latitude => $lat, Longitude => $long); $os_x = $point->easting; $os_y = $point->northing; } - if ( defined $os_x && defined $os_y ) { + if ( defined $os_x && length $os_x && defined $os_y && length $os_y ) { %vars = ( %vars, latitude => $lat, @@ -468,18 +468,18 @@ $osie_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( defined $osie_x && defined $osie_y ) { + if ( defined $osie_x && length $osie_x && defined $osie_y && length $osie_y ) { my $point = Geography::NationalGrid::IE->new(Easting=>$osie_x, Northing=>$osie_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( defined $lat && defined $long ) { + } elsif ( defined $lat && length $lat && defined $long && length $long ) { my $point = Geography::NationalGrid::GB->new(Latitude => $lat, Longitude => $long); $osie_x = $point->easting; $osie_y = $point->northing; } - if ( defined $osie_x && defined $osie_y ) { + if ( defined $osie_x && length $osie_x && defined $osie_y && length $osie_y ) { %vars = ( %vars, latitude => $lat, @@ -505,7 +505,7 @@ my $lat = $q->param("latitude"); my $long = $q->param("longitude"); - if ( defined $lat && defined $long ) { + if ( defined $lat && length $lat && defined $long && length $long ) { # Trim whitespace. $lat =~ s/\s+//g; $long =~ s/\s+//g; @@ -542,7 +542,7 @@ my %prefs = OpenGuides::CGI->get_prefs_from_cookie( config => $config ); if ( $prefs{latlong_traditional} ) { foreach my $var ( qw( latitude longitude ) ) { - next unless defined $vars{$var}; + next unless defined $vars{$var} && length $vars{$var}; $vars{$var."_unmunged"} = $vars{$var}; $vars{$var} = Geography::NationalGrid->deg2string($vars{$var}); }

1 0

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

16 Jun '07

Author: dom Date: 2007-06-16 16:41:13 +0100 (Sat, 16 Jun 2007) New Revision: 1079 Added: trunk/t/69_bug_zero_geo.t Modified: trunk/lib/OpenGuides/Template.pm Log: Fix bug representing zero geodata (fixes #215) Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-16 14:20:24 UTC (rev 1078) +++ trunk/lib/OpenGuides/Template.pm 2007-06-16 15:41:13 UTC (rev 1079) @@ -423,19 +423,19 @@ $os_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( $os_x && $os_y ) { + if ( defined $os_x && defined $os_y ) { my $point = Geography::NationalGrid::GB->new( Easting =>$os_x, Northing=>$os_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( $lat && $long ) { + } elsif ( defined $lat && defined $long ) { my $point = Geography::NationalGrid::GB->new(Latitude => $lat, Longitude => $long); $os_x = $point->easting; $os_y = $point->northing; } - if ( $os_x && $os_y ) { + if ( defined $os_x && defined $os_y ) { %vars = ( %vars, latitude => $lat, @@ -468,18 +468,18 @@ $osie_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( $osie_x && $osie_y ) { + if ( defined $osie_x && defined $osie_y ) { my $point = Geography::NationalGrid::IE->new(Easting=>$osie_x, Northing=>$osie_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( $lat && $long ) { + } elsif ( defined $lat && defined $long ) { my $point = Geography::NationalGrid::GB->new(Latitude => $lat, Longitude => $long); $osie_x = $point->easting; $osie_y = $point->northing; } - if ( $osie_x && $osie_y ) { + if ( defined $osie_x && defined $osie_y ) { %vars = ( %vars, latitude => $lat, @@ -505,7 +505,7 @@ my $lat = $q->param("latitude"); my $long = $q->param("longitude"); - if ( $lat && $long ) { + if ( defined $lat && defined $long ) { # Trim whitespace. $lat =~ s/\s+//g; $long =~ s/\s+//g; Added: trunk/t/69_bug_zero_geo.t =================================================================== --- trunk/t/69_bug_zero_geo.t (rev 0) +++ trunk/t/69_bug_zero_geo.t 2007-06-16 15:41:13 UTC (rev 1079) @@ -0,0 +1,103 @@ +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides::Config; +use Cwd; +use OpenGuides; +use Test::More; +use OpenGuides::Test; + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; +} + +plan tests => 6; + +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +my $config = OpenGuides::Config->new( + vars => { + dbtype => "sqlite", + dbname => "t/node.db", + indexing_directory => "t/indexes", + script_url => "http://wiki.example.com/", + script_name => "mywiki.cgi", + site_name => "Wiki::Toolkit Test Site", + template_path => cwd . "/templates", + } +); +eval { require Wiki::Toolkit::Search::Plucene; }; +if ( $@ ) { $config->use_plucene ( 0 ) }; + +$config->{geo_handler} = 1; + +my $guide = OpenGuides->new( config => $config ); + +my $q = OpenGuides::Test->make_cgi_object( + content => "Blah", + os_x => 0, + os_y => 0 +); + +my $output = $guide->commit_node( + id => "Test Node", + cgi_obj => $q, + return_output => 1 +); + +my %details = $guide->wiki->retrieve_node("Test Node"); + +use Data::Dumper; +#print STDERR Dumper %details; + +is( @{$details{metadata}->{os_x}}[0], 0, "Zero os_x saved" ); +is( @{$details{metadata}->{os_y}}[0], 0, "Zero os_y saved" ); + +$config->{geo_handler} = 2; + +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + +$guide = OpenGuides->new( config => $config ); + +$q = OpenGuides::Test->make_cgi_object( + content => "Blah", + osie_x => 0, + osie_y => 0 +); + +$output = $guide->commit_node( + id => "Test Node IE", + cgi_obj => $q, + return_output => 1 +); + +%details = $guide->wiki->retrieve_node("Test Node IE"); + +is( @{$details{metadata}->{osie_x}}[0], 0, "Zero osie_x saved" ); +is( @{$details{metadata}->{osie_y}}[0], 0, "Zero osie_y saved" ); + +$config->{geo_handler} = 3; + +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + +$guide = OpenGuides->new( config => $config ); + +$q = OpenGuides::Test->make_cgi_object( + content => "Blah", + latitude => 0, + longitude => 0 +); + +$output = $guide->commit_node( + id => "Test Node lat/long", + cgi_obj => $q, + return_output => 1 +); + +%details = $guide->wiki->retrieve_node("Test Node lat/long"); + +is( @{$details{metadata}->{latitude}}[0], 0, "Zero latitude saved" ); +is( @{$details{metadata}->{longitude}}[0], 0, "Zero longitude saved" ); +

1 0

r1078 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: dom Date: 2007-06-16 15:20:24 +0100 (Sat, 16 Jun 2007) New Revision: 1078 Modified: trunk/lib/OpenGuides/Test.pm Log: make_cgi_object: "0" is a valid value; don't lose this Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2007-06-16 13:55:52 UTC (rev 1077) +++ trunk/lib/OpenGuides/Test.pm 2007-06-16 14:20:24 UTC (rev 1078) @@ -190,7 +190,11 @@ latitude longitude summary username comment edit_type ) ) { - $q->param( -name => $param, -value => $args{$param} || "" ); + if (defined $args{$param}) { + $q->param( -name => $param, -value => $args{$param} ); + } else { + $q->param( -name => $param, -value => '' ); + } } $ENV{REMOTE_ADDR} = "127.0.0.1";

1 0

r1077 - trunk/t
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: dom Date: 2007-06-16 14:55:52 +0100 (Sat, 16 Jun 2007) New Revision: 1077 Modified: trunk/t/17_commit_node.t Log: Fix silly my $foo bug Modified: trunk/t/17_commit_node.t =================================================================== --- trunk/t/17_commit_node.t 2007-06-12 22:39:09 UTC (rev 1076) +++ trunk/t/17_commit_node.t 2007-06-16 13:55:52 UTC (rev 1077) @@ -88,7 +88,7 @@ is( $node{metadata}->{edit_type}[0], "Normal edit", "Right edit type" ); # Now try to commit some invalid data, and make sure we get an edit form back -my $q = OpenGuides::Test->make_cgi_object( +$q = OpenGuides::Test->make_cgi_object( content => "foo", os_x => "fooooo", username => "bob",

1 0

r1076 - sites/oxford.openguides.org/templates
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

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 %] -  +  <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 %] - - -<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> - - 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 %]

1 0

r1075 - sites
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

Author: dom Date: 2007-06-12 23:22:53 +0100 (Tue, 12 Jun 2007) New Revision: 1075 Added: sites/README Log: Add README for this dir Added: sites/README =================================================================== --- sites/README (rev 0) +++ sites/README 2007-06-12 22:22:53 UTC (rev 1075) @@ -0,0 +1,5 @@ +This is a spare for people to manage data on their on sites. +You are welcome to create a directory named after your own guide here, +but please leave other guides alone. + +-- Dom, 2007-06-12

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits