openguides-commits

openguides-commits@lists.openguides.org

873 discussions

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

09 Jun '07

Author: kake Date: 2007-06-09 15:38:14 +0100 (Sat, 09 Jun 2007) New Revision: 1044 Modified: trunk/lib/OpenGuides.pm Log: Fix uninitialized value warning in test 53 (fixes #168). Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-09 14:11:28 UTC (rev 1043) +++ trunk/lib/OpenGuides.pm 2007-06-09 14:38:14 UTC (rev 1044) @@ -781,6 +781,9 @@ return_output => 1, ); +If either the C<type> or the C<value> parameter is omitted, then all pages +will be returned. + =cut sub show_index { @@ -906,7 +909,6 @@ %conf = ( %conf, - node => "$args{type} index", # KLUDGE template => $template, tt_vars => \%tt_vars, );

1 0

r1043 - in trunk: . examples
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: dom Date: 2007-06-09 15:11:28 +0100 (Sat, 09 Jun 2007) New Revision: 1043 Removed: trunk/examples/london.css trunk/examples/vegan-oxford.css Modified: trunk/Changes Log: Remove misleading CSS examples Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-09 13:47:33 UTC (rev 1042) +++ trunk/Changes 2007-06-09 14:11:28 UTC (rev 1043) @@ -9,6 +9,7 @@ Added extra "edit this page" link next to the node name; if you don't want it, add div#title_edit_link {display:none;} to your stylesheet. Removed dependency on Test::MockObject. + Remove misleading CSS examples 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Deleted: trunk/examples/london.css =================================================================== --- trunk/examples/london.css 2007-06-09 13:47:33 UTC (rev 1042) +++ trunk/examples/london.css 2007-06-09 14:11:28 UTC (rev 1043) @@ -1,199 +0,0 @@ -body -{ - background: #fff; - color: #000; - margin: 0px -} - -a:link -{ - background: transparent; - color: #00f -} - -a:visited -{ - background: transparent; - color: #f00 -} - -a:hover -{ - background: transparent; - color: #00f -} - -/* The banner that runs across the top of all nodes */ -#banner -{ - padding: 10px; - background-color: #ccc; - color: #fff; - border-bottom: 1px solid #000 -} - -/* The area underneath the banner on all nodes */ -#content -{ - padding: 1em -} - -/* The navigation bar that appears on all nodes */ -#navbar -{ - float: right; - width: 175px; - padding: 10px; - border: 1px solid #000; - background-color: #fff; - color: #000; - font-size: 0.8em; - margin: 0px 0px 10px 10px -} - -/* A group of items in the navbar */ -.navbar_group -{ -} - -/* A title for that group */ -.navbar_group_title -{ - margin: 1em 0em 0em 0em; - font-weight: bold -} - -/* An item in the navbar */ -.navbar_item -{ - margin-top: 0em; - margin-bottom: 0em -} - -/* The "Search" label, text field and "Go" button in the navbar */ -.search_group -{ -} - -/* The "Search" label itself */ -.search_label -{ - font-weight: bold -} - -/* The link on all nodes saying "edit this page" */ -.edit_page_link -{ - font-weight: bold; - margin-bottom: 1em; - padding-top: 1em; - border-top: 1px solid #000 -} - -/* The Recent Changes listing on the home page */ -#recent -{ - float: right; - padding: 1em; - border: 1px dashed #666; - width: 250px; - margin: 10px; - font-size: 0.8em -} - -/* An item title in the listing */ -#recent dt -{ - font-weight: bold -} - -/* An item definition in the listing */ -#recent dd -{ -} - -/* The name of a node */ -.node_name -{ - font-style: italic -} - -/* Listing of categories and locales for a node */ -#categories_and_locales -{ - font-size: small -} - -/* The widget for distance lookups */ -#find_within_distance -{ -} - -/* The listing of coordinates on nodes with geo metadata */ -#coordinates -{ -} - -/* The node version indicator */ -#version -{ - margin-top: 10px; - font-size: small -} - -/* The 'RDF/XML for this node' link that appears on all nodes */ -#rdf_link -{ - font-size: small; - float: right -} - -/* The search form that appears on all nodes */ -#search_form -{ - padding-top: 10px; - border-top: 1px solid #999 -} - -/* The footer that appears on all nodes */ -#footer -{ - margin-top: 10px; - padding-top: 10px; - border-top: 1px solid #999; - font-size: 0.8em; - text-align: right -} - -/* Submit buttons in forms */ -input.form_button -{ - font-size: 0.9em; - font-style: bold; - background-color: #fff; - color: #000 -} - -/* The 'before' part of a diff listing */ -.diff1 -{ - background-color: yellow; -} - -/* The 'after' part of a diff listing */ -.diff2 -{ - background-color: pink; -} - -/* Hidden elements */ -.hidden -{ - display: none; -} - -/* Labels for form elements */ -.label -{ - font-weight: bold; -} \ No newline at end of file Deleted: trunk/examples/vegan-oxford.css =================================================================== --- trunk/examples/vegan-oxford.css 2007-06-09 13:47:33 UTC (rev 1042) +++ trunk/examples/vegan-oxford.css 2007-06-09 14:11:28 UTC (rev 1043) @@ -1,196 +0,0 @@ -body -{ - background: #fff; - color: #000; - margin: 0px -} - -/* -a:link -{ - background: transparent; - color: #00f -} - -a:visited -{ - background: transparent; - color: #f00 -} - -a:hover -{ - background: transparent; - color: #00f -} -*/ - -/* The banner that runs across the top of all nodes */ -#banner -{ - margin-top/**/: 5em; - padding-top/**/: 0.5em; - padding-right: 10px; - font-size: smaller; - text-align: right; -} - -/* The area underneath the banner on all nodes */ -#content -{ - padding: 0em 1em 1em 1em; -} - -/* The navigation bar that appears on all nodes */ -#navbar -{ - position/**/: absolute; - top/**/: 0px; - left/**/: 0px; - width/**/: 99%; - padding: 0.1em 0.2em 0.1em 0.2em; - background-color: #cfc; - color: #000; - font-size: 0.8em; -} - -/* A group of items in the navbar */ -.navbar_group -{ - float: left; - margin: 0em 1em 0.5em 0em; -} - -/* A title for that group */ -.navbar_group_title -{ - display: inline; - font-weight: bold; -} - -/* An item in the navbar */ -.navbar_item -{ - border-right/**/: 1px solid black; - padding: 0em 0.5em 0em 0.5em; -} - -/* The "Search" label, text field and "Go" button in the navbar */ -.search_group -{ - float: right; -} - -/* The "Search" label itself */ -.search_label -{ - display: inline; - font-weight: bold -} - -/* The link on all nodes saying "edit this page" */ -.edit_page_link -{ - float: right; - text-align: right; - font-weight: bold; - font-size: 1.5em; - padding-right: 5px; -} - -/* The Recent Changes listing on the home page */ -#recent -{ - float: right; - padding: 0em 1em 1em 1em; - border: solid #000; - width: 250px; - margin: 10px; - font-size: 0.9em -} - -/* An item title in the listing */ -#recent dt -{ - font-weight: bold -} - -/* An item definition in the listing */ -#recent dd -{ -} - -/* The name of a node */ -.node_name -{ -} - -/* Listing of categories and locales for a node */ -#categories_and_locales -{ - font-size: small -} - -/* The widget for distance lookups */ -#find_within_distance -{ -} - -/* The listing of coordinates on nodes with geo metadata */ -#coordinates -{ -} - -/* The node version indicator */ -#version -{ - border-top: 1px solid #999; - margin-top: 10px; - font-size: small; - padding-top: 5px; -} - -/* The 'RDF/XML for this node' link that appears on all nodes */ -#rdf_link -{ - font-size: small; - padding-top: 5px; - float: right; -} - -/* The search form that appears on all nodes */ -#search_form -{ - border-top: 1px solid #999; - padding-top: 5px; -} - -/* The footer that appears on all nodes */ -#footer -{ - margin-top: 10px; - padding-top: 10px; - font-size: 0.8em; - text-align: right -} - -/* Submit buttons in forms */ -input.form_button -{ - font-size: 0.9em; - font-style: bold; - background-color: #fff; - color: #000 -} - -/* The 'before' part of a diff listing */ -.diff1 -{ - background-color: yellow; -} - -/* The 'after' part of a diff listing */ -.diff2 -{ - background-color: pink; -}

1 0

r1042 - in trunk: . t
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: kake Date: 2007-06-09 14:47:33 +0100 (Sat, 09 Jun 2007) New Revision: 1042 Modified: trunk/Build.PL trunk/Changes trunk/PREREQUISITES trunk/t/41_deletion.t Log: Remove dependency on Test::MockObject. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2007-06-09 13:36:35 UTC (rev 1041) +++ trunk/Build.PL 2007-06-09 13:47:33 UTC (rev 1042) @@ -297,7 +297,6 @@ $search_module => 0, 'POSIX' => 0, 'Template' => '2.15', # for hash.delete and string.remove vmethods - 'Test::MockObject' => '0.07', # earlier doesn't use 'mock' 'Time::Piece' => 0, 'URI::Escape' => 0, 'XML::RSS' => 0, Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-09 13:36:35 UTC (rev 1041) +++ trunk/Changes 2007-06-09 13:47:33 UTC (rev 1042) @@ -8,6 +8,7 @@ commit_node method in "perldoc OpenGuides" for details. Added extra "edit this page" link next to the node name; if you don't want it, add div#title_edit_link {display:none;} to your stylesheet. + Removed dependency on Test::MockObject. 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2007-06-09 13:36:35 UTC (rev 1041) +++ trunk/PREREQUISITES 2007-06-09 13:47:33 UTC (rev 1042) @@ -40,7 +40,6 @@ Plucene POSIX Template -Test::MockObject (version 0.07 or later) Time::Piece URI::Escape XML::RSS Modified: trunk/t/41_deletion.t =================================================================== --- trunk/t/41_deletion.t 2007-06-09 13:36:35 UTC (rev 1041) +++ trunk/t/41_deletion.t 2007-06-09 13:47:33 UTC (rev 1042) @@ -1,24 +1,18 @@ use strict; -use Wiki::Toolkit::Formatter::UseMod; +use OpenGuides; use OpenGuides::Template; use OpenGuides::Test; -use Test::MockObject; use Test::More tests => 3; my $config = OpenGuides::Test->make_basic_config; $config->site_name( "Test Site" ); $config->script_url( "/" ); -# White box testing - we know that OpenGuides::Template only actually uses -# the node_name_to_node_param method of the formatter component of the wiki -# object passed in, and I CBA to faff about with picking out the test DB -# info to make a proper wiki object here. -my $fake_wiki = Test::MockObject->new; -$fake_wiki->mock("formatter", - sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } ); +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; my $output = OpenGuides::Template->output( - wiki => $fake_wiki, + wiki => $wiki, config => $config, template => "node.tt", ); @@ -26,7 +20,7 @@ "doesn't offer page deletion link by default" ); $config->enable_page_deletion( "y" ); $output = OpenGuides::Template->output( - wiki => $fake_wiki, + wiki => $wiki, config => $config, template => "node.tt", ); @@ -34,7 +28,7 @@ "...but does when enable_page_deletion is set to 'y'" ); $config->enable_page_deletion( 1 ); $output = OpenGuides::Template->output( - wiki => $fake_wiki, + wiki => $wiki, config => $config, template => "node.tt", );

1 0

r872 - in trunk: lib lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 17 Sep '06

17 Sep '06

Author: nick Date: 2006-09-17 18:48:41 +0100 (Sun, 17 Sep 2006) New Revision: 872 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm trunk/t/28_wgs84_coords.t trunk/t/53_show_index.t trunk/templates/map_index.tt Log: Do the wgs84 convertion for the google maps page. Add tests for this too. References #89 Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2006-09-17 16:50:39 UTC (rev 871) +++ trunk/lib/OpenGuides/Utils.pm 2006-09-17 17:48:41 UTC (rev 872) @@ -254,8 +254,8 @@ require Geo::HelmertTransform; $helmert = sub($$$) { my ($datum,$oldlat,$oldlong) = @_; - my $datum_helper = Geo::HelmertTransform::datum($datum); - my $wgs84_helper = Geo::HelmertTransform::datum('WGS84'); + my $datum_helper = new Geo::HelmertTransform::Datum(Name=>$datum); + my $wgs84_helper = new Geo::HelmertTransform::Datum(Name=>'WGS84'); unless($datum_helper) { croak("No convertion helper for datum '$datum'"); return undef; Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-09-17 16:50:39 UTC (rev 871) +++ trunk/lib/OpenGuides.pm 2006-09-17 17:48:41 UTC (rev 872) @@ -561,6 +561,25 @@ param => $formatter->node_name_to_node_param($_) } } sort @selnodes; + # Convert the lat+long to WGS84 as required + for(my $i=0; $i<scalar @nodes;$i++) { + my $node = $nodes[$i]; + if($node) { + my %metadata = %{$node->{node_data}->{metadata}}; + my ($wgs84_long, $wgs84_lat); + eval { + ($wgs84_long, $wgs84_lat) = OpenGuides::Utils->get_wgs84_coords( + longitude => $metadata{longitude}[0], + latitude => $metadata{latitude}[0], + config => $self->config); + }; + warn $@." on ".$metadata{latitude}[0]." ".$metadata{longitude}[0] if $@; + + push @{$nodes[$i]->{node_data}->{metadata}->{wgs84_long}}, $wgs84_long; + push @{$nodes[$i]->{node_data}->{metadata}->{wgs84_lat}}, $wgs84_lat; + } + } + $tt_vars{nodes} = \@nodes; my ($template, %conf); Modified: trunk/t/28_wgs84_coords.t =================================================================== --- trunk/t/28_wgs84_coords.t 2006-09-17 16:50:39 UTC (rev 871) +++ trunk/t/28_wgs84_coords.t 2006-09-17 17:48:41 UTC (rev 872) @@ -4,7 +4,7 @@ use OpenGuides::Test; use Test::More; -plan tests => 4; +plan tests => 6; # Clear out the database from any previous runs. unlink "t/node.db"; @@ -34,7 +34,7 @@ eval{ require Geo::HelmertTransform; }; my $have_helmert = $@ ? 0 : 1; SKIP : { - skip "Geo::HelmertTransform not installed - can't do transforms", 2 + skip "Geo::HelmertTransform not installed - can't do transforms", 4 unless $have_helmert; $config->force_wgs84(0); @@ -60,4 +60,16 @@ "get_wgs84_coords does Airy1830 -> WGS84 convertion properly"); is( $wgs_lat, $wgs84_lat, "get_wgs84_coords does Airy1830 -> WGS84 convertion properly"); + + # Call it again, check we get the same result + ($wgs_long, $wgs_lat) = OpenGuides::Utils->get_wgs84_coords( + longitude => $longitude, + latitude => $latitude, + config => $config); + $wgs_long = int($wgs_long * $fivedp)/$fivedp; + $wgs_lat = int($wgs_lat * $fivedp)/$fivedp; + is( $wgs_long, $wgs84_lon, + "get_wgs84_coords does Airy1830 -> WGS84 convertion properly"); + is( $wgs_lat, $wgs84_lat, + "get_wgs84_coords does Airy1830 -> WGS84 convertion properly"); } Modified: trunk/t/53_show_index.t =================================================================== --- trunk/t/53_show_index.t 2006-09-17 16:50:39 UTC (rev 871) +++ trunk/t/53_show_index.t 2006-09-17 17:48:41 UTC (rev 872) @@ -2,13 +2,13 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides; use OpenGuides::Test; -use Test::More tests => 17; # 19 when all enabled +use Test::More tests => 23; # 25 when all enabled eval { require DBD::SQLite; }; my $have_sqlite = $@ ? 0 : 1; SKIP: { - skip "DBD::SQLite not installed - no database to test with", 17 + skip "DBD::SQLite not installed - no database to test with", 23 unless $have_sqlite; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); @@ -27,7 +27,7 @@ } $wiki->write_node( "Test Page", "foo", undef, - { category => "Alpha" } ) + { category => "Alpha", latitude=>51.754349, longitude=>-1.258200 } ) or die "Couldn't write node"; $wiki->write_node( "Test Page 2", "foo", undef, { category => "Alpha" } ) @@ -93,4 +93,26 @@ #like( $output, qr|<title>Category Alpha</title>|, "Right atom title" ); @entries = ($output =~ /(\<entry\>)/g); is( 2, scalar @entries, "Right number of nodes included in atom" ); + + + # Test the map version + $config->gmaps_api_key("yes I have one"); + $config->geo_handler(1); + $config->force_wgs84(0); + $output = eval { + $guide->show_index( + return_output => 1, + format => "map", + ); + }; + is( $@, "", "->show_index doesn't die when asked for map" ); + like( $output, qr|Content-Type: text/html|, + "Map output gets content-type of text/html" ); + like( $output, qr|new GMap|, "Really is google map" ); + my @points = ($output =~ /point\d+ = (new GPoint$.*?, .*?$)/g); + is( 1, scalar @points, "Right number of nodes included on map" ); + + # -1.259687,51.754813 + like( $points[0], qr|51.75481|, "Has latitude"); + like( $points[0], qr|-1.25968|, "Has longitude"); } Modified: trunk/templates/map_index.tt =================================================================== --- trunk/templates/map_index.tt 2006-09-17 16:50:39 UTC (rev 871) +++ trunk/templates/map_index.tt 2006-09-17 17:48:41 UTC (rev 872) @@ -37,7 +37,7 @@ [% 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') %] - var point[% i %] = new GPoint([% metadata.longitude.list.first %], [% metadata.latitude.list.first %]); + 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 %] [% source_url = metadata.source.list.first.match('^(.*?)\?(?:\?|$)').first %]

1 0

r871 - trunk/t
by svnadmin＠urchin.earth.li 17 Sep '06

17 Sep '06

Author: nick Date: 2006-09-17 17:50:39 +0100 (Sun, 17 Sep 2006) New Revision: 871 Modified: trunk/t/73_toggle_moderation.t Log: Get the right URL in the test Modified: trunk/t/73_toggle_moderation.t =================================================================== --- trunk/t/73_toggle_moderation.t 2006-09-17 16:26:28 UTC (rev 870) +++ trunk/t/73_toggle_moderation.t 2006-09-17 16:50:39 UTC (rev 871) @@ -109,6 +109,6 @@ password => $guide->config->admin_pass, return_output => 1 ); - like($output, qr|Location: http://example.com/wiki.cgi\?action=admin&moderation=changed|, "Right location"); + like($output, qr|Location: http://example.com/wiki.cgi?action=admin;moderation=changed|, "Right location"); like($output, qr|Status: 302 Moved|, "Right status"); }

1 0

r870 - in trunk: lib/OpenGuides t
by svnadmin＠urchin.earth.li 17 Sep '06

17 Sep '06

Author: nick Date: 2006-09-17 17:26:28 +0100 (Sun, 17 Sep 2006) New Revision: 870 Modified: trunk/lib/OpenGuides/Utils.pm trunk/t/28_wgs84_coords.t Log: Support doing Helmert Transforms as required, using the MySociety Helmert transform library, if installed. References #89 Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2006-09-17 15:36:44 UTC (rev 869) +++ trunk/lib/OpenGuides/Utils.pm 2006-09-17 16:26:28 UTC (rev 870) @@ -235,21 +235,61 @@ $args{config}) or croak "No longitude supplied to get_wgs84_coords"; croak "geo_handler not defined!" unless $config->geo_handler; + if ($config->force_wgs84) { # Only as a rough approximation, good enough for large scale guides return ($longitude, $latitude); - } elsif ($config->geo_handler == 1) { + } + + # If we don't have a lat and long, return undef right away + unless($args{longitude} || $args{latitude}) { + return undef; + } + + # Try to load a provider of Helmert Transforms + my $helmert; + # First up, try the MySociety Geo::HelmertTransform + unless($helmert) { + eval { + require Geo::HelmertTransform; + $helmert = sub($$$) { + my ($datum,$oldlat,$oldlong) = @_; + my $datum_helper = Geo::HelmertTransform::datum($datum); + my $wgs84_helper = Geo::HelmertTransform::datum('WGS84'); + unless($datum_helper) { + croak("No convertion helper for datum '$datum'"); + return undef; + } + + my ($lat,$long,$h) = + Geo::HelmertTransform::convert_datum($datum_helper,$wgs84_helper,$oldlat,$oldlong,0); + return ($long,$lat); + }; + }; + } + # Next, try ..... + unless($helmert) { + eval { + }; + } + # Give up, return undef + unless($helmert) { + return undef; + } + + + if ($config->geo_handler == 1) { # Do conversion here - return undef; + return &$helmert('Airy1830',$latitude,$longitude); } elsif ($config->geo_handler == 2) { # Do conversion here - return undef; + return &$helmert('Airy1830Modified',$latitude,$longitude); } elsif ($config->geo_handler == 3) { if ($config->ellipsoid eq "WGS-84") { return ($longitude, $latitude); } else { # Do conversion here - return undef; + return &$helmert($config->ellipsoid,$latitude,$longitude); } } else { croak "Invalid geo_handler config option $config->geo_handler"; Modified: trunk/t/28_wgs84_coords.t =================================================================== --- trunk/t/28_wgs84_coords.t 2006-09-17 15:36:44 UTC (rev 869) +++ trunk/t/28_wgs84_coords.t 2006-09-17 16:26:28 UTC (rev 870) @@ -4,7 +4,7 @@ use OpenGuides::Test; use Test::More; -plan tests => 2; +plan tests => 4; # Clear out the database from any previous runs. unlink "t/node.db"; @@ -17,7 +17,7 @@ my $guide = OpenGuides->new( config => $config ); -my ($longitude, $latitude) = (0, 0); +my ($longitude, $latitude) = (10, 12); my ($wgs_long, $wgs_lat) = OpenGuides::Utils->get_wgs84_coords( longitude => $longitude, @@ -28,3 +28,36 @@ "get_wgs84_coords returns the original longitude when force_wgs84 is on"); is( $wgs_lat, $latitude, "get_wgs84_coords returns the original latitude when force_wgs84 is on"); + + +# Now claim to be in the UK +eval{ require Geo::HelmertTransform; }; +my $have_helmert = $@ ? 0 : 1; +SKIP : { + skip "Geo::HelmertTransform not installed - can't do transforms", 2 + unless $have_helmert; + + $config->force_wgs84(0); + $config->geo_handler(1); + + # Set our location to be somewhere known + ($longitude,$latitude) = (-1.258200,51.754349); + my ($wgs84_lon,$wgs84_lat) = (-1.259687,51.754813); + + ($wgs_long, $wgs_lat) = OpenGuides::Utils->get_wgs84_coords( + longitude => $longitude, + latitude => $latitude, + config => $config); + + # Round to 5 dp + my $fivedp = 1 * 1000 * 100; + $wgs_long = int($wgs_long * $fivedp)/$fivedp; + $wgs_lat = int($wgs_lat * $fivedp)/$fivedp; + $wgs84_lon = int($wgs84_lon * $fivedp)/$fivedp; + $wgs84_lat = int($wgs84_lat * $fivedp)/$fivedp; + + is( $wgs_long, $wgs84_lon, + "get_wgs84_coords does Airy1830 -> WGS84 convertion properly"); + is( $wgs_lat, $wgs84_lat, + "get_wgs84_coords does Airy1830 -> WGS84 convertion properly"); +}

1 0

r869 - trunk/templates
by svnadmin＠urchin.earth.li 17 Sep '06

17 Sep '06

Author: nick Date: 2006-09-17 16:36:44 +0100 (Sun, 17 Sep 2006) New Revision: 869 Modified: trunk/templates/footer.tt Log: Fix space after licence name. References #132 Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2006-09-17 15:26:21 UTC (rev 868) +++ trunk/templates/footer.tt 2006-09-17 15:36:44 UTC (rev 869) @@ -27,12 +27,10 @@ [% IF licence_name %] This work is licensed under the [% IF licence_url %] - <a href="[% licence_url %]"> + <a href="[% licence_url %]">[% licence_name %]</a> + [% ELSE %] + [% licence_name %] [% END %] - [% licence_name %] - [% IF licence_url %] - </a> - [% END %] licence [% IF licence_info_url %] (<a href="[% licence_info_url %]">more info</a>)

1 0

r868 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 17 Sep '06

17 Sep '06

Author: nick Date: 2006-09-17 16:26:21 +0100 (Sun, 17 Sep 2006) New Revision: 868 Added: trunk/t/18_http_headers.t Modified: trunk/Changes trunk/MANIFEST trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/Template.pm Log: Support the config flag http_charset, which sets a http charset header on content type. (Closes #141) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-09-17 12:42:27 UTC (rev 867) +++ trunk/Changes 2006-09-17 15:26:21 UTC (rev 868) @@ -4,6 +4,8 @@ Add RDF autodiscovery link to nodes' <head> section. Add UPGRADING file which summarises inmportant information for people upgrading. + Add an optional new config parameter, http_charset, which will set + an explict charset http header on all responses. 0.57 12 September 2006 New interfaces: Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-09-17 12:42:27 UTC (rev 867) +++ trunk/MANIFEST 2006-09-17 15:26:21 UTC (rev 868) @@ -72,6 +72,7 @@ t/15_template.t t/16_test_tester.t t/17_commit_node.t +t/18_http_headers.t t/21_rdf.t t/22_feed_recent_changes.t t/23_feed_node_all_versions.t Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2006-09-17 12:42:27 UTC (rev 867) +++ trunk/lib/OpenGuides/Config.pm 2006-09-17 15:26:21 UTC (rev 868) @@ -8,7 +8,8 @@ dbtype dbname dbuser dbpass dbhost script_name install_directory script_url custom_lib_path use_plucene indexing_directory enable_page_deletion admin_pass stylesheet_url site_name navbar_on_home_page home_name - site_desc default_city default_country contact_email default_language + site_desc default_city default_country contact_email + default_language http_charset formatting_rules_node formatting_rules_link backlinks_in_title template_path custom_template_path geo_handler ellipsoid gmaps_api_key centre_long centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84 @@ -79,6 +80,7 @@ default_city => "", default_country => "", default_language => "en", + http_charset => "", formatting_rules_node => "Text Formatting Examples", formatting_rules_link => "http://openguides.org/page/text_formatting", backlinks_in_title => 0, @@ -149,6 +151,7 @@ default_country => "What country is the site based in?", contact_email => "Contact email address for the site administrator?", default_language => "What language will the site be in? (Please give an ISO language code.)", + http_charset => "What character set should we put in the http headers? (This won't change the character set internally, just what it's reported as). Leave blank for none to be sent", formatting_rules_node => "What's the name of the node or page to use for the text formatting rules link (this is by default an external document, but if you make formatting_rules_link empty, it will be a wiki node instead", formatting_rules_link => "What URL do you want to use for the text formatting rules (leave blank to use a wiki node instead)?", backlinks_in_title => "Make node titles link to node backlinks (C2 style)?", @@ -238,6 +241,8 @@ =item * default_language (default: C<en>) +=item * http_charset + =item * contact_email =item * formatting_rules_node (default: C<Text Formatting Examples>) Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-09-17 12:42:27 UTC (rev 867) +++ trunk/lib/OpenGuides/Template.pm 2006-09-17 15:26:21 UTC (rev 868) @@ -160,6 +160,7 @@ openguides_version => $OpenGuides::VERSION, enable_page_deletion => $enable_page_deletion, language => $config->default_language, + http_charset => $config->http_charset, default_city => $default_city, gmaps_api_key => $config->gmaps_api_key, licence_name => $config->licence_name, @@ -184,6 +185,9 @@ } else { $content_type = "text/html"; } + if ($tt_vars->{http_charset}) { + $content_type .= "; charset=".$tt_vars->{http_charset}; + } $header = CGI::header( -type => $content_type, -cookie => $args{cookies} ); } Added: trunk/t/18_http_headers.t =================================================================== --- trunk/t/18_http_headers.t 2006-09-17 12:42:27 UTC (rev 867) +++ trunk/t/18_http_headers.t 2006-09-17 15:26:21 UTC (rev 868) @@ -0,0 +1,78 @@ +use strict; +use Cwd; +use CGI::Cookie; +use Wiki::Toolkit::Formatter::UseMod; +use OpenGuides::Config; +use OpenGuides::Template; +use Test::MockObject; +use Test::More tests => 5; + +my $config = OpenGuides::Config->new( + vars => { + template_path => cwd . '/t/templates', + site_name => 'Wiki::Toolkit Test Site', + script_url => 'http://wiki.example.com/', + script_name => 'mywiki.cgi', + default_country => 'United Kingdom', + default_city => 'London', + contact_email => 'wiki(a)example.com', + stylesheet_url => 'http://wiki.example.com/styles.css', + home_name => 'Home Page', + formatting_rules_node => 'Rules', + formatting_rules_link => '', + } +); + +# White box testing - we know that OpenGuides::Template only actually uses +# the node_name_to_node_param method of the formatter component of the wiki +# object passed in, and I CBA to make a proper wiki object here. +my $fake_wiki = Test::MockObject->new; +$fake_wiki->mock("formatter", + sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } ); + +eval { + OpenGuides::Template->output( wiki => $fake_wiki, + config => $config, + template => "15_test.tt" ); +}; +is( $@, "", "is happy doing output" ); + +my $output = OpenGuides::Template->output( + wiki => $fake_wiki, + config => $config, + template => "15_test.tt" +); +like( $output, qr/^Content-Type: text\/html/, + "Content-Type header included and defaults to text/html" ); + +# Now supply a http charset +$config->{http_charset} = "UTF-8"; + +$output = OpenGuides::Template->output( + wiki => $fake_wiki, + config => $config, + template => "15_test.tt" +); +like( $output, qr/^Content-Type: text\/html; charset=UTF-8/, + "Content-Type header included charset" ); + +# Suppy charset and content type +$output = OpenGuides::Template->output( + wiki => $fake_wiki, + config => $config, + content_type => "text/xml", + template => "15_test.tt" +); +like( $output, qr/^Content-Type: text\/xml; charset=UTF-8/, + "Content-Type header included charset" ); + +# Content type but no charset +$config->{http_charset} = ""; +$output = OpenGuides::Template->output( + wiki => $fake_wiki, + config => $config, + content_type => "text/xml", + template => "15_test.tt" +); +like( $output, qr/^Content-Type: text\/xml/, + "Content-Type header didn't include charset" );

1 0

r867 - in trunk: . lib lib/OpenGuides templates
by svnadmin＠urchin.earth.li 17 Sep '06

17 Sep '06

Author: dom Date: 2006-09-17 13:42:27 +0100 (Sun, 17 Sep 2006) New Revision: 867 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm trunk/templates/map_index.tt trunk/templates/node.tt trunk/templates/node_history.tt trunk/templates/recent_changes.tt trunk/templates/search.tt trunk/wiki.cgi Log: &/& -> ; Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2006-09-14 07:42:36 UTC (rev 866) +++ trunk/lib/OpenGuides/Utils.pm 2006-09-17 12:42:27 UTC (rev 867) @@ -204,7 +204,7 @@ macros => \%macros, pass_wiki_to_macros => 1, node_prefix => "$script_name?", - edit_prefix => "$script_name?action=edit&id=", + edit_prefix => "$script_name?action=edit;id=", munge_urls => 1, ); Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-09-14 07:42:36 UTC (rev 866) +++ trunk/lib/OpenGuides.pm 2006-09-17 12:42:27 UTC (rev 867) @@ -1233,7 +1233,7 @@ my $script_url = $self->config->script_url; my $script_name = $self->config->script_name; my $q = CGI->new; - my $output = $q->redirect( $script_url.$script_name."?action=admin&moderation=changed" ); + my $output = $q->redirect( $script_url.$script_name."?action=admin;moderation=changed" ); return $output if $return_output; print $output; } @@ -1277,7 +1277,7 @@ deter_robots => 1, version => $version, moderation_action => 'moderate', - moderation_url_args => 'action=moderate&version='.$version + moderation_url_args => 'action=moderate;version='.$version ); my $password = $args{password}; @@ -1315,7 +1315,7 @@ my $script_url = $self->config->script_url; my $script_name = $self->config->script_name; my $q = CGI->new; - my $output = $q->redirect( $script_url.$script_name."?action=admin&moderation=moderated" ); + my $output = $q->redirect( $script_url.$script_name."?action=admin;moderation=moderated" ); return $output if $return_output; print $output; } Modified: trunk/templates/map_index.tt =================================================================== --- trunk/templates/map_index.tt 2006-09-14 07:42:36 UTC (rev 866) +++ trunk/templates/map_index.tt 2006-09-17 12:42:27 UTC (rev 867) @@ -53,7 +53,7 @@ var center = map.getCenterLatLng(); var link = document.getElementById('permalink'); var zoom = map.getZoomLevel(); - link.href = "?action=index;format=map&long="+center.x+"&lat="+center.y+"&zoom="+zoom; + link.href = "?action=index;format=map;long="+center.x+";lat="+center.y+";zoom="+zoom; } GEvent.addListener(map, "moveend", map_recenter ); //]]> Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2006-09-14 07:42:36 UTC (rev 866) +++ trunk/templates/node.tt 2006-09-17 12:42:27 UTC (rev 867) @@ -29,7 +29,7 @@ [% 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> [% ELSIF backlinks_in_title %] - <h2 class="node_name"><a href="[% cgi_url %]?action=show_backlinks&id=[% CGI.escape(node_name) %]">[% node_name %]</a></h2> + <h2 class="node_name"><a href="[% cgi_url %]?action=show_backlinks;id=[% CGI.escape(node_name) %]">[% node_name %]</a></h2> [% ELSE %] <h2 class="node_name">[% node_name %]</h2> [% END %] Modified: trunk/templates/node_history.tt =================================================================== --- trunk/templates/node_history.tt 2006-09-14 07:42:36 UTC (rev 866) +++ trunk/templates/node_history.tt 2006-09-17 12:42:27 UTC (rev 867) @@ -13,16 +13,16 @@ <ul> [% FOREACH revision = history %] <li> - <a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version %]">Version [% revision.version %]</a> + <a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version %]">Version [% revision.version %]</a> [% IF revision.version != version %] (diff: - [% UNLESS revision.version == 1 %]<a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version - 1 %]&diffversion=[% revision.version %]">previous</a> / [% END %] - <a href="[% cgi_url %]?id=[% node_param %]&version=[% revision.version %]&diffversion=[% version %]">current</a>) + [% UNLESS revision.version == 1 %]<a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version - 1 %];diffversion=[% revision.version %]">previous</a> / [% END %] + <a href="[% cgi_url %]?id=[% node_param %];version=[% revision.version %];diffversion=[% version %]">current</a>) [% END %] ..... [% revision.modified %] [% IF revision.username %] - by <a href="[% cgi_url %]?username=[% revision.username %]&action=userstats">[% revision.username %]</a> + by <a href="[% cgi_url %]?username=[% revision.username %];action=userstats">[% revision.username %]</a> [% END %] [% IF revision.comment %] <b>[[% revision.comment %]]</b> Modified: trunk/templates/recent_changes.tt =================================================================== --- trunk/templates/recent_changes.tt 2006-09-14 07:42:36 UTC (rev 866) +++ trunk/templates/recent_changes.tt 2006-09-17 12:42:27 UTC (rev 867) @@ -24,7 +24,7 @@ <td class="recentchanges_node_name"><a href="[% node.url %]">[% node.name %]</a></td> <td class="recentchanges_meta"> [% IF node.version > 1 %] - (<a href="[% cgi_url %]?id=[% node.name %]&version=[% node.version - 1 %]&diffversion=[% node.version %]">diff</a>) + (<a href="[% cgi_url %]?id=[% node.name %];version=[% node.version - 1 %];diffversion=[% node.version %]">diff</a>) (<a href="[% cgi_url %]?action=list_all_versions;id=[% node.name %]">history</a>) [% ELSE %] (new page) Modified: trunk/templates/search.tt =================================================================== --- trunk/templates/search.tt 2006-09-14 07:42:36 UTC (rev 866) +++ trunk/templates/search.tt 2006-09-17 12:42:27 UTC (rev 867) @@ -80,7 +80,7 @@ <p> Matches [% first_num %] - [% last_num %] of [% total_num %]. [% IF (first_num > 20) %] - <a href="search.cgi?search=[% search_terms %]&next=[% first_num - 21 %]">Previous 20 results</a> + <a href="search.cgi?search=[% search_terms %];next=[% first_num - 21 %]">Previous 20 results</a> [% END %] [% IF ((first_num > 20) and next_page_startpos) %] / Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-09-14 07:42:36 UTC (rev 866) +++ trunk/wiki.cgi 2006-09-17 12:42:27 UTC (rev 867) @@ -405,9 +405,9 @@ foreach my $node (@nodes) { my $node_param = uri_escape($formatter->node_name_to_node_param($node->{'name'})); - $node->{'moderate_url'} = $script_name . "?action=moderate&id=".$node_param."&version=".$node->{'version'}; - $node->{'view_url'} = $script_name . "?id=".$node_param."&version=".$node->{'version'}; - $node->{'diff_url'} = $script_name . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'}; + $node->{'moderate_url'} = $script_name . "?action=moderate;id=".$node_param.";version=".$node->{'version'}; + $node->{'view_url'} = $script_name . "?id=".$node_param.";version=".$node->{'version'}; + $node->{'diff_url'} = $script_name . "?id=".$node_param.";version=".$node->{'moderated_version'}.";diffversion=".$node->{'version'}; $node->{'delete_url'} = $script_name . "?action=delete;version=".$node->{'version'}.";id=".$node_param; }

