openguides-commits May 2012

openguides-commits@lists.openguides.org

1 participants
40 discussions

r1411 - in trunk: . lib
by svnadmin＠urchin.earth.li 23 May '12

23 May '12

Author: bob Date: 2012-05-23 21:11:33 +0100 (Wed, 23 May 2012) New Revision: 1411 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: bump version number for next release Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-05-23 20:10:08 UTC (rev 1410) +++ trunk/Changes 2012-05-23 20:11:33 UTC (rev 1411) @@ -3,6 +3,9 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. +0.69 ? + + 0.68 21 May 2012 Made sure that maps are centred and zoomed properly even when they only contain one point. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-05-23 20:10:08 UTC (rev 1410) +++ trunk/lib/OpenGuides.pm 2012-05-23 20:11:33 UTC (rev 1411) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.68'; +$VERSION = '0.69'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2012-05-23 20:10:08 UTC (rev 1410) +++ trunk/wiki.cgi 2012-05-23 20:11:33 UTC (rev 1411) @@ -4,7 +4,7 @@ use warnings; use sigtrap die => 'normal-signals'; use vars qw( $VERSION ); -$VERSION = '0.68'; +$VERSION = '0.69'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r1410 - in trunk: . lib
by svnadmin＠urchin.earth.li 23 May '12

23 May '12

Author: bob Date: 2012-05-23 21:10:08 +0100 (Wed, 23 May 2012) New Revision: 1410 Modified: trunk/ trunk/Changes trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: merge in 0.68 release branch Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/rel_0_66:1319-1327 /branches/rel_0_67:1391-1394 + /branches/rel_0_66:1319-1327 /branches/rel_0_67:1391-1394 /branches/rel_0_68:1406-1409 Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-05-21 20:45:57 UTC (rev 1409) +++ trunk/Changes 2012-05-23 20:10:08 UTC (rev 1410) @@ -3,7 +3,7 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. -0.68 ? +0.68 21 May 2012 Made sure that maps are centred and zoomed properly even when they only contain one point. Made preferences default to never expiring. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-05-21 20:45:57 UTC (rev 1409) +++ trunk/lib/OpenGuides.pm 2012-05-23 20:10:08 UTC (rev 1410) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.67'; +$VERSION = '0.68'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2012-05-21 20:45:57 UTC (rev 1409) +++ trunk/wiki.cgi 2012-05-23 20:10:08 UTC (rev 1410) @@ -4,7 +4,7 @@ use warnings; use sigtrap die => 'normal-signals'; use vars qw( $VERSION ); -$VERSION = '0.67'; +$VERSION = '0.68'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r1409 - in tags: . rel0_68
by svnadmin＠urchin.earth.li 21 May '12

21 May '12

Author: bob Date: 2012-05-21 21:45:57 +0100 (Mon, 21 May 2012) New Revision: 1409 Added: tags/rel0_68/ Log: tagged 0.68 for release Property changes on: tags/rel0_68 ___________________________________________________________________ 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 /branches/rel_0_67:1391-1394 Added: svk:merge + 46bc3436-8211-0410-8564-d96f7a728040:/local/openguides/trunk:22808

1 0

r1408 - branches/rel_0_68
by svnadmin＠urchin.earth.li 21 May '12

21 May '12

Author: bob Date: 2012-05-21 21:37:23 +0100 (Mon, 21 May 2012) New Revision: 1408 Modified: branches/rel_0_68/Changes Log: give release a date Modified: branches/rel_0_68/Changes =================================================================== --- branches/rel_0_68/Changes 2012-05-21 20:37:04 UTC (rev 1407) +++ branches/rel_0_68/Changes 2012-05-21 20:37:23 UTC (rev 1408) @@ -3,7 +3,7 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. -0.68 ? +0.68 21 May 2012 Made sure that maps are centred and zoomed properly even when they only contain one point. Made preferences default to never expiring.

1 0

r1407 - in branches/rel_0_68: . lib
by svnadmin＠urchin.earth.li 21 May '12

21 May '12

Author: bob Date: 2012-05-21 21:37:04 +0100 (Mon, 21 May 2012) New Revision: 1407 Modified: branches/rel_0_68/lib/OpenGuides.pm branches/rel_0_68/wiki.cgi Log: bump version for release Modified: branches/rel_0_68/lib/OpenGuides.pm =================================================================== --- branches/rel_0_68/lib/OpenGuides.pm 2012-05-21 20:27:31 UTC (rev 1406) +++ branches/rel_0_68/lib/OpenGuides.pm 2012-05-21 20:37:04 UTC (rev 1407) @@ -14,7 +14,7 @@ use vars qw( $VERSION ); -$VERSION = '0.67'; +$VERSION = '0.68'; =head1 NAME Modified: branches/rel_0_68/wiki.cgi =================================================================== --- branches/rel_0_68/wiki.cgi 2012-05-21 20:27:31 UTC (rev 1406) +++ branches/rel_0_68/wiki.cgi 2012-05-21 20:37:04 UTC (rev 1407) @@ -4,7 +4,7 @@ use warnings; use sigtrap die => 'normal-signals'; use vars qw( $VERSION ); -$VERSION = '0.67'; +$VERSION = '0.68'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r1406 - in branches: . rel_0_68
by svnadmin＠urchin.earth.li 21 May '12

21 May '12

