openguides-commits April 2012

openguides-commits@lists.openguides.org

1 participants
55 discussions

r1351 - in trunk: lib t templates
by svnadmin＠urchin.earth.li 18 Apr '12

18 Apr '12

Author: kake Date: 2012-04-18 12:23:28 +0100 (Wed, 18 Apr 2012) New Revision: 1351 Modified: trunk/lib/OpenGuides.pm trunk/t/53_show_index.t trunk/templates/site_index.tt Log: Move feed_base construction from site_index.tt into OpenGuides.pm so map_index_leaflet.tt can take advantage of it too. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-04-18 11:05:13 UTC (rev 1350) +++ trunk/lib/OpenGuides.pm 2012-04-18 11:23:28 UTC (rev 1351) @@ -974,6 +974,16 @@ $tt_vars{criteria} = \@criteria; $tt_vars{not_editable} = 1; } + my $feed_base = $self->config->script_url + . $self->config->script_name . "?action=index"; + foreach my $criterion ( @criteria ) { + if ( $criterion->{type} eq "category" ) { + $feed_base .= ";cat=" . lc( $criterion->{value} ); + } elsif ( $criterion->{type} eq "locale" ) { + $feed_base .= ";loc=" . lc( $criterion->{value} ); + } + } + $tt_vars{feed_base} = $feed_base; } my @nodes = map { Modified: trunk/t/53_show_index.t =================================================================== --- trunk/t/53_show_index.t 2012-04-18 11:05:13 UTC (rev 1350) +++ trunk/t/53_show_index.t 2012-04-18 11:23:28 UTC (rev 1351) @@ -11,7 +11,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 40; +plan tests => 42; # Clear out the database from any previous runs. OpenGuides::Test::refresh_db(); @@ -172,6 +172,7 @@ $output = eval { $guide->show_index( return_output => 1, + loc => "assam", format => "map", ); }; @@ -181,4 +182,12 @@ "...map output gets content-type of text/html" ); unlike( $output, qr|new GMap|, "...no invocation of GMap constructor" ); unlike ( $output, qr|new GPoint|, "...nor GPoint" ); + + # Test links in the header (only implemented for Leaflet). + like( $output, + qr|<link rel="alternate[^>]*action=index;loc=assam;format=rss|, + "RSS link correct in header" ); + like( $output, + qr|<link rel="alternate[^>]*action=index;loc=assam;format=atom|, + "Atom link correct in header" ); } Modified: trunk/templates/site_index.tt =================================================================== --- trunk/templates/site_index.tt 2012-04-18 11:05:13 UTC (rev 1350) +++ trunk/templates/site_index.tt 2012-04-18 11:23:28 UTC (rev 1351) @@ -1,17 +1,6 @@ -[% my_feed_base = cgi_url _ '?action=index' %] - -[% FOREACH criterion = criteria %] - [% IF criterion.type == 'category' %] - [% my_feed_base = my_feed_base _ ';cat=' _ criterion.value.lower %] - [% ELSIF criterion.type == 'locale' %] - [% my_feed_base = my_feed_base _ ';loc=' _ criterion.value.lower %] - [% END %] -[% END %] - [% IF criteria %] [% INCLUDE header.tt page_title = "Index of $criteria_title - $site_name" - feed_base = my_feed_base %] [% ELSE %] [% INCLUDE header.tt page_title = "Things within $limit of $origin - $site_name" %] @@ -43,14 +32,13 @@ </div> <div id="site_index_feeds"> - [%# my_feed_base is set at the top of this file %] <p> This list is available as - <a href="[% my_feed_base %];format=rdf">rdf</a>, + <a href="[% feed_base %];format=rdf">rdf</a>, or as a - <a href="[% my_feed_base %];format=rss">rss feed</a>, + <a href="[% feed_base %];format=rss">rss feed</a>, or as an - <a href="[% my_feed_base %];format=atom">atom feed</a>. + <a href="[% feed_base %];format=atom">atom feed</a>. </p> </div>

1 0

r1350 - in trunk: . t templates
by svnadmin＠urchin.earth.li 18 Apr '12

18 Apr '12

Author: kake Date: 2012-04-18 12:05:13 +0100 (Wed, 18 Apr 2012) New Revision: 1350 Added: trunk/templates/json_index.tt Modified: trunk/Build.PL trunk/Changes trunk/MANIFEST trunk/t/95_multiple_index.t Log: Fixed the JSON output for action=index Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2012-04-17 22:01:28 UTC (rev 1349) +++ trunk/Build.PL 2012-04-18 11:05:13 UTC (rev 1350) @@ -314,12 +314,14 @@ 'File::Spec::Functions' => 0, 'File::Temp' => 0, 'HTML::Entities' => 0, + 'JSON' => 0, # W::T::P::JSON uses anyway 'LWP::Simple' => 0, 'MIME::Lite' => 0, 'Parse::RecDescent' => 0, $search_module => 0, 'POSIX' => 0, 'Template' => '2.24', # for .lower vmethod + 'Template::Plugin::JSON' => 0, 'Time::Piece' => 0, 'URI::Escape' => 0, 'XML::RSS' => 0, @@ -386,6 +388,7 @@ "delete_password_wrong.tt", "differences.tt", "display_metadata.tt", + "json_index.tt", "metadata.tt", "edit_form.tt", "edit_form_actions.tt", Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-04-17 22:01:28 UTC (rev 1349) +++ trunk/Changes 2012-04-18 11:05:13 UTC (rev 1350) @@ -22,6 +22,8 @@ will automatically redirect to new-style ones. Added project metadata to Build.PL (#285). Added a basic stylesheet, installed into the static_path directory. + Fixed the JSON output for action=index (using a new dependency on + Template::Plugin::JSON). 0.66 12 April 2012 All templates now have access to the "username" TT variable. Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-04-17 22:01:28 UTC (rev 1349) +++ trunk/MANIFEST 2012-04-18 11:05:13 UTC (rev 1350) @@ -45,6 +45,7 @@ templates/error.tt templates/footer.tt templates/header.tt +templates/json_index.tt templates/home_node.tt templates/map_index.tt templates/map_index_leaflet.tt Modified: trunk/t/95_multiple_index.t =================================================================== --- trunk/t/95_multiple_index.t 2012-04-17 22:01:28 UTC (rev 1349) +++ trunk/t/95_multiple_index.t 2012-04-18 11:05:13 UTC (rev 1350) @@ -1,4 +1,5 @@ use strict; +use JSON; use OpenGuides; use OpenGuides::CGI; use OpenGuides::Test; @@ -16,7 +17,7 @@ plan skip_all => "Test::HTML::Content not available."; } -plan tests => 15; +plan tests => 18; my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); @@ -105,3 +106,16 @@ qr|<dc:title>Category Pubs and Locale Waddon</dc:title>|, "Page title is correct on RDF version." ); +# Test the JSON version. +$output = $guide->show_index( cat => "pubs", loc => "waddon", format => "json", + return_output => 1 ); +unlike( $output, qr/error/i, "JSON format invocation doesn't cause error." ); + +# Need to strip out the Content-Type: header or the decoder gets confused. +$output =~ s/^Content-Type:.*\n//s; +my $parsed = eval { + local $SIG{__WARN__} = sub { die $_[0]; }; + decode_json( $output ); +}; +ok( !$@, "...and its output looks like JSON." ); +is( scalar @$parsed, 1, "...and has the right number of nodes." ); Added: trunk/templates/json_index.tt =================================================================== --- trunk/templates/json_index.tt (rev 0) +++ trunk/templates/json_index.tt 2012-04-18 11:05:13 UTC (rev 1350) @@ -0,0 +1 @@ +[% USE JSON %][% nodes.json %] \ No newline at end of file

1 0

r1349 - trunk
by svnadmin＠urchin.earth.li 17 Apr '12

17 Apr '12

Author: bob Date: 2012-04-17 23:01:28 +0100 (Tue, 17 Apr 2012) New Revision: 1349 Modified: trunk/MANIFEST Log: added test files to MANIFEST. added css file to MANIFEST Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-04-17 12:50:46 UTC (rev 1348) +++ trunk/MANIFEST 2012-04-17 22:01:28 UTC (rev 1349) @@ -28,7 +28,7 @@ preferences.cgi search.cgi static/map-leaflet.js -static/openguides-base.js +static/openguides-base.css templates/admin_home.tt templates/admin_revert_user.tt templates/autocreate_content.tt @@ -159,6 +159,8 @@ t/84_navbar_admin.t t/85_universal_edit_link.t t/86_recent_changes.t +t/87_more_recent_changes.t +t/88_recent_changes_overtime.t t/90_css_category_locale_classes.t t/91_username_in_templates.t t/92_node_name_from_cgi_obj.t

1 0

r1348 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 17 Apr '12

17 Apr '12

Author: kake Date: 2012-04-17 13:50:46 +0100 (Tue, 17 Apr 2012) New Revision: 1348 Added: trunk/t/82_stylesheet.t Modified: trunk/INSTALL trunk/MANIFEST trunk/lib/OpenGuides/Config.pm trunk/templates/header.tt Log: Use the basic OpenGuides stylesheet if they don't supply a URL in their wiki.conf Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-04-17 12:30:02 UTC (rev 1347) +++ trunk/INSTALL 2012-04-17 12:50:46 UTC (rev 1348) @@ -137,11 +137,13 @@ *** USE WITH CAUTION. DELETED PAGES CANNOT BE RECOVERED. *** - "What's the URL of the site's stylesheet?" + "What's the URL of the site's stylesheet? If you don't enter one here, + the basic OpenGuides stylesheet will be used instead. -Supplying an answer to this question is optional. There are example -stylesheets in the examples/ directory - note that these will not be -automatically installed. +Supplying an answer to this question is optional. If you do not supply +your own stylesheet, your guide will use the basic OpenGuides stylesheet +instead (this is automatically installed in your static content directory +regardless of your answer to the present question). "What's the wiki called?" Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-04-17 12:30:02 UTC (rev 1347) +++ trunk/MANIFEST 2012-04-17 12:50:46 UTC (rev 1348) @@ -154,6 +154,7 @@ t/78_about.t t/79_host_blacklist.t t/81_node_moderate_whitelist.t +t/82_stylesheet.t t/83_show_delete_to_admins_only.t t/84_navbar_admin.t t/85_universal_edit_link.t Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2012-04-17 12:30:02 UTC (rev 1347) +++ trunk/lib/OpenGuides/Config.pm 2012-04-17 12:50:46 UTC (rev 1348) @@ -167,7 +167,7 @@ enable_page_deletion => "Do you want to enable page deletion?", moderation_requires_password => "Is the admin password required for moderating pages?", admin_pass => "Please specify a password for the site admin.", - stylesheet_url => "What's the URL of the site's stylesheet?", + stylesheet_url => "What's the URL of the site's stylesheet? If you don't enter one here, the basic OpenGuides stylesheet will be used instead.", enable_node_image => "Should nodes be allowed to have an externally hosted image?", enable_common_categories => "Do you want a common list of categories shown on all node pages?", enable_common_locales => "Do you want a common list of locales shown on all node pages?", Added: trunk/t/82_stylesheet.t =================================================================== --- trunk/t/82_stylesheet.t (rev 0) +++ trunk/t/82_stylesheet.t 2012-04-17 12:50:46 UTC (rev 1348) @@ -0,0 +1,48 @@ +use strict; +use OpenGuides; +use OpenGuides::CGI; +use OpenGuides::Test; +use Test::More; + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => + "DBD::SQLite could not be used - no database to test with. ($error)"; +} + +eval { require Test::HTML::Content; }; +if ( $@ ) { + plan skip_all => "Test::HTML::Content not available."; +} + +plan tests => 3; + +my $config = OpenGuides::Test->make_basic_config; +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; + +# Clear out the database from any previous runs. +OpenGuides::Test::refresh_db(); + +# Write a node. +OpenGuides::Test->write_data( guide => $guide, node => "Red Lion", + return_output => 1 ); + +# Display it, and make sure we get the openguides-base.css in there. +$config->static_url( "http://example.org/static/" ); +my $output = $guide->display_node( id => "Red Lion", return_output => 1 ); +Test::HTML::Content::tag_ok( $output, "link", + { rel => "stylesheet", + href => "http://example.org/static/openguides-base.css" }, + "openguides-base stylesheet used when none provided" ); + +# Make sure the guide's own stylesheet overrides this though. +$config->stylesheet_url( "http://example.com/styles.css" ); +$output = $guide->display_node( id => "Red Lion", return_output => 1 ); +Test::HTML::Content::no_tag( $output, "link", + { rel => "stylesheet", href => "openguides-base.css" }, + "...but not when one is provided" ); +Test::HTML::Content::tag_ok( $output, "link", + { rel => "stylesheet", href => "http://example.com/styles.css" }, + "...and the guide's own stylesheet is used instead" ); Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2012-04-17 12:30:02 UTC (rev 1347) +++ trunk/templates/header.tt 2012-04-17 12:50:46 UTC (rev 1348) @@ -29,6 +29,8 @@ [% IF stylesheet %] <link rel="stylesheet" href="[% stylesheet %]" type="text/css" title="Stylesheet for [% site_name %]" /> + [% ELSE %] + <link rel="stylesheet" href="[% config.static_url %]openguides-base.css" type="text/css" title="Basic OpenGuides stylesheet" /> [% END %] [% IF config.use_leaflet %] <link rel="stylesheet" href="http://code.leafletjs.com/leaflet-0.3.1/leaflet.css" />

