openguides-commits May 2012

openguides-commits@lists.openguides.org

1 participants
40 discussions

r1401 - in trunk: lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 13 May '12

13 May '12

Author: kake Date: 2012-05-13 09:19:49 +0100 (Sun, 13 May 2012) New Revision: 1401 Modified: trunk/lib/OpenGuides/CGI.pm trunk/t/509_preferences.t trunk/templates/preferences.tt Log: Made preferences default to never expiring. Modified: trunk/lib/OpenGuides/CGI.pm =================================================================== --- trunk/lib/OpenGuides/CGI.pm 2012-05-11 17:53:39 UTC (rev 1400) +++ trunk/lib/OpenGuides/CGI.pm 2012-05-13 08:19:49 UTC (rev 1401) @@ -341,7 +341,7 @@ # when that bug gets fixed show_minor_edits_in_rc => 1, default_edit_type => "normal", - cookie_expires => "month", + cookie_expires => "never", track_recent_changes_views => 0, display_google_maps => 1, is_admin => 0, Modified: trunk/t/509_preferences.t =================================================================== --- trunk/t/509_preferences.t 2012-05-11 17:53:39 UTC (rev 1400) +++ trunk/t/509_preferences.t 2012-05-13 08:19:49 UTC (rev 1401) @@ -17,7 +17,7 @@ exit 0; } -plan tests => 17; +plan tests => 21; OpenGuides::Test::refresh_db(); @@ -96,6 +96,37 @@ "input", { type => "checkbox", name => "display_google_maps" }, "...but not when node maps are globally disabled." ); +# Make sure the default is for preferences to never expire. +delete $ENV{HTTP_COOKIE}; +$output = $guide->display_prefs_form( return_output => 1, noheaders => 1 ); +Test::HTML::Content::tag_ok( $output, + "option", { value => "never", "selected" => "1" }, + "Default for preferences expiry choice is \"never\"." ); + +$cookie = OpenGuides::CGI->make_prefs_cookie( config => $config, + cookie_expires => "never" ); +$ENV{HTTP_COOKIE} = $cookie; +$output = $guide->display_prefs_form( return_output => 1, noheaders => 1 ); +Test::HTML::Content::tag_ok( $output, + "option", { value => "never", "selected" => "1" }, + "...choice set to \"never\" if already set as such in cookie" ); + +$cookie = OpenGuides::CGI->make_prefs_cookie( config => $config, + cookie_expires => "year" ); +$ENV{HTTP_COOKIE} = $cookie; +$output = $guide->display_prefs_form( return_output => 1, noheaders => 1 ); +Test::HTML::Content::tag_ok( $output, + "option", { value => "year", "selected" => "1" }, + "...choice set to \"year\" if already set as such in cookie" ); + +$cookie = OpenGuides::CGI->make_prefs_cookie( config => $config, + cookie_expires => "month" ); +$ENV{HTTP_COOKIE} = $cookie; +$output = $guide->display_prefs_form( return_output => 1, noheaders => 1 ); +Test::HTML::Content::tag_ok( $output, + "option", { value => "month", "selected" => "1" }, + "...choice set to \"month\" if already set as such in cookie" ); + # Test JSON version of prefs page. my $json_writer = OpenGuides::JSON->new( wiki => $wiki, config => $config ); Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2012-05-11 17:53:39 UTC (rev 1400) +++ trunk/templates/preferences.tt 2012-05-13 08:19:49 UTC (rev 1401) @@ -103,18 +103,18 @@ <p> <label for="cookie_expires">Preferences expire:</label> <select name="cookie_expires" id="cookie_expires"> - [% IF prefs.cookie_expires == 'never' %] - <option value="month">in one month</option> + [% IF prefs.cookie_expires == 'month' %] + <option value="month" selected="1">in one month</option> <option value="year">in one year</option> - <option value="never" selected="1">never</option> + <option value="never">never</option> [% ELSIF prefs.cookie_expires == "year" %] <option value="month">in one month</option> <option value="year" selected="1">in one year</option> <option value="never">never</option> [% ELSE %] - <option value="month" selected="1">in one month</option> + <option value="month">in one month</option> <option value="year">in one year</option> - <option value="never">never</option> + <option value="never" selected="1">never</option> [% END %] </select> </p>

