openguides-commits October 2008

openguides-commits@lists.openguides.org

1 participants
24 discussions

r1237 - in trunk: . templates
by svnadmin＠urchin.earth.li 19 Oct '08

19 Oct '08

Author: dom Date: 2008-10-19 17:41:25 +0100 (Sun, 19 Oct 2008) New Revision: 1237 Modified: trunk/Changes trunk/templates/display_metadata.tt trunk/templates/node.tt Log: Move the node image outside the metadata div, to aid styling (fixes #222). Thanks peregrin. Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-19 15:24:04 UTC (rev 1236) +++ trunk/Changes 2008-10-19 16:41:25 UTC (rev 1237) @@ -14,6 +14,7 @@ Set content charset correctly in RDF (#260) Display geodata ellipsoid to user in edit from (#230) Add an admin navbar, to be displayed if the user requests (#261) + Move the node image outside the metadata div, to aid styling (#222) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/templates/display_metadata.tt =================================================================== --- trunk/templates/display_metadata.tt 2008-10-19 15:24:04 UTC (rev 1236) +++ trunk/templates/display_metadata.tt 2008-10-19 16:41:25 UTC (rev 1237) @@ -4,26 +4,6 @@ OR hours_text OR map_link OR categories.size OR locales.size OR node_image %] <div id="metadata" class="vcard"> -[% IF node_image %] - <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" /> -[% END %]  <span class="fn" style="display:none">[% node_name %]</span> Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2008-10-19 15:24:04 UTC (rev 1236) +++ trunk/templates/node.tt 2008-10-19 16:41:25 UTC (rev 1237) @@ -27,6 +27,27 @@ </script> [% END %] +[% IF node_image %] + <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" /> +[% END %] + <div id="node_title"> [% IF current %] [% IF backlinks_in_title AND is_indexable_node %]

1 0

r1236 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 19 Oct '08

19 Oct '08

Author: dom Date: 2008-10-19 16:24:04 +0100 (Sun, 19 Oct 2008) New Revision: 1236 Added: trunk/templates/navbar_admin.tt Modified: trunk/Build.PL trunk/Changes trunk/MANIFEST trunk/lib/OpenGuides/CGI.pm trunk/lib/OpenGuides/Template.pm trunk/preferences.cgi trunk/t/13_cookies.t trunk/templates/navbar.tt trunk/templates/preferences.tt Log: Add an admin navbar, to be displayed if the user requests (fixes #261) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/Build.PL 2008-10-19 15:24:04 UTC (rev 1236) @@ -362,6 +362,7 @@ "navbar_categories.tt", "navbar_locales.tt", "navbar_help.tt", + "navbar_admin.tt", "navbar_home_link.tt", "navbar_options.tt", "navbar_revision_info.tt", Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/Changes 2008-10-19 15:24:04 UTC (rev 1236) @@ -13,6 +13,7 @@ Change default database type to sqlite (#241) Set content charset correctly in RDF (#260) Display geodata ellipsoid to user in edit from (#230) + Add an admin navbar, to be displayed if the user requests (#261) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/MANIFEST 2008-10-19 15:24:04 UTC (rev 1236) @@ -47,6 +47,7 @@ templates/moderate_confirm.tt templates/moderate_password_wrong.tt templates/navbar.tt +templates/navbar_admin.tt templates/navbar_categories.tt templates/navbar_help.tt templates/navbar_home_link.tt Modified: trunk/lib/OpenGuides/CGI.pm =================================================================== --- trunk/lib/OpenGuides/CGI.pm 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/lib/OpenGuides/CGI.pm 2008-10-19 15:24:04 UTC (rev 1236) @@ -38,7 +38,8 @@ default_edit_type => "tidying", cookie_expires => "never", track_recent_changes_views => 1, - display_google_maps => 1 + display_google_maps => 1, + is_admin => 1 ); my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); @@ -83,7 +84,8 @@ default_edit_type => "tidying", cookie_expires => "never", track_recent_changes_views => 1, - display_google_maps => 1 + display_google_maps => 1, + is_admin => 1 ); Croaks unless an L<OpenGuides::Config> object is supplied as C<config>. @@ -126,7 +128,8 @@ defedit => $args{default_edit_type} || "normal", exp => $args{cookie_expires}, trackrc => $args{track_recent_changes_views} || 0, - gmaps => $args{display_google_maps} || 0 + gmaps => $args{display_google_maps} || 0, + admin => $args{is_admin} || 0 }, -expires => $expires, ); @@ -180,6 +183,7 @@ exp => "cookie_expires", trackrc => "track_recent_changes_views", gmaps => "display_google_maps", + admin => "is_admin", ); my %long_data = map { $long_forms{$_} => $data{$_} } keys %long_forms; @@ -199,6 +203,7 @@ cookie_expires => "month", track_recent_changes_views => 0, display_google_maps => 1, + is_admin => 0, ); my %return; foreach my $key ( keys %data ) { Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/lib/OpenGuides/Template.pm 2008-10-19 15:24:04 UTC (rev 1236) @@ -155,6 +155,10 @@ ) { $enable_page_deletion = 1; } + my $is_admin = 0; + if ( $cookie_data{is_admin} ) { + $is_admin = 1; + } my $tt_vars = { config => $config, @@ -169,6 +173,7 @@ home_name => $config->home_name, navbar_on_home_page => $config->navbar_on_home_page, omit_help_links => $omit_help_links, + is_admin => $is_admin, formatting_rules_link => $formatting_rules_link, formatting_rules_node => $formatting_rules_node, openguides_version => $OpenGuides::VERSION, Modified: trunk/preferences.cgi =================================================================== --- trunk/preferences.cgi 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/preferences.cgi 2008-10-19 15:24:04 UTC (rev 1236) @@ -45,6 +45,7 @@ cookies => \@cookies, vars => { not_editable => 1, + not_deletable => 1, } ); } @@ -55,8 +56,9 @@ config => $config, template => "preferences.tt", vars => { - not_editable => 1, - show_form => 1 + not_editable => 1, + show_form => 1, + not_deletable => 1, } ); } Modified: trunk/t/13_cookies.t =================================================================== --- trunk/t/13_cookies.t 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/t/13_cookies.t 2008-10-19 15:24:04 UTC (rev 1236) @@ -3,7 +3,7 @@ use OpenGuides::CGI; use Time::Piece; use Time::Seconds; -use Test::More tests => 27; +use Test::More tests => 29; eval { OpenGuides::CGI->make_prefs_cookie; }; ok( $@, "->make_prefs_cookie dies if no config object supplied" ); @@ -30,6 +30,7 @@ cookie_expires => "never", track_recent_changes_views => "rc_pref", display_google_maps => "gm_pref", + is_admin => "admin_pref", ); isa_ok( $cookie, "CGI::Cookie", "->make_prefs_cookie returns a cookie" ); @@ -68,7 +69,8 @@ "...and recent changes tracking" ); is( $prefs{display_google_maps}, "gm_pref", "...and Google Maps display preference" ); - +is( $prefs{is_admin}, "admin_pref", + "...and admin preference" ); # Now make sure that true/false preferences are taken account of when # they're false. $cookie = OpenGuides::CGI->make_prefs_cookie( @@ -80,6 +82,7 @@ show_minor_edits_in_rc => 0, track_recent_changes_views => 0, display_google_maps => 0, + is_admin => 0, ); $ENV{HTTP_COOKIE} = $cookie; @@ -92,9 +95,10 @@ ok( !$prefs{show_minor_edits_in_rc}, "...and minor edits prefs" ); ok( !$prefs{track_recent_changes_views}, "...and recent changes prefs" ); ok( !$prefs{display_google_maps}, "...and Google Maps prefs" ); +ok( !$prefs{is_admin}, "...and admin prefs" ); # 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, 10, "...and returns ten default values" ); +is( keys %prefs, 11, "...and returns ten default values" ); Modified: trunk/templates/navbar.tt =================================================================== --- trunk/templates/navbar.tt 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/templates/navbar.tt 2008-10-19 15:24:04 UTC (rev 1236) @@ -4,6 +4,7 @@ [% INCLUDE navbar_home_link.tt %] [% INCLUDE navbar_tools.tt %] [% INCLUDE navbar_help.tt %] + [% INCLUDE navbar_admin.tt %] [% INCLUDE navbar_options.tt %] [% INCLUDE navbar_search.tt %] [% INCLUDE navbar_this_page.tt %] Added: trunk/templates/navbar_admin.tt =================================================================== --- trunk/templates/navbar_admin.tt (rev 0) +++ trunk/templates/navbar_admin.tt 2008-10-19 15:24:04 UTC (rev 1236) @@ -0,0 +1,12 @@ +[% IF is_admin %] + <div id="navbar_admin"> + <div class="navbar_group_title">Admin:</div> + <ul> + <li><a href="[% full_cgi_url %]?action=admin">Site Administration</a></li> + <li><a href="[% full_cgi_url %]?action=show_needing_moderation">Pages needing moderation</a></li> +[% IF enable_page_deletion AND NOT not_deletable %] + <li><a href="[% full_cgi_url %]?id=[% node_param %];action=delete">Delete page</a></li>[% END %] + </ul> +</div> +[% END %] + Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2008-10-19 14:58:02 UTC (rev 1235) +++ trunk/templates/preferences.tt 2008-10-19 15:24:04 UTC (rev 1236) @@ -58,6 +58,15 @@ </p> <p> + [% IF prefs.is_admin %] + <input type="checkbox" id="is_admin" name="is_admin" value="1" checked /> + [% ELSE %] + <input type="checkbox" id="is_admin" name="is_admin" value="1" /> + [% END %] + <label for="show_minor">Show admin related links</label> + </p> + + <p> [% IF prefs.track_recent_changes_views %] <input type="checkbox" id="track_recent_changes_views" name="track_recent_changes_views" value="1" checked="1" /> [% ELSE %] @@ -144,6 +153,10 @@ be included in navbar. </p> + <p>Admin links will + [% UNLESS prefs.is_admin %] not [% END %] + be included in navbar. + </p> <p>Minor edits [% UNLESS show_minor_edits_in_rc %] not [% END %] included in Recent Changes.</p>

1 0

r1235 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 19 Oct '08

19 Oct '08

Author: dom Date: 2008-10-19 15:58:02 +0100 (Sun, 19 Oct 2008) New Revision: 1235 Modified: trunk/Changes trunk/lib/OpenGuides/Template.pm trunk/t/27_geo_data_edit_form.t Log: Display geodata ellipsoid to user in edit from (fixes #230) Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-19 14:15:15 UTC (rev 1234) +++ trunk/Changes 2008-10-19 14:58:02 UTC (rev 1235) @@ -12,6 +12,7 @@ and truncate URLs that are too long (#21) Change default database type to sqlite (#241) Set content charset correctly in RDF (#260) + Display geodata ellipsoid to user in edit from (#230) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2008-10-19 14:15:15 UTC (rev 1234) +++ trunk/lib/OpenGuides/Template.pm 2008-10-19 14:58:02 UTC (rev 1235) @@ -423,13 +423,15 @@ coord_field_2_value => $metadata{osie_y}[0], ); } else { + my $lat_text = "Latitude (" . $config->ellipsoid . " decimal)"; + my $long_text = "Longitude (" . $config->ellipsoid . " decimal)"; %vars = ( %vars, coord_field_1 => "latitude", coord_field_2 => "longitude", dist_field => "latlong_dist", - coord_field_1_name => "Latitude (decimal)", - coord_field_2_name => "Longitude (decimal)", + coord_field_1_name => $lat_text, + coord_field_2_name => $long_text, coord_field_1_value => $metadata{latitude}[0], coord_field_2_value => $metadata{longitude}[0], ); Modified: trunk/t/27_geo_data_edit_form.t =================================================================== --- trunk/t/27_geo_data_edit_form.t 2008-10-19 14:15:15 UTC (rev 1234) +++ trunk/t/27_geo_data_edit_form.t 2008-10-19 14:58:02 UTC (rev 1235) @@ -162,7 +162,7 @@ Test::HTML::Content::tag_ok( $output, "input", { name => "longitude", value => -0.118 }, "...with correct value..." ); -like( $output, qr|Latitude $decimal$:|s, - "...'Latitude (decimal):' label included" ); -like( $output, qr|Longitude $decimal$:|s, - "...'Longitude (decimal):' label included" ); +like( $output, qr|Latitude $Airy decimal$:|s, + "...'Latitude (Airy decimal):' label included" ); +like( $output, qr|Longitude $Airy decimal$:|s, + "...'Longitude (Airy decimal):' label included" );

1 0

r1234 - trunk
by svnadmin＠urchin.earth.li 19 Oct '08

19 Oct '08

Author: dom Date: 2008-10-19 15:15:15 +0100 (Sun, 19 Oct 2008) New Revision: 1234 Modified: trunk/Build.PL Log: update dependency on Wiki::Toolkit for new metadata list stuff Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-19 13:06:48 UTC (rev 1233) +++ trunk/Build.PL 2008-10-19 14:15:15 UTC (rev 1234) @@ -282,7 +282,7 @@ 'CGI' => '2.92', # avoid escapeHTML bug 'CGI::Carp' => 0, 'CGI::Cookie' => 0, - 'Wiki::Toolkit' => '0.74', # for dbport + 'Wiki::Toolkit' => '0.77', 'Wiki::Toolkit::Feed::Atom' => 0, 'Wiki::Toolkit::Feed::RSS' => 0, 'Wiki::Toolkit::Formatter::UseMod' => 0,

1 0

r1233 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 19 Oct '08

19 Oct '08

Author: dom Date: 2008-10-19 14:06:48 +0100 (Sun, 19 Oct 2008) New Revision: 1233 Modified: trunk/Changes trunk/lib/OpenGuides/Config.pm Log: change default database type to sqlite (#241) Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-19 12:58:16 UTC (rev 1232) +++ trunk/Changes 2008-10-19 13:06:48 UTC (rev 1233) @@ -10,6 +10,7 @@ JSON support for node details and metatdata discovery Correctly validate web site URLs during edit and display, and truncate URLs that are too long (#21) + Change default database type to sqlite (#241) Set content charset correctly in RDF (#260) 0.63 16 August 2008 Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2008-10-19 12:58:16 UTC (rev 1232) +++ trunk/lib/OpenGuides/Config.pm 2008-10-19 13:06:48 UTC (rev 1233) @@ -73,7 +73,7 @@ # Here are the defaults for the variable values. # Don't forget to add to INSTALL when changing these. my %defaults = ( - dbtype => "postgres", + dbtype => "sqlite", script_name => "wiki.cgi", install_directory => "/usr/lib/cgi-bin/openguides/", use_plucene => 1,

1 0

r1232 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 19 Oct '08

19 Oct '08

Author: dom Date: 2008-10-19 13:58:16 +0100 (Sun, 19 Oct 2008) New Revision: 1232 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt trunk/templates/rdf_index.tt Log: Fix RDF encoding (fixes #260); thanks Inigo Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-18 18:19:22 UTC (rev 1231) +++ trunk/Changes 2008-10-19 12:58:16 UTC (rev 1232) @@ -10,6 +10,7 @@ JSON support for node details and metatdata discovery Correctly validate web site URLs during edit and display, and truncate URLs that are too long (#21) + Set content charset correctly in RDF (#260) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2008-10-18 18:19:22 UTC (rev 1231) +++ trunk/lib/OpenGuides/RDF.pm 2008-10-19 12:58:16 UTC (rev 1232) @@ -74,6 +74,7 @@ site_name => $self->{site_name}, site_desc => $self->{site_description}, og_version => $self->{og_version}, + config => $config, ); my %defaults = ( Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2008-10-18 18:19:22 UTC (rev 1231) +++ trunk/t/21_rdf.t 2008-10-19 12:58:16 UTC (rev 1232) @@ -15,7 +15,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 29; +plan tests => 30; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; @@ -80,7 +80,11 @@ my $rdfxml = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms" ); -like( $rdfxml, qr|<\?xml version="1.0"\?>|, "RDF is encoding-neutral" ); +like( $rdfxml, qr|<\?xml version="1.0" \?>|, "RDF uses no encoding when none set" ); +$config->http_charset( "UTF-8" ); +$guide = OpenGuides->new( config => $config ); +$rdfxml = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms" ); +like( $rdfxml, qr|<\?xml version="1.0" encoding="UTF-8"\?>|, "RDF uses declared encoding" ); like( $rdfxml, qr|<foaf:depiction rdf:resource="http://example.com/calthorpe.jpg" />|, "Node image"); Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2008-10-18 18:19:22 UTC (rev 1231) +++ trunk/templates/node_rdf.tt 2008-10-19 12:58:16 UTC (rev 1232) @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" [%- IF config.http_charset %]encoding="[% config.http_charset %]"[%- END %]?> <rdf:RDF xmlns:dc = "http://purl.org/dc/elements/1.1/" xmlns:dcterms = "http://purl.org/dc/terms/" Modified: trunk/templates/rdf_index.tt =================================================================== --- trunk/templates/rdf_index.tt 2008-10-18 18:19:22 UTC (rev 1231) +++ trunk/templates/rdf_index.tt 2008-10-19 12:58:16 UTC (rev 1232) @@ -1,5 +1,5 @@ [%- USE CGI -%] -<?xml version="1.0"?> +<?xml version="1.0" [%- IF config.http_charset %]encoding="[% config.http_charset %]"[%- END %]?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"

1 0

r1231 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 18 Oct '08

18 Oct '08

Author: dom Date: 2008-10-18 19:19:22 +0100 (Sat, 18 Oct 2008) New Revision: 1231 Modified: trunk/Build.PL trunk/Changes trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/Template.pm trunk/lib/OpenGuides/Utils.pm trunk/t/21_rdf.t trunk/t/68_bug_website_displayed.t Log: Correctly validate web site URLs during edit and display, and truncate URLs that are too long (fixes #21) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-18 15:35:27 UTC (rev 1230) +++ trunk/Build.PL 2008-10-18 18:19:22 UTC (rev 1231) @@ -266,10 +266,6 @@ } close FILE or die "Can't close wiki.conf: $!"; -##### -##### When updating the prereqs PLEASE REMEMBER to update PREREQUISITES. -##### - # We currently only support Plucene for new installs, but may support # others in future my $search_module = $use_plucene ? "Plucene" : "Search::InvertedIndex"; @@ -313,6 +309,7 @@ 'Time::Piece' => 0, 'URI::Escape' => 0, 'XML::RSS' => 0, + 'Data::Validate::URI' => 0, }, build_requires => { 'Module::Build' => '0.26', # API change for accessing config data @@ -321,8 +318,8 @@ 'Data::Dumper' => 0, }, recommends => { - 'DBD::SQLite' => 0, # for testing - 'Test::HTML::Content' => 0, # for testing, oddly enough + 'DBD::SQLite' => 0, # for testing + 'Test::HTML::Content' => 0, # for testing, oddly enough 'Wiki::Toolkit::Plugin::Ping' => 0, # for pinging external services 'Geo::HelmertTransform' => 0, # for correct WGS84 lat/long # when using grid systems Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-18 15:35:27 UTC (rev 1230) +++ trunk/Changes 2008-10-18 18:19:22 UTC (rev 1231) @@ -8,6 +8,8 @@ Fix some broken POD (#246) Metadata discovery features (action=metadata) JSON support for node details and metatdata discovery + Correctly validate web site URLs during edit and display, + and truncate URLs that are too long (#21) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2008-10-18 15:35:27 UTC (rev 1230) +++ trunk/lib/OpenGuides/Config.pm 2008-10-18 18:19:22 UTC (rev 1231) @@ -25,7 +25,7 @@ licence_name licence_url licence_info_url moderation_requires_password enable_node_image enable_common_categories enable_common_locales spam_detector_module host_checker_module static_path static_url - send_moderation_notifications + send_moderation_notifications website_link_max_chars ); my @questions = map { $_ . "__qu" } @variables; OpenGuides::Config->mk_accessors( @variables ); @@ -114,7 +114,8 @@ spam_detector_module => "", host_checker_module => "", static_path => "/usr/local/share/openguides/static", - send_moderation_notifications => 1 + send_moderation_notifications => 1, + website_link_max_chars => 20, ); # See if we already have some config variables set. @@ -199,7 +200,8 @@ host_checker_module => "What module would you like to use to run an IP blacklist? (optional)", static_path => "What directory should we install static content (CSS, images, javascript) to?", static_url => "What is the URL corresponding to the static content?", - send_moderation_notifications => "Should we send email notifications when a moderated node is edited?" + send_moderation_notifications => "Should we send email notifications when a moderated node is edited?", + website_link_max_chars => "How many characters of the URL of node websites should be displayed?", ); foreach my $var ( keys %questions ) { @@ -334,6 +336,8 @@ =item * send_moderation_notifications +=item * website_link_max_chars (default: C<20>) + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2008-10-18 15:35:27 UTC (rev 1230) +++ trunk/lib/OpenGuides/Template.pm 2008-10-18 18:19:22 UTC (rev 1231) @@ -12,6 +12,7 @@ use OpenGuides::CGI; use Template; use URI::Escape; +use Data::Validate::URI qw( is_web_uri ); =head1 NAME @@ -347,16 +348,15 @@ }; } @loclist; - # The 'website' attribute might contain a URL so we wiki-format it here - # rather than just CGI::escapeHTMLing it all in the template. my $website = $args{metadata} ? $metadata{website}[0] : $q->param("website"); my $formatted_website_text = ""; - if ( $website && $website ne "http://" ) { - $formatted_website_text = $class->format_website_text( - formatter => $formatter, - text => $website - ); + if ( $website && $website ne "http://" && is_web_uri( $website ) ) { + my $trunc_website = substr( $website, 0, $config->website_link_max_chars ); + unless ($website eq $trunc_website ) { + $trunc_website .= '...'; + } + $formatted_website_text = '<a href="' . $website . '">' . $trunc_website . '</a>'; } my $hours_text = $args{metadata} ? $metadata{opening_hours_text}[0] @@ -582,20 +582,6 @@ return %vars; } -sub format_website_text { - my ($class, %args) = @_; - my ($formatter, $text) = @args{ qw( formatter text ) }; - my $formatted = $formatter->format($text); - - # Strip out paragraph markers put in by formatter since we want this - # to be a single string to put in a <ul>. - $formatted =~ s/<p>//g; - $formatted =~ s/<\/p>//g; - - return $formatted; -} - - =back =head1 AUTHOR @@ -604,7 +590,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2007 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2008 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/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2008-10-18 15:35:27 UTC (rev 1230) +++ trunk/lib/OpenGuides/Utils.pm 2008-10-18 18:19:22 UTC (rev 1231) @@ -10,6 +10,7 @@ use Wiki::Toolkit::Plugin::RSS::Reader; use URI::Escape; use MIME::Lite; +use Data::Validate::URI qw( is_web_uri ); =head1 NAME @@ -376,7 +377,6 @@ return \@fails if @fails; # Now do our real validation - # Numeric tests foreach my $var (qw(os_x os_y)) { if ($q->param($var) and $q->param($var) !~ /^-?\d+$/) { push @fails, "$var must be integer, was: " . $q->param($var); @@ -389,6 +389,12 @@ } } + if ( $q->param('website') and $q->param('website') ne 'http://' ) { + unless ( is_web_uri( $q->param('website') ) ) { + push @fails, $q->param('website') . ' is not a valid web URI'; + } + } + return \@fails; }; Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2008-10-18 15:35:27 UTC (rev 1230) +++ trunk/t/21_rdf.t 2008-10-18 18:19:22 UTC (rev 1231) @@ -54,7 +54,7 @@ postcode => "WC1X 8JR", locales => "Bloomsbury\r\nSt Pancras", phone => "test phone number", - website => "test website", + website => "http://example.com", hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", @@ -70,7 +70,7 @@ postcode => "WC1X 8JR", locales => "Bloomsbury\r\nSt Pancras", phone => "test phone number", - website => "test website", + website => "http://example.com", hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", @@ -95,7 +95,7 @@ like( $rdfxml, qr|<dc:available>test hours</dc:available>|, "picks up opening hours text" ); -like( $rdfxml, qr|<foaf:homepage rdf:resource="test website" />|, "picks up website" ); +like( $rdfxml, qr|<foaf:homepage rdf:resource="http://example.com" />|, "picks up website" ); like( $rdfxml, qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, Modified: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2008-10-18 15:35:27 UTC (rev 1230) +++ trunk/t/68_bug_website_displayed.t 2008-10-18 18:19:22 UTC (rev 1231) @@ -10,18 +10,25 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 1; +plan tests => 2; Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); Wiki::Toolkit::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"; +$guide->wiki->write_node( "South Croydon Station", "A sleepy main-line station in what is arguably the nicest part of Croydon.", undef, { website => "http://example.com/" } ) or die "Couldn't write node"; +$guide->wiki->write_node( "North Croydon Station", "A busy main-line station in what is arguably the furthest North part of Croydon.", undef, { website => "http://longer.example.com/asdfasdf" } ) or die "Couldn't write node"; my $output = $guide->display_node( id => "South Croydon Station", return_output => 1, ); -like( $output, qr#Website:</span> <span class="url"><a href="http://www.example.com/">http://www.example.com/</a>#, "website correctly displayed" ); +like( $output, qr#Website:</span> <span class="url"><a href="http://example.com/">http://example.com/</a>#, "website correctly displayed" ); +$output = $guide->display_node( + id => "North Croydon Station", + return_output => 1, + ); + +like( $output, qr#Website:</span> <span class="url"><a href="http://longer.example.com/asdfasdf">http://longer.exampl...</a>#, "website correctly truncated" );

1 0

r1230 - trunk
by svnadmin＠urchin.earth.li 18 Oct '08

18 Oct '08

Author: dom Date: 2008-10-18 16:35:27 +0100 (Sat, 18 Oct 2008) New Revision: 1230 Removed: trunk/PREREQUISITES Modified: trunk/MANIFEST Log: delete this file; it's always going to be out of date and gives us no more information than META.yml Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2008-10-18 15:34:04 UTC (rev 1229) +++ trunk/MANIFEST 2008-10-18 15:35:27 UTC (rev 1230) @@ -5,7 +5,6 @@ MANIFEST Makefile.PL META.yml -PREREQUISITES README README.CSS README.GMAPS Deleted: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2008-10-18 15:34:04 UTC (rev 1229) +++ trunk/PREREQUISITES 2008-10-18 15:35:27 UTC (rev 1230) @@ -1,51 +0,0 @@ -Modules required by OpenGuides 0.59 -=================================== - -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 -CGI::Cookie -Wiki::Toolkit (version 0.74 or later) -Wiki::Toolkit::Feed::Atom -Wiki::Toolkit::Feed::RSS -Wiki::Toolkit::Formatter::UseMod -Wiki::Toolkit::Plugin::Categoriser -Wiki::Toolkit::Plugin::Diff -Wiki::Toolkit::Plugin::Locator::Grid -Wiki::Toolkit::Plugin::RSS::Reader -Class::Accessor -Config::Tiny -Data::Dumper -( - DBD::Pg - -- or -- - DBD::mysql - -- or -- - DBD::SQLite -) -File::Spec::Functions -File::Temp -( - Geography::NationalGrid::GB - -- or -- - Geography::NationalGrid::IE - -- or -- - Geo::Coordinates::UTM -) -HTML::Entities -LWP::Simple -MIME::Lite -Module::Build (version 0.26 or later) -Parse::RecDescent -Plucene -POSIX -Template -Time::Piece -URI::Escape -XML::RSS - -Optional prerequisites (OpenGuides will work without these, but not -all functionality will be available) -Wiki::Toolkit::Plugin::Ping -Geo::HelmertTransform

1 0

r1229 - trunk/templates
by svnadmin＠urchin.earth.li 18 Oct '08

18 Oct '08

Author: nick Date: 2008-10-18 16:34:04 +0100 (Sat, 18 Oct 2008) New Revision: 1229 Modified: trunk/templates/edit_form.tt Log: Make a start on JS to help you pick locales and categories, but not quite finished yet Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2008-10-18 14:51:09 UTC (rev 1228) +++ trunk/templates/edit_form.tt 2008-10-18 15:34:04 UTC (rev 1229) @@ -94,6 +94,7 @@ Current locales: [% ELSE %] Locales (one per line): + <span id="pick_locale"></span> [% END %] </label> <div class="edit_box"> @@ -118,6 +119,7 @@ Current categories: [% ELSE %] Categories (one per line): + <span id="pick_category"></span> [% END %] </label> <div class="edit_box"> @@ -136,6 +138,42 @@ [% END %] </div> + <script type="text/javascript"> + function pick(metadata_type, textbox_id) { + var textbox = document.getElementById(textbox_id); + + // For adding the new metadata to the textarea + var add_md = function(picked) { + var last = textbox.value.substring(textbox.value.length - 1); + if(last == "\r" || last == "\n") { + // Already has new line + } else { + textbox.value = textbox.value + "\r\n"; + } + + textbox.value = textbox.value + picked; + }; + + // Fetch the data + $.getJSON("[% cgi_url %]?action=metadata;format=json;type=" + metadata_type, function(data) { +// alert(data[metadata_type][0]); +// add_md(data[metadata_type][1]); + }); + } + + function pick_locale() { + pick("locale", "locales"); + } + function pick_category() { + pick("category", "categories"); + } + + $(document).ready(function() { + $("#pick_locale").html("<a href='javascript:pick_locale()'>pick Locale</a>"); + $("#pick_category").html("<a href='javascript:pick_category()'>pick Category</a>"); + }); + </script> + <div class="edit_form_group" id="summary_group"> [% IF conflict %] <label for="summary_input">Current summary:</label>

1 0

r1228 - in trunk: . lib templates
by svnadmin＠urchin.earth.li 18 Oct '08

18 Oct '08

Author: nick Date: 2008-10-18 15:51:09 +0100 (Sat, 18 Oct 2008) New Revision: 1228 Added: trunk/templates/metadata.tt Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/templates/node.tt Log: Finish off the metadata discovery things Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-18 14:37:04 UTC (rev 1227) +++ trunk/Changes 2008-10-18 14:51:09 UTC (rev 1228) @@ -6,6 +6,8 @@ 0.64 Correctly specify all build_requires (#245) Fix some broken POD (#246) + Metadata discovery features (action=metadata) + JSON support for node details and metatdata discovery 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2008-10-18 14:37:04 UTC (rev 1227) +++ trunk/lib/OpenGuides.pm 2008-10-18 14:51:09 UTC (rev 1228) @@ -1023,15 +1023,18 @@ my @values; my $type; - if($args{"type"}) { + my $may_descend = 0; + if($args{"type"} && $args{"type"} ne "metadata_type") { $type = $args{"type"}; @values = $wiki->store->list_metadata_by_type($args{"type"}); } else { + $may_descend = 1; $type = "metadata_type"; @values = $wiki->store->list_metadata_names; } my %tt_vars = ( type => $type, + may_descend => $may_descend, metadata => \@values, num_results => scalar @values, not_deletable => 1, Added: trunk/templates/metadata.tt =================================================================== --- trunk/templates/metadata.tt (rev 0) +++ trunk/templates/metadata.tt 2008-10-18 14:51:09 UTC (rev 1228) @@ -0,0 +1,24 @@ +[% INCLUDE header.tt + page_title = "Metadata of type $type - $site_name" + feed_base = "$cgi_url?action=metadata;type=$type" +%] +[% INCLUDE banner.tt %] +<div id="content"> +[% INCLUDE navbar.tt %] +<div id="maincontent"> +<h2>Metadata Listing - Things of type [% type %]</h2> +<ol> + [% FOREACH md = metadata %] + <li> + [% IF may_descend %]<a href="[% cgi_url %]?action=metadata;type=[% md %]">[% END %][% md %][% IF may_descend %]</a>[% END %] + </li> + [% END %] +</ol> +</div> + +<p> + This list is available as + <a href="[% cgi_url %]?action=metadata;type=[% type %];format=json">json</a>. +</p> + +[% INCLUDE footer.tt %] Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2008-10-18 14:37:04 UTC (rev 1227) +++ trunk/templates/node.tt 2008-10-18 14:51:09 UTC (rev 1228) @@ -123,6 +123,8 @@ <div id="rdf_link"> <a href="[% cgi_url %]?id=[% node_param %];format=rdf">RDF/XML for this node</a> + <a href="[% cgi_url %]?id=[% node_param %];format=json">JSON for this + node</a> [% IF rss_locale_url %] / <a href="[% rss_locale_url %]">RSS feed for this locale</a> [% END %]

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits October 2008