Author: bob Date: 2012-05-21 21:27:31 +0100 (Mon, 21 May 2012) New Revision: 1406 Added: branches/rel_0_68/ Log: branch for release Property changes on: branches/rel_0_68 ___________________________________________________________________ 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 /branches/rel_0_67:1391-1394 Added: svk:merge + 46bc3436-8211-0410-8564-d96f7a728040:/local/openguides/trunk:22808

1 0

r1405 - trunk
by svnadmin＠urchin.earth.li 20 May '12

20 May '12

Author: kake Date: 2012-05-20 16:31:34 +0100 (Sun, 20 May 2012) New Revision: 1405 Modified: trunk/Changes trunk/wiki.cgi Log: Fixed bug with POST redirection introduced in [1315]. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-05-13 09:26:50 UTC (rev 1404) +++ trunk/Changes 2012-05-20 15:31:34 UTC (rev 1405) @@ -3,6 +3,12 @@ More detailed changelogs can be found at <http://dev.openguides.org/log/trunk>. +0.68 ? + Made sure that maps are centred and zoomed properly even when they only + contain one point. + Made preferences default to never expiring. + Fixed POST bug introduced with whitespace redirection in version 0.66. + 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 Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2012-05-13 09:26:50 UTC (rev 1404) +++ trunk/wiki.cgi 2012-05-20 15:31:34 UTC (rev 1405) @@ -32,13 +32,18 @@ $formatter = $wiki->formatter; $q = CGI->new; - # See if we need to redirect due to spaces in URL. - my $redirect = OpenGuides::CGI->check_spaces_redirect( + # See if we need to redirect due to spaces in URL. Don't do this for + # POST requests though - it leads to all the data being stuffed into the + # URL, which breaks things if there's a lot of data. + my $request_method = $q->request_method() || ""; + unless ( $request_method eq "POST" ) { + my $redirect = OpenGuides::CGI->check_spaces_redirect( cgi_obj => $q, wiki => $wiki ); - if ( $redirect ) { - print $q->redirect( -uri => $redirect, -status => 303 ); - exit 0; + if ( $redirect ) { + print $q->redirect( -uri => $redirect, -status => 303 ); + exit 0; + } } # No redirect - carry on. @@ -47,7 +52,6 @@ # If we did a post, then CGI->param probably hasn't fully de-escaped, # in the same way as a get would've done - my $request_method = $q->request_method() || ''; if($request_method eq 'POST') { $node = uri_unescape($node); }

1 0

r1404 - trunk/templates
by svnadmin＠urchin.earth.li 13 May '12

13 May '12

Author: kake Date: 2012-05-13 10:26:50 +0100 (Sun, 13 May 2012) New Revision: 1404 Modified: trunk/templates/footer.tt Log: Fixed indentation in footer template. Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2012-05-13 09:23:57 UTC (rev 1403) +++ trunk/templates/footer.tt 2012-05-13 09:26:50 UTC (rev 1404) @@ -24,17 +24,17 @@ [% INCLUDE delete_link %] <p> Powered by <a href="[% full_cgi_url%]?action=about">OpenGuides [% openguides_version %]</a>. -[% IF read_only %] -This guide is in read-only mode. -[% END %] + [% IF read_only %] + This guide is in read-only mode. + [% END %] </p> [% IF licence_name %] <p> This work is licensed under the [% IF licence_url %] - <a href="[% licence_url %]">[% licence_name %]</a> - [% ELSE %] - [% licence_name %] + <a href="[% licence_url %]">[% licence_name %]</a> + [% ELSE %] + [% licence_name %] [% END %] licence [% IF licence_info_url %]

1 0

r1403 - trunk/static
by svnadmin＠urchin.earth.li 13 May '12

13 May '12

Author: kake Date: 2012-05-13 10:23:57 +0100 (Sun, 13 May 2012) New Revision: 1403 Modified: trunk/static/map-leaflet.js Log: Fixed node maps (that I broke in [1399]). Modified: trunk/static/map-leaflet.js =================================================================== --- trunk/static/map-leaflet.js 2012-05-13 09:20:51 UTC (rev 1402) +++ trunk/static/map-leaflet.js 2012-05-13 09:23:57 UTC (rev 1403) @@ -27,14 +27,14 @@ layers: [ osm_layer ], } ); - if ( min_lat && ( min_lat != max_lat ) ) { + if ( !min_lat ) { + map.setView( map_centre, 13 ); + } else if ( min_lat == max_lat && min_long == max_long) { + map.setView( new L.LatLng( min_lat, min_long ), 18 ); + } else { 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 ); } var layersControl = new L.Control.Layers( {

1 0

r1402 - trunk/templates
by svnadmin＠urchin.earth.li 13 May '12

13 May '12

Author: kake Date: 2012-05-13 10:20:51 +0100 (Sun, 13 May 2012) New Revision: 1402 Modified: trunk/templates/footer.tt Log: Add try/catch thing to stop error for people who have Google Analytics blocked. Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2012-05-13 08:19:49 UTC (rev 1401) +++ trunk/templates/footer.tt 2012-05-13 09:20:51 UTC (rev 1402) @@ -55,8 +55,10 @@ </script> <script type="text/javascript"> - var pageTracker = _gat._getTracker("[% config.google_analytics_key %]"); - pageTracker._trackPageview(); + try { + var pageTracker = _gat._getTracker("[% config.google_analytics_key %]"); + pageTracker._trackPageview(); + } catch(err) {} </script> [% 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 May 2012