1 0

r1400 - trunk/templates
by svnadmin＠urchin.earth.li 11 May '12

11 May '12

Author: kake Date: 2012-05-11 18:53:39 +0100 (Fri, 11 May 2012) New Revision: 1400 Modified: trunk/templates/edit_form.tt Log: Removed unused, non-working JavaScript for picking categories/locales. Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2012-05-11 11:39:06 UTC (rev 1399) +++ trunk/templates/edit_form.tt 2012-05-11 17:53:39 UTC (rev 1400) @@ -89,7 +89,6 @@ Current locales: [% ELSE %] Locales (one per line) (<a href="[% full_cgi_url %]?Category_Locales" target="_blank">view all locales in a new window)</a>: - <span id="pick_locale"></span> [% END %] </label> <div class="edit_box"> @@ -114,7 +113,6 @@ Current categories: [% ELSE %] Categories (one per line) (<a href="[% full_cgi_url %]?Category_Category" target="_blank">view all categories in a new window)</a>: - <span id="pick_category"></span> [% END %] </label> <div class="edit_box"> @@ -133,42 +131,6 @@ [% 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

r1399 - trunk/static
by svnadmin＠urchin.earth.li 11 May '12

11 May '12

Author: kake Date: 2012-05-11 12:39:06 +0100 (Fri, 11 May 2012) New Revision: 1399 Modified: trunk/static/map-leaflet.js Log: Make sure map is centred and zoomed properly when there's only one point on it. Modified: trunk/static/map-leaflet.js =================================================================== --- trunk/static/map-leaflet.js 2012-05-07 14:15:42 UTC (rev 1398) +++ trunk/static/map-leaflet.js 2012-05-11 11:39:06 UTC (rev 1399) @@ -27,10 +27,12 @@ layers: [ osm_layer ], } ); - if ( min_lat ) { + if ( min_lat && ( min_lat != max_lat ) ) { var bounds = new L.LatLngBounds( new L.LatLng( min_lat, min_long ), new L.LatLng( max_lat, max_long ) ); map.fitBounds( bounds ); + } else if ( min_lat == max_lat ) { + map.setView( new L.LatLng( min_lat, min_long ), 18 ); } else { map.setView( map_centre, 13 ); }

1 0

r1398 - in website/publish: . includes
by svnadmin＠urchin.earth.li 07 May '12

07 May '12

Author: kake Date: 2012-05-07 15:15:42 +0100 (Mon, 07 May 2012) New Revision: 1398 Modified: website/publish/ website/publish/gone.shtml website/publish/includes/latest_news.inc website/publish/news.shtml Log: Merge website changes to publish. Property changes on: website/publish ___________________________________________________________________ Modified: svn:mergeinfo - /website/preview:1265-1277,1284-1331 + /website/preview:1265-1277,1284-1331,1397 Property changes on: website/publish/gone.shtml ___________________________________________________________________ Modified: svn:mergeinfo - /website/preview/gone.shtml:1276-1277,1284-1331 + /website/preview/gone.shtml:1276-1277,1284-1331,1397 Modified: website/publish/includes/latest_news.inc =================================================================== --- website/publish/includes/latest_news.inc 2012-05-07 14:11:28 UTC (rev 1397) +++ website/publish/includes/latest_news.inc 2012-05-07 14:15:42 UTC (rev 1398) @@ -1,15 +1,19 @@  <div class="news_date"> -April 13, 2012 +May 7, 2012 </div> -<p>Version 0.66 of OpenGuides was released yesterday by our new CPAN release -manager, Bob Walker. This includes various usability fixes, new CSS hooks, -and a switch to Geo::Coordinates::* modules rather than the old -Geography::NationalGrid::* ones (which no longer exist on CPAN).</p> +<p>Version 0.67 of OpenGuides was released today, with several major +changes and bugfixes.</p> -<p>We now require version 2.24 of Template (for its text virtual methods, -needed to create the abovementioned CSS hooks).</p> +<p>We now use <a href="http://leaflet.cloudmade.com/">Leaflet</a> as +our JavaScript mapping library, with OpenStreetMap and MapQuest tiles +as default. JSON output has been added or improved on several types +of pages, including index pages and user preferences. A basic +stylesheet is now included in the distribution, and a long-standing +recent changes bug has been fixed. Finally, it's now possible to +index on category and locale at the same time (so you can view e.g. a +list or map of all pubs in Holborn).</p>  Modified: website/publish/news.shtml =================================================================== --- website/publish/news.shtml 2012-05-07 14:11:28 UTC (rev 1397) +++ website/publish/news.shtml 2012-05-07 14:15:42 UTC (rev 1398) @@ -32,6 +32,18 @@  <div class="news_date"> +April 13, 2012 +</div> + +<p>Version 0.66 of OpenGuides was released yesterday by our new CPAN release +manager, Bob Walker. This includes various usability fixes, new CSS hooks, +and a switch to Geo::Coordinates::* modules rather than the old +Geography::NationalGrid::* ones (which no longer exist on CPAN).</p> + +<p>We now require version 2.24 of Template (for its text virtual methods, +needed to create the abovementioned CSS hooks).</p> + +<div class="news_date"> February 25, 2009 </div>

1 0

r1397 - in website/preview: . includes
by svnadmin＠urchin.earth.li 07 May '12

07 May '12

Author: kake Date: 2012-05-07 15:11:28 +0100 (Mon, 07 May 2012) New Revision: 1397 Modified: website/preview/includes/latest_news.inc website/preview/news.shtml Log: Added news on release 0.67. Modified: website/preview/includes/latest_news.inc =================================================================== --- website/preview/includes/latest_news.inc 2012-05-07 12:16:09 UTC (rev 1396) +++ website/preview/includes/latest_news.inc 2012-05-07 14:11:28 UTC (rev 1397) @@ -1,15 +1,19 @@  <div class="news_date"> -April 13, 2012 +May 7, 2012 </div> -<p>Version 0.66 of OpenGuides was released yesterday by our new CPAN release -manager, Bob Walker. This includes various usability fixes, new CSS hooks, -and a switch to Geo::Coordinates::* modules rather than the old -Geography::NationalGrid::* ones (which no longer exist on CPAN).</p> +<p>Version 0.67 of OpenGuides was released today, with several major +changes and bugfixes.</p> -<p>We now require version 2.24 of Template (for its text virtual methods, -needed to create the abovementioned CSS hooks).</p> +<p>We now use <a href="http://leaflet.cloudmade.com/">Leaflet</a> as +our JavaScript mapping library, with OpenStreetMap and MapQuest tiles +as default. JSON output has been added or improved on several types +of pages, including index pages and user preferences. A basic +stylesheet is now included in the distribution, and a long-standing +recent changes bug has been fixed. Finally, it's now possible to +index on category and locale at the same time (so you can view e.g. a +list or map of all pubs in Holborn).</p>  Modified: website/preview/news.shtml =================================================================== --- website/preview/news.shtml 2012-05-07 12:16:09 UTC (rev 1396) +++ website/preview/news.shtml 2012-05-07 14:11:28 UTC (rev 1397) @@ -32,6 +32,18 @@  <div class="news_date"> +April 13, 2012 +</div> + +<p>Version 0.66 of OpenGuides was released yesterday by our new CPAN release +manager, Bob Walker. This includes various usability fixes, new CSS hooks, +and a switch to Geo::Coordinates::* modules rather than the old +Geography::NationalGrid::* ones (which no longer exist on CPAN).</p> + +<p>We now require version 2.24 of Template (for its text virtual methods, +needed to create the abovementioned CSS hooks).</p> + +<div class="news_date"> February 25, 2009 </div>

1 0

r1396 - trunk
by svnadmin＠urchin.earth.li 07 May '12

07 May '12

Author: bob Date: 2012-05-07 13:16:09 +0100 (Mon, 07 May 2012) New Revision: 1396 Modified: trunk/Changes Log: use spaces not tabs Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-05-07 11:45:33 UTC (rev 1395) +++ trunk/Changes 2012-05-07 12:16:09 UTC (rev 1396) @@ -20,8 +20,8 @@ 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). - Skip Build.PL questions if AUTOMATED_TESTING=1 (#291) + Added project metadata to Build.PL (#285). + Skip Build.PL questions if AUTOMATED_TESTING=1 (#291) 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::Escape). @@ -35,8 +35,8 @@ and sends them back there. Fixed bug with recent changes display when minor edit suppressed (for which we require version 0.80 of Wiki::Toolkit). - Renumber tests so we have more room (#297). - Fix warnings in tests due to undef values being lower cased (#298). + Renumber tests so we have more room (#297). + Fix warnings in tests due to undef values being lower cased (#298). 0.66 12 April 2012 All templates now have access to the "username" TT variable.

1 0

r1395 - in trunk: . lib/OpenGuides
by svnadmin＠urchin.earth.li 07 May '12

07 May '12

Author: bob Date: 2012-05-07 12:45:33 +0100 (Mon, 07 May 2012) New Revision: 1395 Modified: trunk/ trunk/Changes trunk/lib/OpenGuides/CGI.pm trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/JSON.pm trunk/lib/OpenGuides/Template.pm trunk/lib/OpenGuides/Utils.pm Log: merge changes from release branch Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/rel_0_66:1319-1327 + /branches/rel_0_66:1319-1327 /branches/rel_0_67:1391-1394 Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-05-07 10:22:50 UTC (rev 1394) +++ trunk/Changes 2012-05-07 11:45:33 UTC (rev 1395) @@ -3,7 +3,7 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. -0.67 ? +0.67 07 May 2012 Switched from the Google Maps API to the Leaflet mapping library. 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 Modified: trunk/lib/OpenGuides/CGI.pm =================================================================== --- trunk/lib/OpenGuides/CGI.pm 2012-05-07 10:22:50 UTC (rev 1394) +++ trunk/lib/OpenGuides/CGI.pm 2012-05-07 11:45:33 UTC (rev 1395) @@ -1,7 +1,7 @@ package OpenGuides::CGI; use strict; use vars qw( $VERSION ); -$VERSION = '0.10'; +$VERSION = '0.11'; use Carp qw( croak ); use CGI; Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2012-05-07 10:22:50 UTC (rev 1394) +++ trunk/lib/OpenGuides/Config.pm 2012-05-07 11:45:33 UTC (rev 1395) @@ -3,7 +3,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.06'; +$VERSION = '0.07'; use Carp qw( croak ); use Config::Tiny; Modified: trunk/lib/OpenGuides/JSON.pm =================================================================== --- trunk/lib/OpenGuides/JSON.pm 2012-05-07 10:22:50 UTC (rev 1394) +++ trunk/lib/OpenGuides/JSON.pm 2012-05-07 11:45:33 UTC (rev 1395) @@ -3,7 +3,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.02'; +$VERSION = '0.03'; use Wiki::Toolkit::Plugin::JSON; use Time::Piece; @@ -312,7 +312,7 @@ =head1 COPYRIGHT -Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved. +Copyright (C) 2003-2012 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/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2012-05-07 10:22:50 UTC (rev 1394) +++ trunk/lib/OpenGuides/Template.pm 2012-05-07 11:45:33 UTC (rev 1395) @@ -2,7 +2,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.16'; +$VERSION = '0.17'; use Carp qw( croak ); use CGI; # want to get rid of this and put the burden on the templates Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2012-05-07 10:22:50 UTC (rev 1394) +++ trunk/lib/OpenGuides/Utils.pm 2012-05-07 11:45:33 UTC (rev 1395) @@ -2,7 +2,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.12'; +$VERSION = '0.13'; use Carp qw( croak ); use Wiki::Toolkit; @@ -545,7 +545,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2012 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.

1 0

r1394 - in tags: . rel0_67
by svnadmin＠urchin.earth.li 07 May '12

07 May '12

Author: bob Date: 2012-05-07 11:22:50 +0100 (Mon, 07 May 2012) New Revision: 1394 Added: tags/rel0_67/ Log: tag 0.67 for release Property changes on: tags/rel0_67 ___________________________________________________________________ Added: svn:ignore + .vimrc *.swp _build Build Makefile.PL blib cover_db wiki.conf META.yml MYMETA.yml META.json MYMETA.json Added: svn:mergeinfo + /branches/rel_0_66:1319-1327 Added: svk:merge + 46bc3436-8211-0410-8564-d96f7a728040:/local/openguides/trunk:22808

1 0

r1393 - branches/rel_0_67
by svnadmin＠urchin.earth.li 07 May '12

07 May '12

Author: bob Date: 2012-05-07 11:10:46 +0100 (Mon, 07 May 2012) New Revision: 1393 Modified: branches/rel_0_67/Changes Log: Give release a data in the changes file Modified: branches/rel_0_67/Changes =================================================================== --- branches/rel_0_67/Changes 2012-05-07 09:59:27 UTC (rev 1392) +++ branches/rel_0_67/Changes 2012-05-07 10:10:46 UTC (rev 1393) @@ -3,7 +3,7 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. -0.67 ? +0.67 07 May 2012 Switched from the Google Maps API to the Leaflet mapping library. 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

1 0

r1392 - branches/rel_0_67/lib/OpenGuides
by svnadmin＠urchin.earth.li 07 May '12

07 May '12

Author: bob Date: 2012-05-07 10:59:27 +0100 (Mon, 07 May 2012) New Revision: 1392 Modified: branches/rel_0_67/lib/OpenGuides/CGI.pm branches/rel_0_67/lib/OpenGuides/Config.pm branches/rel_0_67/lib/OpenGuides/JSON.pm branches/rel_0_67/lib/OpenGuides/Template.pm branches/rel_0_67/lib/OpenGuides/Utils.pm Log: bump version numbers and update copyright on changed modules. Modified: branches/rel_0_67/lib/OpenGuides/CGI.pm =================================================================== --- branches/rel_0_67/lib/OpenGuides/CGI.pm 2012-05-07 09:47:20 UTC (rev 1391) +++ branches/rel_0_67/lib/OpenGuides/CGI.pm 2012-05-07 09:59:27 UTC (rev 1392) @@ -1,7 +1,7 @@ package OpenGuides::CGI; use strict; use vars qw( $VERSION ); -$VERSION = '0.10'; +$VERSION = '0.11'; use Carp qw( croak ); use CGI; Modified: branches/rel_0_67/lib/OpenGuides/Config.pm =================================================================== --- branches/rel_0_67/lib/OpenGuides/Config.pm 2012-05-07 09:47:20 UTC (rev 1391) +++ branches/rel_0_67/lib/OpenGuides/Config.pm 2012-05-07 09:59:27 UTC (rev 1392) @@ -3,7 +3,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.06'; +$VERSION = '0.07'; use Carp qw( croak ); use Config::Tiny; Modified: branches/rel_0_67/lib/OpenGuides/JSON.pm =================================================================== --- branches/rel_0_67/lib/OpenGuides/JSON.pm 2012-05-07 09:47:20 UTC (rev 1391) +++ branches/rel_0_67/lib/OpenGuides/JSON.pm 2012-05-07 09:59:27 UTC (rev 1392) @@ -3,7 +3,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.02'; +$VERSION = '0.03'; use Wiki::Toolkit::Plugin::JSON; use Time::Piece; @@ -312,7 +312,7 @@ =head1 COPYRIGHT -Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved. +Copyright (C) 2003-2012 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: branches/rel_0_67/lib/OpenGuides/Template.pm =================================================================== --- branches/rel_0_67/lib/OpenGuides/Template.pm 2012-05-07 09:47:20 UTC (rev 1391) +++ branches/rel_0_67/lib/OpenGuides/Template.pm 2012-05-07 09:59:27 UTC (rev 1392) @@ -2,7 +2,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.16'; +$VERSION = '0.17'; use Carp qw( croak ); use CGI; # want to get rid of this and put the burden on the templates Modified: branches/rel_0_67/lib/OpenGuides/Utils.pm =================================================================== --- branches/rel_0_67/lib/OpenGuides/Utils.pm 2012-05-07 09:47:20 UTC (rev 1391) +++ branches/rel_0_67/lib/OpenGuides/Utils.pm 2012-05-07 09:59:27 UTC (rev 1392) @@ -2,7 +2,7 @@ use strict; use vars qw( $VERSION ); -$VERSION = '0.12'; +$VERSION = '0.13'; use Carp qw( croak ); use Wiki::Toolkit; @@ -545,7 +545,7 @@ =head1 COPYRIGHT - Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved. + Copyright (C) 2003-2012 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.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits May 2012