openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1414 - sites/oxford.openguides.org/static/resources
by svnadmin＠urchin.earth.li 18 Jun '12

18 Jun '12

Author: dom Date: 2012-06-18 22:59:39 +0100 (Mon, 18 Jun 2012) New Revision: 1414 Modified: sites/oxford.openguides.org/static/resources/og-css2.css Log: hack to try and sort out image floating problems http://urchin.earth.li/pipermail/openguides-oxford/2012/000192.html Modified: sites/oxford.openguides.org/static/resources/og-css2.css =================================================================== --- sites/oxford.openguides.org/static/resources/og-css2.css 2012-06-15 18:28:42 UTC (rev 1413) +++ sites/oxford.openguides.org/static/resources/og-css2.css 2012-06-18 21:59:39 UTC (rev 1414) @@ -187,3 +187,12 @@ div#node_image_box { float: right; } + +#metadata { + margin-bottom: 80px; +} + +div#node_image_box { + float: left; + margin-right: 30px; +}

1 0

r1413 - in trunk: . templates
by svnadmin＠urchin.earth.li 15 Jun '12

15 Jun '12

Author: kake Date: 2012-06-15 19:28:42 +0100 (Fri, 15 Jun 2012) New Revision: 1413 Modified: trunk/Changes trunk/templates/node.tt Log: Fixed a JavaScript escaping issue for nodes with apostrophes in names. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-06-04 20:18:13 UTC (rev 1412) +++ trunk/Changes 2012-06-15 18:28:42 UTC (rev 1413) @@ -5,6 +5,7 @@ 0.69 ? The output of the "show_missing_metadata" action is now alphabetised. + Fixed a JavaScript escaping issue for nodes with apostrophes in names. 0.68 21 May 2012 Made sure that maps are centred and zoomed properly even when they only Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2012-06-04 20:18:13 UTC (rev 1412) +++ trunk/templates/node.tt 2012-06-15 18:28:42 UTC (rev 1413) @@ -1,4 +1,5 @@ [% USE CGI %] +[% USE JSON.Escape %] [% INCLUDE header.tt %] [% INCLUDE banner.tt %] @@ -27,7 +28,7 @@ var position = new L.LatLng( [% wgs84_lat %], [% wgs84_long %] ); marker = new L.Marker( position, { icon: new gicon() } ); map.addLayer( marker ); - marker.bindPopup( '[% node_name %]' ); + marker.bindPopup( [% node_name.json %] ); } </script> [% ELSIF gmaps_api_key %]

1 0

r1412 - in trunk: . lib t
by svnadmin＠urchin.earth.li 04 Jun '12

04 Jun '12

Author: kake Date: 2012-06-04 21:18:13 +0100 (Mon, 04 Jun 2012) New Revision: 1412 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/t/701_missing_metadata.t Log: The output of the "show_missing_metadata" action is now alphabetised. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-05-23 20:11:33 UTC (rev 1411) +++ trunk/Changes 2012-06-04 20:18:13 UTC (rev 1412) @@ -4,8 +4,8 @@ <http://dev.openguides.org/log/trunk>. 0.69 ? + The output of the "show_missing_metadata" action is now alphabetised. - 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:11:33 UTC (rev 1411) +++ trunk/lib/OpenGuides.pm 2012-06-04 20:18:13 UTC (rev 1412) @@ -2279,7 +2279,7 @@ # Build nice edit etc links for our nodes my @tt_nodes; - for my $node (@nodes) { + for my $node (sort @nodes) { my %n; # Make the URLs Modified: trunk/t/701_missing_metadata.t =================================================================== --- trunk/t/701_missing_metadata.t 2012-05-23 20:11:33 UTC (rev 1411) +++ trunk/t/701_missing_metadata.t 2012-06-04 20:18:13 UTC (rev 1412) @@ -11,8 +11,8 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 26; - OpenGuides::Test::refresh_db(); +plan tests => 27; +OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; $config->script_name( "wiki.cgi" ); @@ -22,8 +22,6 @@ my $wiki = $guide->wiki; isa_ok( $wiki, "Wiki::Toolkit" ); - - # Add four different pages, one of which with two versions, one of which # a redirect. The redirect should not show up on any "missing metadata" # searches, regardless of the condition of the page it points to. @@ -96,6 +94,11 @@ is( $nodes[2]->{'name'}, "Test Page", "Right nodes" ); is( $nodes[3]->{'name'}, "Test Page 3", "Right nodes" ); +# Make sure they're returned in alphabetical order. +my @nodenames = map { $_->{name} } @{$ttvars{nodes}}; +is_deeply( \@nodenames, + [ "Category Foo", "Locale Bar", "Test Page", "Test Page 3" ], + "Nodes are returned in alphabetical order" ); # Try again, but exclude locale and category %ttvars = eval {

1 0

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

← Newer
1
...
25
26
27
28
29
30
31
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits