openguides-commits

openguides-commits@lists.openguides.org

873 discussions

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

r1391 - in branches: . rel_0_67
by svnadmin＠urchin.earth.li 07 May '12

07 May '12

Author: bob Date: 2012-05-07 10:47:20 +0100 (Mon, 07 May 2012) New Revision: 1391 Added: branches/rel_0_67/ Log: branch for release. Property changes on: branches/rel_0_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

r1390 - trunk
by svnadmin＠urchin.earth.li 06 May '12

06 May '12

Author: bob Date: 2012-05-06 02:10:42 +0100 (Sun, 06 May 2012) New Revision: 1390 Modified: trunk/Build.PL Log: fix meta information so a dist can be created. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2012-05-05 21:14:13 UTC (rev 1389) +++ trunk/Build.PL 2012-05-06 01:10:42 UTC (rev 1390) @@ -357,11 +357,7 @@ MailingList => 'openguides-dev(a)lists.openguides.org', homepage => 'http://openguides.org', bugtracker => 'http://dev.openguides.org', - repository => { - url => 'https://urchin.earth.li/svn/openguides', - web => 'http://dev.openguides.org/browser', - type => 'svn', - }, + repository => 'https://urchin.earth.li/svn/openguides', } }, dynamic_config => 1,

1 0

r1389 - trunk
by svnadmin＠urchin.earth.li 05 May '12

05 May '12

Author: bob Date: 2012-05-05 22:14:13 +0100 (Sat, 05 May 2012) New Revision: 1389 Modified: trunk/Changes Log: update Changes with change for #298 Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-05-05 20:00:39 UTC (rev 1388) +++ trunk/Changes 2012-05-05 21:14:13 UTC (rev 1389) @@ -36,6 +36,7 @@ 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). 0.66 12 April 2012 All templates now have access to the "username" TT variable.

1 0

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

05 May '12

Author: bob Date: 2012-05-05 21:00:39 +0100 (Sat, 05 May 2012) New Revision: 1388 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/CGI.pm Log: move setting no value if undef into the lc() fixes #298 Modified: trunk/lib/OpenGuides/CGI.pm =================================================================== --- trunk/lib/OpenGuides/CGI.pm 2012-05-05 12:20:04 UTC (rev 1387) +++ trunk/lib/OpenGuides/CGI.pm 2012-05-05 20:00:39 UTC (rev 1388) @@ -525,7 +525,7 @@ @options = map { s/^Category //; s/^Locale //; $_ } @options; my %labels = map { lc( $_ ) => $_ } @options; my @values = sort keys %labels; - my $default = lc( $args{value} ) || ""; + my $default = lc( $args{value} || ""); my $q = CGI->new( "" ); return $q->popup_menu( -name => $field_name, Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-05-05 12:20:04 UTC (rev 1387) +++ trunk/lib/OpenGuides.pm 2012-05-05 20:00:39 UTC (rev 1388) @@ -2508,9 +2508,9 @@ # Redirection for legacy URLs. sub redirect_index_search { my ( $self, %args ) = @_; - my $type = lc( $args{type} ) || ""; - my $value = lc( $args{value} ) || ""; - my $format = lc( $args{format} ) || ""; + my $type = lc( $args{type} || "" ); + my $value = lc( $args{value} || "" ); + my $format = lc( $args{format} || "" ); my $script_url = $self->config->script_url; my $script_name = $self->config->script_name;

1 0

r1387 - trunk/templates
by svnadmin＠urchin.earth.li 05 May '12

05 May '12

Author: kake Date: 2012-05-05 13:20:04 +0100 (Sat, 05 May 2012) New Revision: 1387 Modified: trunk/templates/map_index_leaflet.tt Log: Added message in place of map for people without JavaScript. Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-05-05 12:14:17 UTC (rev 1386) +++ trunk/templates/map_index_leaflet.tt 2012-05-05 12:20:04 UTC (rev 1387) @@ -56,8 +56,15 @@ <p class="no_nodes_on_map">No pages with geodata - nothing to display on map!</p> [% ELSE %] + <span id="map_index_no_js"> + <p>Sorry! JavaScript is required to view the map - you may prefer to + <a href="[% feed_base %]">view the results as a list</a> instead.</p> + </span> + <script type="text/javascript"> + $('#map_index_no_js').hide(); + map_div_id = 'map_index_canvas'; centre_lat = [% centre_lat %]; centre_long = [% centre_long %];

