openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r735 - in trunk: . lib
by svnadmin＠urchin.earth.li 21 Feb '06

21 Feb '06

Author: dom Date: 2006-02-21 23:28:00 +0000 (Tue, 21 Feb 2006) New Revision: 735 Modified: trunk/Changes trunk/lib/OpenGuides.pm Log: Fix mod_perl redirect bug (closes #86) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-01-08 17:33:16 UTC (rev 734) +++ trunk/Changes 2006-02-21 23:28:00 UTC (rev 735) @@ -12,6 +12,7 @@ (the latter feature is user-configurable). Fix <link> in RSS to point to RecentChanges page, not the feed itself. #67 Default website for a page is now http:// + Fix mod_perl redirect bug. 0.51 15 November 2005 Important changes: Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-01-08 17:33:16 UTC (rev 734) +++ trunk/lib/OpenGuides.pm 2006-02-21 23:28:00 UTC (rev 735) @@ -423,7 +423,8 @@ my $lat = $data{metadata}{latitude}[0]; my $long = $data{metadata}{longitude}[0]; my $script_url = $self->config->script_url; - print CGI->redirect( $script_url . "search.cgi?lat=$lat;long=$long;distance_in_metres=$metres" ); + my $q = CGI->new; + print $q->redirect( $script_url . "search.cgi?lat=$lat;long=$long;distance_in_metres=$metres" ); } =item B<show_backlinks> @@ -936,8 +937,9 @@ $redir_param .= 'id=' if $oldid; $redir_param .= $id; $redir_param .= ";oldid=$oldid" if $oldid; - - return CGI->redirect( $redir_param ); + + my $q = CGI->new; + return $q->redirect( $redir_param ); } sub get_cookie {

1 0

r734 - trunk
by svnadmin＠urchin.earth.li 08 Jan '06

08 Jan '06

Author: dom Date: 2006-01-08 17:33:16 +0000 (Sun, 08 Jan 2006) New Revision: 734 Modified: trunk/PREREQUISITES Log: spelling Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2005-12-31 13:16:01 UTC (rev 733) +++ trunk/PREREQUISITES 2006-01-08 17:33:16 UTC (rev 734) @@ -1,7 +1,7 @@ Modules required by OpenGuides 0.51 =================================== -Algorithm::Diff (version 0.13 or later. Note that the latest verrsion uses +Algorithm::Diff (version 0.13 or later. Note that the latest version uses .zip rather than .tar.gz and breaks some automated installs) CGI (version 2.92 or later) CGI::Carp

1 0

r733 - trunk
by svnadmin＠urchin.earth.li 31 Dec '05

31 Dec '05

Author: ivorw Date: 2005-12-31 13:16:01 +0000 (Sat, 31 Dec 2005) New Revision: 733 Modified: trunk/Build.PL trunk/PREREQUISITES Log: Closes #73, Requires CGIi::Wiki::Plugin::Diff 0.08 Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2005-12-24 13:38:06 UTC (rev 732) +++ trunk/Build.PL 2005-12-31 13:16:01 UTC (rev 733) @@ -221,7 +221,7 @@ 'CGI::Wiki' => '0.62', # fixed delete version 'CGI::Wiki::Formatter::UseMod' => '0.16', # macros 'CGI::Wiki::Plugin::Categoriser' => 0, - 'CGI::Wiki::Plugin::Diff' => '0.07', # earlier buggy + 'CGI::Wiki::Plugin::Diff' => '0.08', # earlier buggy 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.09', # fixes date formatting bug 'CGI::Wiki::Plugin::RSS::Reader' => '1.3', # earlier versions don't support RSS 2.0 Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2005-12-24 13:38:06 UTC (rev 732) +++ trunk/PREREQUISITES 2005-12-31 13:16:01 UTC (rev 733) @@ -1,14 +1,15 @@ Modules required by OpenGuides 0.51 =================================== -Algorithm::Diff (version 0.13 or later) +Algorithm::Diff (version 0.13 or later. Note that the latest verrsion uses + .zip rather than .tar.gz and breaks some automated installs) CGI (version 2.92 or later) CGI::Carp CGI::Cookie CGI::Wiki (version 0.62 or later) CGI::Wiki::Formatter::UseMod (version 0.16 or later) CGI::Wiki::Plugin::Categoriser -CGI::Wiki::Plugin::Diff (version 0.07 or later) +CGI::Wiki::Plugin::Diff (version 0.08 or later) CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later) CGI::Wiki::Plugin::RSS::ModWiki (version 0.09 or later) CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later)

1 0

r732 - trunk
by svnadmin＠urchin.earth.li 24 Dec '05

24 Dec '05

Author: ivorw Date: 2005-12-24 13:38:06 +0000 (Sat, 24 Dec 2005) New Revision: 732 Modified: trunk/Build.PL trunk/INSTALL trunk/MANIFEST Log: Some changes that were missing for Google Maps Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2005-12-21 18:47:52 UTC (rev 731) +++ trunk/Build.PL 2005-12-24 13:38:06 UTC (rev 732) @@ -274,6 +274,7 @@ "footer.tt", "header.tt", "home_node.tt", + "map_index.tt", "navbar.tt", "newpage.tt", "node.tt", Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2005-12-21 18:47:52 UTC (rev 731) +++ trunk/INSTALL 2005-12-24 13:38:06 UTC (rev 732) @@ -191,7 +191,33 @@ Note that these the latter question will override the former, so if you want to use a local node make sure to leave the latter blank. + "Make node titles link to node backlinks (C2 style)?" +This refers to turning titles into links which bring up a list of referring +pages. This was the convention with older wikis, but is not intuitive. + + "Do you have a Google Maps API key to use with this guide?" + +If you want Google Maps integration, you need to register with Google to get +an API key. Visit http://www.google.com/apis/maps/signup.html and follow the +instructions. Paste the great long string into the console window where you +are installing. + + "What is the longitude of the centre point of a map to draw for your guide?" + "What is the latitude of the centre point of a map to draw for your guide?" + +It's probably a good idea to pick some notionally central point for your +guide. For example, Carfax for Oxford, Charing Cross for London. + + "What default zoom level shall we use for Google Maps?" + "What default zoom level shall we use for Google Maps in the search results?" + +The defaults are probably appropriate in most cases. + + "Forcibly treat stored lat/long data as if they used the WGS84 ellipsoid?" + +Default this answer if you don't know what it means. + "Distance calculation methods available are: 1) British National Grid 2) Irish National Grid Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2005-12-21 18:47:52 UTC (rev 731) +++ trunk/MANIFEST 2005-12-24 13:38:06 UTC (rev 732) @@ -38,6 +38,7 @@ templates/footer.tt templates/header.tt templates/home_node.tt +templates/map_index.tt templates/navbar.tt templates/newpage.tt templates/node.tt @@ -64,6 +65,7 @@ t/25_write_geo_data.t t/26_geo_data_search_form.t t/27_geo_data_edit_form.t +t/28_wgs84_coords.t t/31_search.t t/32_search_simple_metadata.t t/33_search_advanced_search.t

1 0

r731 - in trunk: . t templates
by svnadmin＠urchin.earth.li 21 Dec '05

21 Dec '05

Author: dom Date: 2005-12-21 18:47:52 +0000 (Wed, 21 Dec 2005) New Revision: 731 Added: trunk/templates/map_index.tt Modified: trunk/preferences.cgi trunk/t/13_cookies.t Log: Couple of things missing from previous commit. Modified: trunk/preferences.cgi =================================================================== --- trunk/preferences.cgi 2005-12-21 18:16:36 UTC (rev 730) +++ trunk/preferences.cgi 2005-12-21 18:47:52 UTC (rev 731) @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl use warnings; use strict; Modified: trunk/t/13_cookies.t =================================================================== --- trunk/t/13_cookies.t 2005-12-21 18:16:36 UTC (rev 730) +++ trunk/t/13_cookies.t 2005-12-21 18:47:52 UTC (rev 731) @@ -3,7 +3,7 @@ use OpenGuides::CGI; use Time::Piece; use Time::Seconds; -use Test::More tests => 19; +use Test::More tests => 20; eval { OpenGuides::CGI->make_prefs_cookie; }; ok( $@, "->make_prefs_cookie dies if no config object supplied" ); @@ -27,6 +27,7 @@ default_edit_type => "tidying", cookie_expires => "never", track_recent_changes_views => 1, + display_google_maps => 1 ); isa_ok( $cookie, "CGI::Cookie", "->make_prefs_cookie returns a cookie" ); @@ -63,9 +64,10 @@ is( $prefs{default_edit_type}, "tidying", "...and default edit prefs" ); is( $prefs{cookie_expires}, "never", "...and requested cookie expiry" ); ok( $prefs{track_recent_changes_views}, "...and recent changes tracking" ); +is( $prefs{display_google_maps}, 1, "...and Google Maps display preference" ); # Check that cookie parsing fails nicely if no cookie set. delete $ENV{HTTP_COOKIE}; %prefs = eval { OpenGuides::CGI->get_prefs_from_cookie( config => $config ); }; is( $@, "", "->get_prefs_from_cookie doesn't die if no cookie set" ); -is( keys %prefs, 9, "...and returns nine default values" ); +is( keys %prefs, 10, "...and returns ten default values" ); Added: trunk/templates/map_index.tt =================================================================== --- trunk/templates/map_index.tt 2005-12-21 18:16:36 UTC (rev 730) +++ trunk/templates/map_index.tt 2005-12-21 18:47:52 UTC (rev 731) @@ -0,0 +1,61 @@ +[% INCLUDE header.tt page_title = "Map of all nodes" %] +[% INCLUDE banner.tt %] +<div id="content"> +<a href="" id="permalink">Link to this Page</a> | <a href="" onclick="showTowns(); return false;">Show Town Boundaries</a> + +<div id="maincontent"> + +[% IF gmaps_api_key %] + <ul style="height:400px; overflow:auto;float:right; width:30%;"> + [% i = 0 %] + [% FOREACH node = nodes %] + [% metadata = node.node_data.metadata %] + [% i = i + 1 %] + [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] + <li><a href='#' onclick="marker[% i %].openInfoWindowHtml(htmlString[% i %]); return false;">[% node.name %]</a>[% IF metadata.city.list.first %], [% metadata.city.list.first %][% END %]</li> + [% END %] + [% END %] + </ul> + + <table width="100%" height="100%"> + <tr><td><div id="map" style=" width: 65%; height: 450px"></div></td></tr> + </table> + + <script defer="defer" type="text/javascript"> + //<![CDATA[ + var map = new GMap(document.getElementById("map")); + map.addControl(new GLargeMapControl()); + map.addControl(new GMapTypeControl()); + map.centerAndZoom(new GPoint([% IF long %][% long %][% ELSE %][% centre_long %][% END %],[% IF lat %][% lat %][% ELSE %][% centre_lat %][% END %]), [% IF zoom %][% zoom %][% ELSE %][% default_gmaps_zoom %][% END %]); + + [% i = 0 %] + [% FOREACH node = nodes %] + [% i = i + 1 %] + [% metadata = node.node_data.metadata %] + [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] + var point[% i %] = new GPoint([% metadata.longitude.list.first %], [% metadata.latitude.list.first %]); + var marker[% i %] = new GMarker(point[% i %],baseIcon); + var htmlString[% i %] = "<a href=\"?[% node.param %]\">[% node.name %]</a> <a style='text-decoration:none;' href=\"?id=[% node.param %];action=edit\">(edit)</a><br />[% metadata.address.list.first %]<br />[% metadata.city.list.first %]"; + GEvent.addListener(marker[% i %], "click", function() { + marker[% i %].openInfoWindowHtml(htmlString[% i %]); + }); + map.addOverlay(marker[% i %]); + [% END %] + [% END %] + function map_recenter() { + 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; + } + GEvent.addListener(map, "moveend", map_recenter ); + //]]> + </script> +[% ELSE %] + Sorry, this guide doesn't have Google Maps functionality enabled. +[% END %] + +</div> +</div> + +[% INCLUDE footer.tt %]

1 0

r730 - in trunk: . lib lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 21 Dec '05

21 Dec '05

Author: dom Date: 2005-12-21 18:16:36 +0000 (Wed, 21 Dec 2005) New Revision: 730 Added: trunk/t/28_wgs84_coords.t Modified: trunk/Build.PL trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/CGI.pm trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/Template.pm trunk/lib/OpenGuides/Utils.pm trunk/preferences.cgi trunk/templates/header.tt trunk/templates/node.tt trunk/templates/preferences.tt Log: Add initial google maps support, see #46 but this isn't yet a complete implementation so leaving the bug open for now. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/Build.PL 2005-12-21 18:16:36 UTC (rev 730) @@ -76,7 +76,8 @@ 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 - formatting_rules_node backlinks_in_title + formatting_rules_node backlinks_in_title gmaps_api_key centre_long + centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84 ) ) { my $q_method = $var . "__qu"; my $qu = $existing_config->$q_method; Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/Changes 2005-12-21 18:16:36 UTC (rev 730) @@ -7,6 +7,9 @@ Things with opening hours are marked as geospatial in RDF. Fix missing bracket in node.tt. Add custom_node template just below main content in node.tt. + Google Maps support! There is a new index type, + wiki.cgi?action=index;format=map, and maps appear in the node listings + (the latter feature is user-configurable). Fix <link> in RSS to point to RecentChanges page, not the feed itself. #67 Default website for a page is now http:// Modified: trunk/lib/OpenGuides/CGI.pm =================================================================== --- trunk/lib/OpenGuides/CGI.pm 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/lib/OpenGuides/CGI.pm 2005-12-21 18:16:36 UTC (rev 730) @@ -1,7 +1,7 @@ package OpenGuides::CGI; use strict; use vars qw( $VERSION ); -$VERSION = '0.06'; +$VERSION = '0.07'; use Carp qw( croak ); use CGI::Cookie; @@ -38,6 +38,7 @@ default_edit_type => "tidying", cookie_expires => "never", track_recent_changes_views => 1, + display_google_maps => 1 ); my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); @@ -82,6 +83,7 @@ default_edit_type => "tidying", cookie_expires => "never", track_recent_changes_views => 1, + display_google_maps => 1 ); Croaks unless an L<OpenGuides::Config> object is supplied as C<config>. @@ -124,6 +126,7 @@ defedit => $args{default_edit_type} || "normal", exp => $args{cookie_expires}, trackrc => $args{track_recent_changes_views} || 0, + gmaps => $args{display_google_maps} || 0 }, -expires => $expires, ); @@ -161,6 +164,7 @@ default_edit_type => $data{defedit} || "normal", cookie_expires => $data{exp} || "month", track_recent_changes_views => $data{trackrc} || 0, + display_google_maps => $data{gmaps} || 0 ); } @@ -255,7 +259,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2004 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/lib/OpenGuides/Config.pm 2005-12-21 18:16:36 UTC (rev 730) @@ -9,8 +9,9 @@ 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 - formatting_rules_node formatting_rules_link backlinks_in_title template_path custom_template_path - geo_handler ellipsoid + 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 ); my @questions = map { $_ . "__qu" } @variables; OpenGuides::Config->mk_accessors( @variables ); @@ -76,7 +77,12 @@ formatting_rules_link => "http://openguides.org/page/text_formatting", backlinks_in_title => 0, geo_handler => 1, - ellipsoid => "International" + ellipsoid => "International", + centre_long => 0, + centre_lat => 0, + default_gmaps_zoom => 5, + default_gmaps_search_zoom => 3, + force_wgs84 => 0 ); # See if we already have some config variables set. @@ -134,6 +140,12 @@ 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)?", ellipsoid => "Which ellipsoid do you want to use? (eg 'Airy', 'WGS-84')", + gmaps_api_key => "Do you have a Google Maps API key to use with this guide? If you enter it here the Google Maps functionality will be automatically enabled.", + centre_long => "What is the longitude of the centre point of a map to draw for your guide? (This question can be ignored if you aren't using Google Maps)", + centre_lat => "What is the latitude of the centre point of a map to draw for your guide? (This question can be ignored if you aren't using Google Maps)", + default_gmaps_zoom => "What default zoom level shall we use for Google Maps? (This question can be ignored if you aren't using Google Maps)", + default_gmaps_search_zoom => "What default zoom level shall we use for Google Maps in the search results? (This question can be ignored if you aren't using Google Maps)", + force_wgs84 => "Forcibly treat stored lat/long data as if they used the WGS84 ellipsoid?" ); foreach my $var ( keys %questions ) { @@ -222,6 +234,18 @@ =item * ellipsoid (default: C<International>) +=item * gmaps_api_key + +=item * centre_long + +=item * centre_lat + +=item * default_gmaps_zoom + +=item * default_gmaps_search_zoom + +=item * force_wgs84 + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/lib/OpenGuides/Template.pm 2005-12-21 18:16:36 UTC (rev 730) @@ -86,6 +86,8 @@ =item * C<home_name> +=item * C<gmaps_api_key> + =back =over @@ -153,6 +155,7 @@ enable_page_deletion => $enable_page_deletion, language => $config->default_language, default_city => $default_city, + gmaps_api_key => $config->gmaps_api_key }; if ($args{node}) { Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/lib/OpenGuides/Utils.pm 2005-12-21 18:16:36 UTC (rev 730) @@ -2,7 +2,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.08'; +$VERSION = '0.09'; use Carp qw( croak ); use CGI::Wiki; @@ -216,7 +216,46 @@ return $wiki; } +=item B<get_wgs84_coords> +Returns coordinate data suitable for use with Google Maps (and other GIS +systems that assume WGS-84 data). + + my ($wgs84_long, $wgs84_lat) = OpenGuides::Utils->get_wgs84_coords( + longitude => $longitude, + latitude => $latitude, + config => $config + ); + +=cut + +sub get_wgs84_coords { + my ($self, %args) = @_; + my ($longitude, $latitude, $config) = ($args{longitude}, $args{latitude}, + $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) { + # Do conversion here + return undef; + } elsif ($config->geo_handler == 2) { + # Do conversion here + return undef; + } elsif ($config->geo_handler == 3) { + if ($config->ellipsoid eq "WGS-84") { + return ($longitude, $latitude); + } else { + # Do conversion here + return undef; + } + } else { + croak "Invalid geo_handler config option $config->geo_handler"; + } +} + =back =head1 AUTHOR @@ -225,7 +264,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2004 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2005 The OpenGuides Project. All Rights Reserved. This module is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/lib/OpenGuides.pm 2005-12-21 18:16:36 UTC (rev 730) @@ -171,6 +171,10 @@ my $modified = $node_data{last_modified}; my %metadata = %{$node_data{metadata}}; + my ($wgs84_long, $wgs84_lat) = OpenGuides::Utils->get_wgs84_coords( + longitude => $metadata{longitude}[0], + latitude => $metadata{latitude}[0], + config => $config); if ($args{format} && $args{format} eq 'raw') { print "Content-Type: text/plain\n\n"; print $raw; @@ -192,6 +196,10 @@ node => $id, language => $config->default_language, oldid => $oldid, + enable_gmaps => 1, + display_google_maps => $self->get_cookie("display_google_maps"), + wgs84_long => $wgs84_long, + wgs84_lat => $wgs84_lat ); if ( $raw =~ /^#REDIRECT\s+(.+?)\s*$/ ) { @@ -542,6 +550,18 @@ elsif ( $args{format} eq "plain" ) { $template = "plain_index.tt"; $conf{content_type} = "text/plain"; + } elsif ( $args{format} eq "map" ) { + my $q = CGI->new; + $tt_vars{zoom} = $q->param('zoom') || ''; + $tt_vars{lat} = $q->param('lat') || ''; + $tt_vars{long} = $q->param('long') || ''; + $tt_vars{centre_long} = $self->config->centre_long; + $tt_vars{centre_lat} = $self->config->centre_lat; + $tt_vars{default_gmaps_zoom} = $self->config->default_gmaps_zoom; + $tt_vars{enable_gmaps} = 1; + $tt_vars{display_google_maps} = 1; # override for this page + $template = "map_index.tt"; + } } else { $template = "site_index.tt"; @@ -928,7 +948,6 @@ return $cookie_data{$pref_name}; } - =back =head1 BUGS AND CAVEATS Modified: trunk/preferences.cgi =================================================================== --- trunk/preferences.cgi 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/preferences.cgi 2005-12-21 18:16:36 UTC (rev 730) @@ -33,6 +33,7 @@ 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_cookie = OpenGuides::CGI->make_prefs_cookie( config => $config, username => $username, @@ -44,6 +45,7 @@ default_edit_type => $edit_type, cookie_expires => $expires, track_recent_changes_views => $track_rc, + display_google_maps => $gmaps ); my @cookies = ( $prefs_cookie ); # If they've asked not to have their recent changes visits tracked, @@ -71,6 +73,7 @@ default_edit_type => $edit_type, cookie_expires => $expires, track_recent_changes_views => $track_rc, + display_google_maps => $gmaps } ); } Added: trunk/t/28_wgs84_coords.t =================================================================== --- trunk/t/28_wgs84_coords.t 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/t/28_wgs84_coords.t 2005-12-21 18:16:36 UTC (rev 730) @@ -0,0 +1,27 @@ +use strict; +use CGI::Wiki::Setup::SQLite; +use OpenGuides; +use OpenGuides::Test; +use Test::More; + +plan tests => 2; + +# Clear out the database from any previous runs. +unlink "t/node.db"; + +my $config = OpenGuides::Test->make_basic_config; +$config->force_wgs84 (1); + +my $guide = OpenGuides->new( config => $config ); + +my ($longitude, $latitude) = (0, 0); + +my ($wgs_long, $wgs_lat) = OpenGuides::Utils->get_wgs84_coords( + longitude => $longitude, + latitude => $latitude, + config => $config); + +is( $wgs_long, $longitude, + "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"); Property changes on: trunk/t/28_wgs84_coords.t ___________________________________________________________________ Name: svn:executable + * Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/templates/header.tt 2005-12-21 18:16:36 UTC (rev 730) @@ -28,5 +28,22 @@ [% 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=1&key=[% gmaps_api_key %]" 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: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/templates/node.tt 2005-12-21 18:16:36 UTC (rev 730) @@ -8,6 +8,23 @@ <div id="redirect_message">(redirected from <a href="[% full_cgi_url %]?id=[% oldid %];redirect=0">[% oldid.replace('_', ' ') %]</a>)</div> [% END %] +[% IF wgs84_lat AND wgs84_long AND display_google_maps and gmaps_api_key %] + <div id="map" style="float:right; width: 300px; height: 200px"></div> + <script defer="defer" type="text/javascript"> + //<![CDATA[ + var map = new GMap(document.getElementById("map")); + map.addControl(new GSmallMapControl()); + map.centerAndZoom(new GPoint([% longitude %], [% latitude %]), 3); + var point0 = new GPoint([% wgs84_long %], [% wgs84_lat %]); + var marker0 = new GMarker(point0,baseIcon); + GEvent.addListener(marker0, "click", function() { + marker0.openInfoWindowHtml("[% node_name %]"); + }); + map.addOverlay(marker0); + //]]> + </script> +[% END %] + [% IF current %] [% IF backlinks_in_title AND is_indexable_node %] <h2 class="node_name"><a href="[% cgi_url %]?action=index;index_type=[% CGI.escape(index_type) %];index_value=[% CGI.escape(index_value) %]">[% node_name %]</a></h2> Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2005-12-03 17:06:12 UTC (rev 729) +++ trunk/templates/preferences.tt 2005-12-21 18:16:36 UTC (rev 730) @@ -75,6 +75,17 @@ <label for="track_recent_changes_views">Track my visits to Recent Changes and offer me a link for “changes since I last viewed Recent Changes”.</label> </p> + [% IF gmaps_api_key %] + <p> + [% IF 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" /> + [% END %] + <label for="display_google_maps">Display Google Maps.</label> + </p> + [% END %] + <p> <label for="default_edit_type">Default edit type:</label> <select name="default_edit_type"> @@ -150,6 +161,12 @@ [% UNLESS track_recent_changes_views %] not [% END %] be tracked.</p> + [% IF gmaps_api_key %] + <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' %] “Normal edit”.

1 0

r729 - trunk
by svnadmin＠urchin.earth.li 03 Dec '05

03 Dec '05

Author: ivorw Date: 2005-12-03 17:06:12 +0000 (Sat, 03 Dec 2005) New Revision: 729 Modified: trunk/Changes Log: oops, forgot to update Changes Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-12-03 17:02:47 UTC (rev 728) +++ trunk/Changes 2005-12-03 17:06:12 UTC (rev 729) @@ -8,6 +8,7 @@ Fix missing bracket in node.tt. Add custom_node template just below main content in node.tt. Fix <link> in RSS to point to RecentChanges page, not the feed itself. + #67 Default website for a page is now http:// 0.51 15 November 2005 Important changes:

1 0

r728 - in trunk: . lib
by svnadmin＠urchin.earth.li 03 Dec '05

03 Dec '05

Author: ivorw Date: 2005-12-03 17:02:47 +0000 (Sat, 03 Dec 2005) New Revision: 728 Modified: trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Closes #67, http:// now the default website Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-12-01 22:56:11 UTC (rev 727) +++ trunk/lib/OpenGuides.pm 2005-12-03 17:02:47 UTC (rev 728) @@ -727,6 +727,8 @@ cgi_obj => $q ); + delete $metadata{website} if $metadata{website} eq 'http://'; + $metadata{opening_hours_text} = $q->param("hours_text") || ""; # Pick out the unmunged versions of lat/long if they're set. Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2005-12-01 22:56:11 UTC (rev 727) +++ trunk/wiki.cgi 2005-12-03 17:02:47 UTC (rev 728) @@ -255,6 +255,8 @@ config => $config, metadata => $node_data{metadata} ); + $metadata_vars{website} ||= 'http://'; + my %tt_vars = ( content => $q->escapeHTML($content), checksum => $q->escapeHTML($checksum), %metadata_vars,

1 0

r727 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 01 Dec '05

01 Dec '05

Author: earle Date: 2005-12-01 22:56:11 +0000 (Thu, 01 Dec 2005) New Revision: 727 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm Log: fixes #58 Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-11-30 22:41:41 UTC (rev 726) +++ trunk/Changes 2005-12-01 22:56:11 UTC (rev 727) @@ -7,6 +7,7 @@ Things with opening hours are marked as geospatial in RDF. Fix missing bracket in node.tt. Add custom_node template just below main content in node.tt. + Fix <link> in RSS to point to RecentChanges page, not the feed itself. 0.51 15 November 2005 Important changes: Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-11-30 22:41:41 UTC (rev 726) +++ trunk/lib/OpenGuides/RDF.pm 2005-12-01 22:56:11 UTC (rev 727) @@ -210,7 +210,7 @@ site_url => $self->{config}->script_url, site_description => $self->{site_description}, make_node_url => $self->{make_node_url}, - recent_changes_link => $self->{config}->script_url . '?action=rss', + recent_changes_link => $self->{config}->script_url . '?action=rc', software_name => 'OpenGuides', software_homepage => 'http://openguides.org/', software_version => $self->{og_version},

1 0

r726 - in trunk: lib/OpenGuides t
by svnadmin＠urchin.earth.li 30 Nov '05

30 Nov '05

Author: earle Date: 2005-11-30 22:41:41 +0000 (Wed, 30 Nov 2005) New Revision: 726 Modified: trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t Log: fixes #50 Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2005-11-30 21:10:38 UTC (rev 725) +++ trunk/lib/OpenGuides/RDF.pm 2005-11-30 22:41:41 UTC (rev 726) @@ -133,7 +133,7 @@ <dc:title>} . $self->{site_name} . qq{: $node_name</dc:title> <dc:date>$timestamp</dc:date> <dcterms:modified>$timestamp</dcterms:modified> - <dc:contributor>$username</dc:contributor> + <dc:contributor foaf:nick="$username" /> <dc:source rdf:resource="$version_indpt_url" /> <wiki:version>$version</wiki:version> <foaf:topic rdf:resource="#obj" /> Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2005-11-30 21:10:38 UTC (rev 725) +++ trunk/t/21_rdf.t 2005-11-30 22:41:41 UTC (rev 726) @@ -83,7 +83,7 @@ qr|<dc:title>CGI::Wiki Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); - like( $rdfxml, qr|<dc:contributor>Kake</dc:contributor>|, + like( $rdfxml, qr|<dc:contributor foaf:nick="Kake" />|, "last username to edit used as contributor" ); like( $rdfxml, qr|<wiki:version>1</wiki:version>|, "version picked up" );

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
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