1 0

r866 - in trunk: . templates
by svnadmin＠urchin.earth.li 14 Sep '06

14 Sep '06

Author: dom Date: 2006-09-14 08:42:36 +0100 (Thu, 14 Sep 2006) New Revision: 866 Modified: trunk/templates/needing_moderation.tt trunk/wiki.cgi Log: Include deletion link in pending moderation page (closes #143) Modified: trunk/templates/needing_moderation.tt =================================================================== --- trunk/templates/needing_moderation.tt 2006-09-14 07:29:14 UTC (rev 865) +++ trunk/templates/needing_moderation.tt 2006-09-14 07:42:36 UTC (rev 866) @@ -15,6 +15,7 @@ <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> Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-09-14 07:29:14 UTC (rev 865) +++ trunk/wiki.cgi 2006-09-14 07:42:36 UTC (rev 866) @@ -408,6 +408,7 @@ $node->{'moderate_url'} = $script_name . "?action=moderate&id=".$node_param."&version=".$node->{'version'}; $node->{'view_url'} = $script_name . "?id=".$node_param."&version=".$node->{'version'}; $node->{'diff_url'} = $script_name . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'}; + $node->{'delete_url'} = $script_name . "?action=delete;version=".$node->{'version'}.";id=".$node_param; } process_template( "needing_moderation.tt",

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
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