1 0

r1386 - in trunk: t templates
by svnadmin＠urchin.earth.li 05 May '12

05 May '12

Author: kake Date: 2012-05-05 13:14:17 +0100 (Sat, 05 May 2012) New Revision: 1386 Modified: trunk/t/904_leaflet.t trunk/templates/map_index_leaflet.tt Log: Fixed <title> on map index. Modified: trunk/t/904_leaflet.t =================================================================== --- trunk/t/904_leaflet.t 2012-05-05 11:34:21 UTC (rev 1385) +++ trunk/t/904_leaflet.t 2012-05-05 12:14:17 UTC (rev 1386) @@ -11,8 +11,11 @@ "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 23; +eval { require Test::HTML::Content; }; +my $thc = $@ ? 0 : 1; +plan tests => 25; + my $config = OpenGuides::Test->make_basic_config; $config->static_url( "http://example.com/static" ); my $guide = OpenGuides->new( config => $config ); @@ -173,3 +176,13 @@ "...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" ); + +# Check titles when showing map of everything. +$output = $guide->show_index( format => "map", noheaders => 1, + return_output => 1 ); +SKIP: { + skip "Test::HTML::Content not available", 1 unless $thc; + Test::HTML::Content::title_ok( $output, qr/Map of all nodes/, + "<title> correct when showing map of everything" ); +} +like( $output, qr/<h2>Map\s+of\s+all\s+nodes/, "...as is <h2> title" ); Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-05-05 11:34:21 UTC (rev 1385) +++ trunk/templates/map_index_leaflet.tt 2012-05-05 12:14:17 UTC (rev 1386) @@ -1,6 +1,10 @@ [% USE JSON.Escape %] -[% page_title = "Map of $criteria_title - $site_name" %] +[% IF criteria %] + [% page_title = "Map of $criteria_title - $site_name" %] +[% ELSE %] + [% page_title = "Map of all nodes - $site_name" %] +[% END %] [% INCLUDE header.tt %] [% INCLUDE banner.tt %]

1 0

r1385 - in trunk: static templates
by svnadmin＠urchin.earth.li 05 May '12

05 May '12

Author: kake Date: 2012-05-05 12:34:21 +0100 (Sat, 05 May 2012) New Revision: 1385 Modified: trunk/static/map-leaflet.js trunk/templates/map_index_leaflet.tt Log: Use fitBounds to do map index zoom; also, only load OSM layer by default, for faster loading. Modified: trunk/static/map-leaflet.js =================================================================== --- trunk/static/map-leaflet.js 2012-05-05 10:57:04 UTC (rev 1384) +++ trunk/static/map-leaflet.js 2012-05-05 11:34:21 UTC (rev 1385) @@ -1,4 +1,4 @@ -var centre_lat, centre_long, map, map_div_id; +var centre_lat, centre_long, min_lat, min_long, max_lat, max_long, map, map_div_id; var positions = [], markers = []; var gicon = L.Icon.extend( { @@ -24,10 +24,17 @@ map = new L.Map( map_div_id, { center: map_centre, - zoom: 13, - layers: [ mapquest_layer, osm_layer ], + layers: [ osm_layer ], } ); + if ( min_lat ) { + var bounds = new L.LatLngBounds( new L.LatLng( min_lat, min_long ), + new L.LatLng( max_lat, max_long ) ); + map.fitBounds( bounds ); + } else { + map.setView( map_centre, 13 ); + } + var layersControl = new L.Control.Layers( { "MapQuest": mapquest_layer, "OpenStreetMap": osm_layer, Modified: trunk/templates/map_index_leaflet.tt =================================================================== --- trunk/templates/map_index_leaflet.tt 2012-05-05 10:57:04 UTC (rev 1384) +++ trunk/templates/map_index_leaflet.tt 2012-05-05 11:34:21 UTC (rev 1385) @@ -57,6 +57,10 @@ map_div_id = 'map_index_canvas'; centre_lat = [% centre_lat %]; centre_long = [% centre_long %]; + min_lat = [% min_lat %]; + max_lat = [% max_lat %]; + min_long = [% min_long %]; + max_long = [% max_long %]; function add_markers() { var node;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
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