1 0

r1347 - in trunk: static templates
by svnadmin＠urchin.earth.li 17 Apr '12

17 Apr '12

Author: kake Date: 2012-04-17 13:30:02 +0100 (Tue, 17 Apr 2012) New Revision: 1347 Modified: trunk/static/openguides-base.css trunk/templates/map_index_leaflet.tt trunk/templates/site_index.tt Log: Style/design tweaks. Modified: trunk/static/openguides-base.css =================================================================== --- trunk/static/openguides-base.css 2012-04-16 23:56:31 UTC (rev 1346) +++ trunk/static/openguides-base.css 2012-04-17 12:30:02 UTC (rev 1347) @@ -1,12 +1,51 @@ +body { + background-color: #bfabd3; +} + +div#body_wrapper { + background: #ebc0fb; + margin-left: 5%; + margin-right: 5%; + margin-top: 1.5em; + border: thin solid black; +} + +div#banner { + padding: 0.1em 1em 0.1em 1em; + border-bottom: thin solid black; +} + +div#banner a { + text-decoration: none; + color: #000000; +} + +div#summary { + display: none; +} + +div#maincontent { + float: left; + width: 77%; +} + +div#content { + padding-left: 1em; +} + +div#recent_changes_feeds, div#site_index_feeds { + clear: both; +} + div#map_index_node_list { - height: 400px; + height: 450px; overflow: auto; float: right; - width: 30%; + width: 20%; } div#map_index_canvas { - width: 60%; + width: 75%; height: 450px; } @@ -14,4 +53,22 @@ float: right; width: 300px; height: 200px; + border: thin solid black; + margin-top: 1em; } + +div#navbar { + border-left: thin solid black; + border-bottom: thin solid black; + padding: 1em; + float: right; + width: 18%; +} + +div.navbar_site_name { + display: none; +} + +.hidden { + display: none; +} Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-04-16 23:56:31 UTC (rev 1346) +++ trunk/templates/map_index_leaflet.tt 2012-04-17 12:30:02 UTC (rev 1347) @@ -1,11 +1,13 @@ [% page_title = "Map of $criteria_title - $site_name" %] [% INCLUDE header.tt %] [% INCLUDE banner.tt %] + +[%# NOTE: the "content" div is closed off in footer.tt %] <div id="content"> - <div id="maincontent"> + <div id="maincontent_no_navbar"> - <h2>Map of + <h2>Map of [% IF criteria %] [% links = [] %] [% FOREACH criterion = criteria %] @@ -15,7 +17,7 @@ [% ELSE %] all nodes [% END %] - </h2> + </h2> <div id="map_index_node_list"> <ul> @@ -76,6 +78,5 @@ </div> </div> -</div> [% INCLUDE footer.tt %] Modified: trunk/templates/site_index.tt =================================================================== --- trunk/templates/site_index.tt 2012-04-16 23:56:31 UTC (rev 1346) +++ trunk/templates/site_index.tt 2012-04-17 12:30:02 UTC (rev 1347) @@ -20,16 +20,17 @@ <div id="content"> [% INCLUDE navbar.tt %] <div id="maincontent"> -<h2>Node List +<h2>Index of [% IF criteria %] [% links = [] %] [% FOREACH criterion = criteria %] [% links.push( '<a href="' _ cgi_url _ '?' _ criterion.param _ '">' _ criterion.name _ '</a>' ) %] [% END %] - - [% links.join( ' and ' ) %] - [% END %] - [%- IF origin -%] - - Things within [%- limit -%] of <a href="[% cgi_url %]?[%- origin_param -%]">[%- origin -%]</a> + [% links.join( ' and ' ) %] + [% ELSIF origin -%] + things within [%- limit -%] of <a href="[% cgi_url %]?[%- origin_param -%]">[%- origin -%]</a> + [% ELSE %] + everything on this guide [%- END -%] </h2> <ol> @@ -41,14 +42,16 @@ </ol> </div> -[%# my_feed_base is set at the top of this file %] -<p> - This list is available as - <a href="[% my_feed_base %];format=rdf">rdf</a>, - or as a - <a href="[% my_feed_base %];format=rss">rss feed</a>, - or as an - <a href="[% my_feed_base %];format=atom">atom feed</a>. -</p> +<div id="site_index_feeds"> + [%# my_feed_base is set at the top of this file %] + <p> + This list is available as + <a href="[% my_feed_base %];format=rdf">rdf</a>, + or as a + <a href="[% my_feed_base %];format=rss">rss feed</a>, + or as an + <a href="[% my_feed_base %];format=atom">atom feed</a>. + </p> +</div> [% INCLUDE footer.tt %]

1 0

r1346 - in trunk: . static templates
by svnadmin＠urchin.earth.li 17 Apr '12

17 Apr '12

Author: kake Date: 2012-04-17 00:56:31 +0100 (Tue, 17 Apr 2012) New Revision: 1346 Added: trunk/static/openguides-base.css Modified: trunk/Build.PL trunk/Changes trunk/MANIFEST trunk/templates/map_index_leaflet.tt trunk/templates/node.tt Log: Moved some styling into basic stylesheet. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/Build.PL 2012-04-16 23:56:31 UTC (rev 1346) @@ -432,6 +432,7 @@ $build->config_data( __static_files => [ "map-leaflet.js", + "openguides-base.css", ] ); # Finally write the build script. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/Changes 2012-04-16 23:56:31 UTC (rev 1346) @@ -5,9 +5,11 @@ 0.67 ? Switched from the Google Maps API to the Leaflet mapping library. - To make this work, set use_leaflet = 1 in your wiki.conf. Google - Maps support is retained for those who fear change, but is no longer - actively maintained. + To make this work, set use_leaflet = 1 in your wiki.conf, and ensure + that div#map_index_canvas is given a non-zero height in your + stylesheet (you may also want to style div#map_index_node_list and + div#node_map_canvas). Google Maps support is retained for those + who fear change, but is no longer actively maintained. Added support for indexing on category and locale at the same time. As part of this, action=index now uses a new form of parameters, so instead of e.g. @@ -19,6 +21,7 @@ Format params such as format=map work as before. Old-style URLs will automatically redirect to new-style ones. Added project metadata to Build.PL (#285). + Added a basic stylesheet, installed into the static_path directory. 0.66 12 April 2012 All templates now have access to the "username" TT variable. Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/MANIFEST 2012-04-16 23:56:31 UTC (rev 1346) @@ -28,6 +28,7 @@ preferences.cgi search.cgi static/map-leaflet.js +static/openguides-base.js templates/admin_home.tt templates/admin_revert_user.tt templates/autocreate_content.tt Added: trunk/static/openguides-base.css =================================================================== --- trunk/static/openguides-base.css (rev 0) +++ trunk/static/openguides-base.css 2012-04-16 23:56:31 UTC (rev 1346) @@ -0,0 +1,17 @@ +div#map_index_node_list { + height: 400px; + overflow: auto; + float: right; + width: 30%; +} + +div#map_index_canvas { + width: 60%; + height: 450px; +} + +div#node_map_canvas { + float: right; + width: 300px; + height: 200px; +} Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/templates/map_index_leaflet.tt 2012-04-16 23:56:31 UTC (rev 1346) @@ -17,7 +17,7 @@ [% END %] </h2> - <div id="map_index_node_list" style="height:400px; overflow:auto;float:right; width:30%"> + <div id="map_index_node_list"> <ul> [% IF no_nodes_on_map %] [% FOREACH node = nodes %] @@ -40,7 +40,7 @@ </ul> </div> - <div id="map_index_canvas" style="width:60%; height:450px"> + <div id="map_index_canvas"> [% IF no_nodes_on_map %] <p class="no_nodes_on_map">No pages with geodata - nothing to display on map!</p> Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2012-04-16 23:53:44 UTC (rev 1345) +++ trunk/templates/node.tt 2012-04-16 23:56:31 UTC (rev 1346) @@ -18,7 +18,7 @@ [% IF wgs84_lat AND wgs84_long AND display_google_maps %] [% IF config.use_leaflet %] - <div id="node_map_canvas" style="float:right; width: 300px; height: 200px"></div> + <div id="node_map_canvas"></div> <script type="text/javascript"> map_div_id = 'node_map_canvas'; centre_lat = [% wgs84_lat %];

1 0

r1345 - trunk/static
by svnadmin＠urchin.earth.li 17 Apr '12

17 Apr '12

Author: kake Date: 2012-04-17 00:53:44 +0100 (Tue, 17 Apr 2012) New Revision: 1345 Modified: trunk/static/map-leaflet.js Log: Added address and node link to Leaflet map popups. Modified: trunk/static/map-leaflet.js =================================================================== --- trunk/static/map-leaflet.js 2012-04-16 18:29:47 UTC (rev 1344) +++ trunk/static/map-leaflet.js 2012-04-16 23:53:44 UTC (rev 1345) @@ -41,7 +41,7 @@ marker = new L.Marker( position, { icon: new gicon() } ); map.addLayer( marker ); - content = node.name; + content = '<a href="?' + node.param + '">' + node.name + '</a><br />' + node.address; marker.bindPopup( content ); markers[ i ] = marker;

1 0

r1344 - in trunk: lib t templates
by svnadmin＠urchin.earth.li 16 Apr '12

16 Apr '12

Author: kake Date: 2012-04-16 19:29:47 +0100 (Mon, 16 Apr 2012) New Revision: 1344 Modified: trunk/lib/OpenGuides.pm trunk/t/94_leaflet.t trunk/templates/map_index_leaflet.tt Log: Deal with case where there are no nodes to display on map. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-04-16 16:43:28 UTC (rev 1343) +++ trunk/lib/OpenGuides.pm 2012-04-16 18:29:47 UTC (rev 1344) @@ -1052,6 +1052,8 @@ centre_lat => ( ( $max_lat + $min_lat ) / 2 ), centre_long => ( ( $max_long + $min_long ) / 2 ), ); + } else { + $tt_vars{no_nodes_on_map} = 1; } $template = "map_index_leaflet.tt"; } else { Modified: trunk/t/94_leaflet.t =================================================================== --- trunk/t/94_leaflet.t 2012-04-16 16:43:28 UTC (rev 1343) +++ trunk/t/94_leaflet.t 2012-04-16 18:29:47 UTC (rev 1344) @@ -11,7 +11,7 @@ "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 18; +plan tests => 21; my $config = OpenGuides::Test->make_basic_config; $config->static_url( "http://example.com/static" ); @@ -149,3 +149,15 @@ "Nodes with zero latitude have has_geodata set." ); ok( $node_hash{"Zero Long"}{has_geodata}, "Nodes with zero longitude have has_geodata set." ); + +# Map shouldn't be displayed if none of the nodes have geodata. +%tt_vars = $guide->show_index( type => "locale", value => "Addiscombe", + format => "map", return_tt_vars => 1 ); +ok( $tt_vars{no_nodes_on_map}, + "no_nodes_on_map template variable is set when no nodes have geodata" ); +$output = $guide->show_index( type => "locale", value => "Addiscombe", + format => "map", return_output => 1 ); +unlike( $output, qr/not on map/, + "...and no warning about individual things not being on the map" ); +unlike( $output, qr/centre_lat/, + "...and no attempt to set centre_lat JavaScript variable" ); Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-04-16 16:43:28 UTC (rev 1343) +++ trunk/templates/map_index_leaflet.tt 2012-04-16 18:29:47 UTC (rev 1344) @@ -19,50 +19,61 @@ <div id="map_index_node_list" style="height:400px; overflow:auto;float:right; width:30%"> <ul> - [% i = 0 %] - [% FOREACH node = nodes %] - [% i = i + 1 %] - <li> - [% IF node.has_geodata %] - <a href="#" onclick="return show_marker( [% i %] )">[% node.name | html %]</a> - [% ELSE %] - [% node.name | html %] (not on map — - <a href="?[% node.param %]">view info</a>) - [% END %] - </li> + [% IF no_nodes_on_map %] + [% FOREACH node = nodes %] + <li><a href="?[% node.param %]">[% node.name %]</a></li> + [% END %] + [% ELSE %] + [% i = 0 %] + [% FOREACH node = nodes %] + [% i = i + 1 %] + <li> + [% IF node.has_geodata %] + <a href="#" onclick="return show_marker( [% i %] )">[% node.name | html %]</a> + [% ELSE %] + [% node.name | html %] (not on map — + <a href="?[% node.param %]">view info</a>) + [% END %] + </li> + [% END %] [% END %] </ul> </div> - <div id="map_index_canvas" style="width:60%; height:450px"></div> + <div id="map_index_canvas" style="width:60%; height:450px"> + [% IF no_nodes_on_map %] + <p class="no_nodes_on_map">No pages with geodata - nothing to display + on map!</p> + [% ELSE %] + <script type="text/javascript"> - <script type="text/javascript"> + map_div_id = 'map_index_canvas'; + centre_lat = [% centre_lat %]; + centre_long = [% centre_long %]; - map_div_id = 'map_index_canvas'; - centre_lat = [% centre_lat %]; - centre_long = [% centre_long %]; - - function add_markers() { - var node; - [% i = 0 %] - [% FOREACH node = nodes %] - [% i = i + 1 %] - [% IF node.has_geodata %] - node = { - name: '[% node.name | html %]', - param: '[% node.param %]', - [% address = node.node_data.metadata.address.list.first %] - [% IF address %] - address: '[% address | html %]', + function add_markers() { + var node; + [% i = 0 %] + [% FOREACH node = nodes %] + [% i = i + 1 %] + [% IF node.has_geodata %] + node = { + name: '[% node.name | html %]', + param: '[% node.param %]', + [% address = node.node_data.metadata.address.list.first %] + [% IF address %] + address: '[% address | html %]', + [% END %] + lat: [% node.wgs84_lat %], + long: [% node.wgs84_long %], + }; + add_marker( [% i %], node ); [% END %] - lat: [% node.wgs84_lat %], - long: [% node.wgs84_long %], - }; - add_marker( [% i %], node ); - [% END %] - [% END %] - } - </script> + [% END %] + } + </script> + [% END %] + </div> </div> </div>

1 0

r1343 - trunk
by svnadmin＠urchin.earth.li 16 Apr '12

16 Apr '12

Author: kake Date: 2012-04-16 17:43:28 +0100 (Mon, 16 Apr 2012) New Revision: 1343 Modified: trunk/Changes Log: Documented switch to Leaflet. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-04-16 16:40:58 UTC (rev 1342) +++ trunk/Changes 2012-04-16 16:43:28 UTC (rev 1343) @@ -4,6 +4,10 @@ <http://dev.openguides.org/log/trunk>. 0.67 ? + Switched from the Google Maps API to the Leaflet mapping library. + To make this work, set use_leaflet = 1 in your wiki.conf. Google + Maps support is retained for those who fear change, but is no longer + actively maintained. Added support for indexing on category and locale at the same time. As part of this, action=index now uses a new form of parameters, so instead of e.g.

1 0

r1342 - in trunk: . lib t templates
by svnadmin＠urchin.earth.li 16 Apr '12

16 Apr '12

Author: kake Date: 2012-04-16 17:40:58 +0100 (Mon, 16 Apr 2012) New Revision: 1342 Added: trunk/t/95_multiple_index.t Modified: trunk/Changes trunk/MANIFEST trunk/lib/OpenGuides.pm trunk/templates/map_index_leaflet.tt trunk/templates/rdf_index.tt trunk/templates/site_index.tt Log: Added support for indexing on category and locale at the same time. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-04-15 10:25:44 UTC (rev 1341) +++ trunk/Changes 2012-04-16 16:40:58 UTC (rev 1342) @@ -4,10 +4,14 @@ <http://dev.openguides.org/log/trunk>. 0.67 ? - action=index now uses a new form of parameters - instead of e.g. + Added support for indexing on category and locale at the same time. + As part of this, action=index now uses a new form of parameters, so + instead of e.g. action=index;index_type=locale;index_value=holborn you should use action=index;loc=holborn + or indeed + action=index;cat=pubs;loc=holborn Format params such as format=map work as before. Old-style URLs will automatically redirect to new-style ones. Added project metadata to Build.PL (#285). Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-04-15 10:25:44 UTC (rev 1341) +++ trunk/MANIFEST 2012-04-16 16:40:58 UTC (rev 1342) @@ -162,6 +162,7 @@ t/92_node_name_from_cgi_obj.t t/93_redirect_without_spaces.t t/94_leaflet.t +t/95_multiple_index.t t/templates/15_test.tt wiki.cgi META.json Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-04-15 10:25:44 UTC (rev 1341) +++ trunk/lib/OpenGuides.pm 2012-04-16 16:40:58 UTC (rev 1342) @@ -851,6 +851,12 @@ cat => "pubs", ); + # Show all pubs in Holborn. + $guide->show_index( + cat => "pubs", + loc => "holborn", + ); + # RDF version of things in Locale: Holborn. $guide->show_index( loc => "Holborn", @@ -917,41 +923,55 @@ # OK, we either show everything, or do a new-style cat/loc search. my $cat = $args{cat} || ""; my $loc = $args{loc} || ""; - my ( $type, $value ); + my ( $type, $value, @names, @criteria ); if ( !$cat && !$loc ) { @selnodes = $wiki->list_all_nodes(); } else { + my ( @catnodes, @locnodes ); if ( $cat ) { - @selnodes = $wiki->list_nodes_by_metadata( + @catnodes = $wiki->list_nodes_by_metadata( metadata_type => "category", metadata_value => $cat, ignore_case => 1 ); - $type = "category"; - $value = $cat; - } else { - @selnodes = $wiki->list_nodes_by_metadata( + my $name = "Category " . ucfirst( $cat ); + push @criteria, { + type => "category", + value => $cat, + name => $name, + param => $formatter->node_name_to_node_param( $name ), + }; + push @names, $name; + } + if ( $loc ) { + @locnodes = $wiki->list_nodes_by_metadata( metadata_type => "locale", metadata_value => $loc, ignore_case => 1 ); - $type = "locale"; - $value = $loc; + my $name = "Locale " . ucfirst( $loc ); + push @criteria, { + type => "locale", + value => $loc, + name => $name, + param => $formatter->node_name_to_node_param( $name ), + }; + push @names, $name; } - my $name = ucfirst($type) . " $value"; - my $url = $self->config->script_name - . "?" - . ucfirst( $type ) - . "_" - . uri_escape( - $formatter->node_name_to_node_param($value) - ); - $tt_vars{criterion} = { - type => $type, - value => $value, # for RDF version - name => CGI->escapeHTML( $name ), - url => $url - }; + if ( $cat && !$loc ) { + @selnodes = @catnodes; + } elsif ( $loc && !$cat ) { + @selnodes = @locnodes; + } else { + # Intersect the category and locale results. + my %count = (); + foreach my $node ( @catnodes, @locnodes ) { $count{$node}++; } + foreach my $node ( keys %count ) { + push @selnodes, $node if $count{$node} > 1; + } + } + $tt_vars{criteria_title} = join( " and ", @names ); + $tt_vars{criteria} = \@criteria; $tt_vars{not_editable} = 1; } } Added: trunk/t/95_multiple_index.t =================================================================== --- trunk/t/95_multiple_index.t (rev 0) +++ trunk/t/95_multiple_index.t 2012-04-16 16:40:58 UTC (rev 1342) @@ -0,0 +1,107 @@ +use strict; +use OpenGuides; +use OpenGuides::CGI; +use OpenGuides::Test; +use Test::More; + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => + "DBD::SQLite could not be used - no database to test with. ($error)"; +} + +eval { require Test::HTML::Content; }; +if ( $@ ) { + plan skip_all => "Test::HTML::Content not available."; +} + +plan tests => 15; + +my $config = OpenGuides::Test->make_basic_config; +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; + +# Clear out the database from any previous runs. +OpenGuides::Test::refresh_db(); + +# Write some nodes. +OpenGuides::Test->write_data( + guide => $guide, + node => "Red Lion", + locales => "Croydon", + categories => "Pubs", + return_output => 1, + ); + +OpenGuides::Test->write_data( + guide => $guide, + node => "Blue Lion", + locales => "Waddon", + categories => "Pubs", + return_output => 1, + ); + +OpenGuides::Test->write_data( + guide => $guide, + node => "Blue Ribbon", + locales => "Waddon", + categories => "Shops", + return_output => 1, + ); + +my %tt_vars = $guide->show_index( cat => "pubs", return_tt_vars => 1 ); +is( scalar @{$tt_vars{nodes}}, 2, + "Right number of nodes returned in pure category search" ); +my $output = $guide->show_index( cat => "pubs", return_output => 1 ); +Test::HTML::Content::title_ok( $output, "Index of Category Pubs - Test", + "...and page title is correct" ); +Test::HTML::Content::link_ok( $output, $config->script_name . "?Category_Pubs", + "...and we link to the category page." ); + +%tt_vars = $guide->show_index( loc => "waddon", return_tt_vars => 1 ); +is( scalar @{$tt_vars{nodes}}, 2, + "Right number of nodes returned in pure locale search" ); +$output = $guide->show_index( loc => "waddon", return_output => 1 ); +Test::HTML::Content::title_ok( $output, "Index of Locale Waddon - Test", + "...and page title is correct" ); +Test::HTML::Content::link_ok( $output, $config->script_name . "?Locale_Waddon", + "...and we link to the locale page." ); + +%tt_vars = $guide->show_index( cat => "pubs", loc => "waddon", + return_tt_vars => 1 ); +is( scalar @{$tt_vars{nodes}}, 1, + "Right number of nodes returned in category+locale search" ); +$output = $guide->show_index( cat => "pubs", loc => "waddon", + return_output => 1 ); +Test::HTML::Content::title_ok( $output, + "Index of Category Pubs and Locale Waddon - Test", + "...and page title is correct" ); +Test::HTML::Content::link_ok( $output, $config->script_name . "?Category_Pubs", + "...and we link to the category page." ); +Test::HTML::Content::link_ok( $output, $config->script_name . "?Locale_Waddon", + "...and we link to the locale page." ); + +# Test the map version. +$config->use_leaflet( 1 ); +%tt_vars = $guide->show_index( cat => "pubs", loc => "waddon", format => "map", + return_tt_vars => 1 ); +is( scalar @{$tt_vars{nodes}}, 1, + "Right number of nodes returned in category+locale search with map" ); +$output = $guide->show_index( cat => "pubs", loc => "waddon", format => "map", + return_output => 1 ); +Test::HTML::Content::title_ok( $output, + "Map of Category Pubs and Locale Waddon - Test", + "...and page title is correct" ); +Test::HTML::Content::link_ok( $output, $config->script_name . "?Category_Pubs", + "...and we link to the category page." ); +Test::HTML::Content::link_ok( $output, $config->script_name . "?Locale_Waddon", + "...and we link to the locale page." ); + +# Test the RDF version. +$output = $guide->show_index( cat => "pubs", loc => "waddon", format => "rdf", + return_output => 1 ); +like( $output, + qr|<dc:title>Category Pubs and Locale Waddon</dc:title>|, + "Page title is correct on RDF version." ); + Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-04-15 10:25:44 UTC (rev 1341) +++ trunk/templates/map_index_leaflet.tt 2012-04-16 16:40:58 UTC (rev 1342) @@ -1,9 +1,22 @@ -[% INCLUDE header.tt page_title = criterion.name || "Map of all nodes" %] +[% page_title = "Map of $criteria_title - $site_name" %] +[% INCLUDE header.tt %] [% INCLUDE banner.tt %] <div id="content"> <div id="maincontent"> + <h2>Map of + [% IF criteria %] + [% links = [] %] + [% FOREACH criterion = criteria %] + [% links.push( '<a href="' _ cgi_url _ '?' _ criterion.param _ '">' _ criterion.name _ '</a>' ) %] + [% END %] + [% links.join( ' and ' ) %] + [% ELSE %] + all nodes + [% END %] + </h2> + <div id="map_index_node_list" style="height:400px; overflow:auto;float:right; width:30%"> <ul> [% i = 0 %] Modified: trunk/templates/rdf_index.tt =================================================================== --- trunk/templates/rdf_index.tt 2012-04-15 10:25:44 UTC (rev 1341) +++ trunk/templates/rdf_index.tt 2012-04-16 16:40:58 UTC (rev 1342) @@ -10,8 +10,8 @@ > <rdf:Description rdf:about=""> -[% IF criterion %] - <dc:title>[% CGI.escapeHTML(criterion.name) %]</dc:title> +[% IF criteria_title %] + <dc:title>[% CGI.escapeHTML( criteria_title ) %]</dc:title> [% ELSE %] <dc:title>RDF index</dc:title> [% END %] Modified: trunk/templates/site_index.tt =================================================================== --- trunk/templates/site_index.tt 2012-04-15 10:25:44 UTC (rev 1341) +++ trunk/templates/site_index.tt 2012-04-16 16:40:58 UTC (rev 1342) @@ -1,13 +1,17 @@ -[% IF criterion %] +[% my_feed_base = cgi_url _ '?action=index' %] + +[% FOREACH criterion = criteria %] [% IF criterion.type == 'category' %] - [% my_params = ';cat=' _ criterion.value.lower %] + [% my_feed_base = my_feed_base _ ';cat=' _ criterion.value.lower %] [% ELSIF criterion.type == 'locale' %] - [% my_params = ';loc=' _ criterion.value.lower %] + [% my_feed_base = my_feed_base _ ';loc=' _ criterion.value.lower %] [% END %] +[% END %] +[% IF criteria %] [% INCLUDE header.tt - page_title = "Index of $criterion.name - $site_name" - feed_base = "$cgi_url?action=index" _ my_params + page_title = "Index of $criteria_title - $site_name" + feed_base = my_feed_base %] [% ELSE %] [% INCLUDE header.tt page_title = "Things within $limit of $origin - $site_name" %] @@ -17,13 +21,13 @@ [% INCLUDE navbar.tt %] <div id="maincontent"> <h2>Node List - [%- IF criterion -%] - [%- IF criterion.url -%] - - <a href="[% criterion.url %]">[%- criterion.name -%]</a> - [%- ELSE -%] - - [%- criterion.name -%] - [%- END -%] - [%- END -%] + [% IF criteria %] + [% links = [] %] + [% FOREACH criterion = criteria %] + [% links.push( '<a href="' _ cgi_url _ '?' _ criterion.param _ '">' _ criterion.name _ '</a>' ) %] + [% END %] + - [% links.join( ' and ' ) %] + [% END %] [%- IF origin -%] - Things within [%- limit -%] of <a href="[% cgi_url %]?[%- origin_param -%]">[%- origin -%]</a> [%- END -%] @@ -37,15 +41,14 @@ </ol> </div> -[%# my_params is set at the top of this file %] +[%# my_feed_base is set at the top of this file %] <p> This list is available as - <a href="[% cgi_url %]?action=index[% my_params %];format=rdf">rdf</a>, + <a href="[% my_feed_base %];format=rdf">rdf</a>, or as a - <a href="[% cgi_url %]?action=index[% my_params %];format=rss">rss feed</a>, + <a href="[% my_feed_base %];format=rss">rss feed</a>, or as an - <a href="[% cgi_url %]?action=index[% my_params %];format=atom">atom - feed</a>. + <a href="[% my_feed_base %];format=atom">atom feed</a>. </p> [% INCLUDE footer.tt %]

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 2012