openguides-commits April 2006

openguides-commits@lists.openguides.org

1 participants
33 discussions

r783 - in trunk: . lib
by svnadmin＠urchin.earth.li 21 Apr '06

21 Apr '06

Author: dom Date: 2006-04-21 10:45:45 +0100 (Fri, 21 Apr 2006) New Revision: 783 Modified: trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Development cycle again. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-21 09:18:17 UTC (rev 782) +++ trunk/lib/OpenGuides.pm 2006-04-21 09:45:45 UTC (rev 783) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.54'; +$VERSION = '0.55-svn'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-21 09:18:17 UTC (rev 782) +++ trunk/wiki.cgi 2006-04-21 09:45:45 UTC (rev 783) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.54'; +$VERSION = '0.55-svn'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r782 - in trunk: . lib lib/OpenGuides t
by svnadmin＠urchin.earth.li 21 Apr '06

21 Apr '06

Author: dom Date: 2006-04-21 10:18:17 +0100 (Fri, 21 Apr 2006) New Revision: 782 Added: trunk/t/68_bug_website_displayed.t Modified: trunk/Changes trunk/MANIFEST trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Template.pm trunk/wiki.cgi Log: Fix bug and release 0.54 (fixes #112) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/Changes 2006-04-21 09:18:17 UTC (rev 782) @@ -1,5 +1,8 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. +0.54 21 April 2006 + #112 Fixed website display bug introduced in 0.53. + 0.53 20 April 2006 Miscellanous fixes for mod_perl. #42 New "About" screen. Try action=about and action=about;format=rdf. Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/MANIFEST 2006-04-21 09:18:17 UTC (rev 782) @@ -92,5 +92,6 @@ t/65_bug_metadata_escape.t t/66_bug_latlong_representation.t t/67_bug_first_version.t +t/68_bug_website_displayed.t t/templates/15_test.tt wiki.cgi Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/PREREQUISITES 2006-04-21 09:18:17 UTC (rev 782) @@ -1,4 +1,4 @@ -Modules required by OpenGuides 0.53 +Modules required by OpenGuides 0.54 =================================== Algorithm::Diff (version 0.13 or later. Note that the latest version uses Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/lib/OpenGuides/Template.pm 2006-04-21 09:18:17 UTC (rev 782) @@ -297,7 +297,7 @@ my $website = $args{metadata} ? $metadata{website}[0] : $q->param("website"); my $formatted_website_text = ""; - if ( $website && $website != "http://" ) { + if ( $website && $website ne "http://" ) { $formatted_website_text = $class->format_website_text( formatter => $formatter, text => $website Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/lib/OpenGuides.pm 2006-04-21 09:18:17 UTC (rev 782) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.54-svn'; +$VERSION = '0.54'; =head1 NAME Added: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/t/68_bug_website_displayed.t 2006-04-21 09:18:17 UTC (rev 782) @@ -0,0 +1,26 @@ +use CGI::Wiki::Setup::SQLite; +use OpenGuides; +use OpenGuides::Test; +use Test::More tests => 1; + +eval { require DBD::SQLite; }; +my $have_sqlite = $@ ? 0 : 1; + +SKIP: { + skip "DBD::SQLite not installed - no database to test with", 1 + unless $have_sqlite; + + CGI::Wiki::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); + CGI::Wiki::Setup::SQLite::setup( { dbname => "t/node.db" } ); + my $config = OpenGuides::Test->make_basic_config; + my $guide = OpenGuides->new( config => $config ); + + $guide->wiki->write_node( "South Croydon Station", "A sleepy main-line station in what is arguably the nicest part of Croydon.", undef, { website => "http://www.example.com/" } ) or die "Couldn't write node"; + + my $output = $guide->display_node( + id => "South Croydon Station", + return_output => 1, + ); + like( $output, qr#Website:</span> <a href="http://www.example.com/">http://www.example.com/</a>#, "website correctly displayed" ); +} + Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-21 08:22:05 UTC (rev 781) +++ trunk/wiki.cgi 2006-04-21 09:18:17 UTC (rev 782) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.54-svn'; +$VERSION = '0.54'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r781 - in trunk: . lib
by svnadmin＠urchin.earth.li 21 Apr '06

21 Apr '06

Author: dom Date: 2006-04-21 09:22:05 +0100 (Fri, 21 Apr 2006) New Revision: 781 Modified: trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Development version. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-20 18:13:18 UTC (rev 780) +++ trunk/lib/OpenGuides.pm 2006-04-21 08:22:05 UTC (rev 781) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.53'; +$VERSION = '0.54-svn'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-20 18:13:18 UTC (rev 780) +++ trunk/wiki.cgi 2006-04-21 08:22:05 UTC (rev 781) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.53'; +$VERSION = '0.54-svn'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r780 - trunk
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 19:13:18 +0100 (Thu, 20 Apr 2006) New Revision: 780 Modified: trunk/Changes trunk/PREREQUISITES Log: Update for release today. Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 18:13:08 UTC (rev 779) +++ trunk/Changes 2006-04-20 18:13:18 UTC (rev 780) @@ -1,6 +1,6 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. -0.53 +0.53 20 April 2006 Miscellanous fixes for mod_perl. #42 New "About" screen. Try action=about and action=about;format=rdf. #97 Use "summary" metadata to generate HTML meta descriptions. Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2006-04-20 18:13:08 UTC (rev 779) +++ trunk/PREREQUISITES 2006-04-20 18:13:18 UTC (rev 780) @@ -1,4 +1,4 @@ -Modules required by OpenGuides 0.52 +Modules required by OpenGuides 0.53 =================================== Algorithm::Diff (version 0.13 or later. Note that the latest version uses

1 0

r779 - trunk
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 19:13:08 +0100 (Thu, 20 Apr 2006) New Revision: 779 Modified: trunk/wiki.cgi Log: Support the "about" view. Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-20 18:04:17 UTC (rev 778) +++ trunk/wiki.cgi 2006-04-20 18:13:08 UTC (rev 779) @@ -124,6 +124,8 @@ } } print $q->redirect( $redir_target ); + } elsif ($action eq 'about') { + $guide->display_about(format => $format); } else { # Default is to display a node. if ( $format and $format eq "rdf" ) { display_node_rdf( node => $node );

1 0

r778 - trunk/lib
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 19:04:17 +0100 (Thu, 20 Apr 2006) New Revision: 778 Modified: trunk/lib/OpenGuides.pm Log: Fix references to self in URLs. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-04-20 17:48:49 UTC (rev 777) +++ trunk/lib/OpenGuides.pm 2006-04-20 18:04:17 UTC (rev 778) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.53-svn'; +$VERSION = '0.53'; =head1 NAME @@ -773,7 +773,7 @@ } else { my $site_name = $self->config->{site_name}; - my $script_url = $self->config->{script_url}; + my $script_name = $self->config->{script_name}; $output = qq{Content-Type: text/html; charset=utf-8 <html> @@ -792,14 +792,14 @@ <link rel="alternate" type="application/rdf+xml" title="DOAP (Description Of A Project) profile for this site's software" - href="$script_url?action=about;format=rdf" /> + href="$script_name?action=about;format=rdf" /> </head> <body> <div id="content"> <div id="logo"> <a href="http://openguides.org/"><img src="http://openguides.org/img/logo.jpg" alt="OpenGuides.org"></a> -<h1><a href="$script_url">$site_name</a></h1> +<h1><a href="$script_name">$site_name</a></h1> <h2>is powered by <a href="http://openguides.org/">OpenGuides</a> -<br> the guides built by you.</h2> <h3>version <a href="http://search.cpan.org/~dom/OpenGuides-$VERSION">$VERSION</a></h3> @@ -834,7 +834,7 @@ </p> </div> <div id="meta"> -<a href="$script_url?action=about;format=rdf"><acronym +<a href="$script_name?action=about;format=rdf"><acronym title="Description Of A Project">DOAP</acronym> RDF version of this information</a> </div>

1 0

r777 - trunk
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 18:48:49 +0100 (Thu, 20 Apr 2006) New Revision: 777 Modified: trunk/Build.PL trunk/INSTALL Log: Config fixups Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2006-04-20 16:06:21 UTC (rev 776) +++ trunk/Build.PL 2006-04-20 17:48:49 UTC (rev 777) @@ -78,6 +78,7 @@ site_desc default_city default_country contact_email default_language formatting_rules_node backlinks_in_title gmaps_api_key centre_long centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84 + licence_name licence_url licence_info_url ) ) { my $q_method = $var . "__qu"; my $qu = $existing_config->$q_method; Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2006-04-20 16:06:21 UTC (rev 776) +++ trunk/INSTALL 2006-04-20 17:48:49 UTC (rev 777) @@ -218,6 +218,23 @@ Default this answer if you don't know what it means. + "What licence will you use for the guide?" + +We strongly recommend that you think at the outset about the licence your +guide will use, for maximum usefulness. In particular for a guide that will +be on the OpenGuides network, we recommend the +"Creative Commons Attribution-ShareAlike 2.5" licence. + + "What is the URL to your licence?" + +If you used our recommendation above the URL you will want here is: +http://creativecommons.org/licenses/by-sa/2.5/ + + "What is the URL to your local page about your licensing policy?" + +You should probably include a page on your wiki about your local licensing +policy, but you can leave this blank for now if you don't have one yet. + "Distance calculation methods available are: 1) British National Grid 2) Irish National Grid @@ -252,23 +269,6 @@ If you want to use a UTM ellipsoid, WGS-84 is the best choice, as it will allow you to use the Google Maps support with the minimum of fuss. - "What licence will you use for the guide?" - -We strongly recommend that you think at the outset about the licence your -guide will use, for maximum usefulness. In particular for a guide that will -be on the OpenGuides network, we recommend the -"Creative Commons Attribution-ShareAlike 2.5" licence. - - "What is the URL to your licence?" - -If you used our recommendation above the URL you will want here is: -http://creativecommons.org/licenses/by-sa/2.5/ - - "What is the URL to your local page about your licensing policy?" - -You should probably include a page on your wiki about your local licensing -policy, but you can leave this blank for now if you don't have one yet. - * Dependency errors If, after you have answered these questions, the build script complains

1 0

r776 - in trunk: . lib/OpenGuides templates
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 17:06:21 +0100 (Thu, 20 Apr 2006) New Revision: 776 Modified: trunk/Changes trunk/INSTALL trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/Template.pm trunk/templates/footer.tt Log: Add licence variables (closes #56) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/Changes 2006-04-20 16:06:21 UTC (rev 776) @@ -12,6 +12,7 @@ #103 Fix empty Category/Locale list bug. #54 Fix RSS redirection for backwards compatibility. #79 Partial fix to help combat HTML spam + #56 Add licence config variables 0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/INSTALL 2006-04-20 16:06:21 UTC (rev 776) @@ -252,6 +252,23 @@ If you want to use a UTM ellipsoid, WGS-84 is the best choice, as it will allow you to use the Google Maps support with the minimum of fuss. + "What licence will you use for the guide?" + +We strongly recommend that you think at the outset about the licence your +guide will use, for maximum usefulness. In particular for a guide that will +be on the OpenGuides network, we recommend the +"Creative Commons Attribution-ShareAlike 2.5" licence. + + "What is the URL to your licence?" + +If you used our recommendation above the URL you will want here is: +http://creativecommons.org/licenses/by-sa/2.5/ + + "What is the URL to your local page about your licensing policy?" + +You should probably include a page on your wiki about your local licensing +policy, but you can leave this blank for now if you don't have one yet. + * Dependency errors If, after you have answered these questions, the build script complains Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/lib/OpenGuides/Config.pm 2006-04-20 16:06:21 UTC (rev 776) @@ -12,6 +12,7 @@ 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 + licence_name licence_url licence_info_url ); my @questions = map { $_ . "__qu" } @variables; OpenGuides::Config->mk_accessors( @variables ); @@ -82,7 +83,10 @@ centre_lat => 0, default_gmaps_zoom => 5, default_gmaps_search_zoom => 3, - force_wgs84 => 0 + force_wgs84 => 0, + licence_name => "", + licence_url => "", + licence_info_url => "" ); # See if we already have some config variables set. @@ -145,7 +149,10 @@ 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?" + force_wgs84 => "Forcibly treat stored lat/long data as if they used the WGS84 ellipsoid?", + licence_name => "What licence will you use for the guide?", + licence_url => "What is the URL to your licence?", + licence_info_url => "What is the URL to your local page about your licensing policy?" ); foreach my $var ( keys %questions ) { @@ -246,6 +253,12 @@ =item * force_wgs84 +=item * licence_name + +=item * licence_url + +=item * licence_info_url + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/lib/OpenGuides/Template.pm 2006-04-20 16:06:21 UTC (rev 776) @@ -88,6 +88,12 @@ =item * C<gmaps_api_key> +=item * C<licence_name> + +=item * C<licence_url> + +=item * C<licence_info_url> + =back =over @@ -155,7 +161,10 @@ enable_page_deletion => $enable_page_deletion, language => $config->default_language, default_city => $default_city, - gmaps_api_key => $config->gmaps_api_key + gmaps_api_key => $config->gmaps_api_key, + licence_name => $config->licence_name, + licence_url => $config->licence_url, + licence_info_url => $config->licence_info_url }; if ($args{node}) { Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2006-04-20 14:41:02 UTC (rev 775) +++ trunk/templates/footer.tt 2006-04-20 16:06:21 UTC (rev 776) @@ -23,6 +23,21 @@ <p> Powered by <a href="[% full_cgi_url%]?action=about">OpenGuides [% openguides_version %]</a>. </p> + <p> + [% IF licence_name %] + This work is licensed under the + [% IF licence_url %] + <a href="[% licence_url %]"> + [% END %] + [% licence_name %] + [% IF licence_url %] + </a> + [% END %] + licence + [% IF licence_info_url %] + (<a href="[% licence_info_url %]">more info</a>) + [% END %] + [% END %] [% END %] </div>

1 0

r775 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 15:41:02 +0100 (Thu, 20 Apr 2006) New Revision: 775 Modified: trunk/Changes trunk/lib/OpenGuides/Template.pm Log: Quick fix to partially fix HTML spam problem (references #79) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-04-20 14:17:39 UTC (rev 774) +++ trunk/Changes 2006-04-20 14:41:02 UTC (rev 775) @@ -11,6 +11,7 @@ #93 Upgrade to new Google Maps API (for smaller javascript download) #103 Fix empty Category/Locale list bug. #54 Fix RSS redirection for backwards compatibility. + #79 Partial fix to help combat HTML spam 0.52 5 March 2006 IMPORTANT CHANGE: "supersearch.cgi" is now simply "search.cgi". If you Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2006-04-20 14:17:39 UTC (rev 774) +++ trunk/lib/OpenGuides/Template.pm 2006-04-20 14:41:02 UTC (rev 775) @@ -262,6 +262,13 @@ } else { my $categories_text = $q->param('categories'); my $locales_text = $q->param('locales'); + + # Basic sanity-checking. Probably lives elsewhere. + $categories_text =~ s/</</g; + $categories_text =~ s/>/>/g; + $locales_text =~ s/</</g; + $locales_text =~ s/>/>/g; + @catlist = sort grep { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space split("\r\n", $categories_text); @loclist = sort grep { s/^\s+//; s/\s+$//; $_; } # trim lead/trail space

1 0

r774 - trunk
by svnadmin＠urchin.earth.li 20 Apr '06

20 Apr '06

Author: dom Date: 2006-04-20 15:17:39 +0100 (Thu, 20 Apr 2006) New Revision: 774 Modified: trunk/wiki.cgi Log: Brown paper bag. /usr/bin/perl -> /usr/local/bin/perl Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-04-20 14:13:20 UTC (rev 773) +++ trunk/wiki.cgi 2006-04-20 14:17:39 UTC (rev 774) @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl use strict; use warnings;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits April 2006