openguides-commits June 2007

openguides-commits@lists.openguides.org

1 participants
59 discussions

r1050 - in trunk: . t templates
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: ilmari Date: 2007-06-09 20:10:30 +0100 (Sat, 09 Jun 2007) New Revision: 1050 Added: trunk/t/59_preferences.t Modified: trunk/Changes trunk/MANIFEST trunk/templates/preferences.tt Log: Only display the google maps preference if node maps are enabled (fixes #192) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-09 18:46:46 UTC (rev 1049) +++ trunk/Changes 2007-06-09 19:10:30 UTC (rev 1050) @@ -11,6 +11,8 @@ Removed dependency on Test::MockObject. Remove misleading CSS examples Support alternative database ports + Only display the google maps preference if node maps are enabled + (#192). 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-09 18:46:46 UTC (rev 1049) +++ trunk/MANIFEST 2007-06-09 19:10:30 UTC (rev 1050) @@ -122,6 +122,7 @@ t/56_diffs_with_macros.t t/57_random_page.t t/58_recent_changes_navbar.t +t/59_preferences.t t/61_bug_textareas.t t/62_bug_trailing_whitespace.t t/63_bug_map_link_no_address.t Added: trunk/t/59_preferences.t =================================================================== --- trunk/t/59_preferences.t (rev 0) +++ trunk/t/59_preferences.t 2007-06-09 19:10:30 UTC (rev 1050) @@ -0,0 +1,69 @@ +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides; +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 DBD::SQLite; }; +if ( $@ ) { + plan skip_all => "DBD::SQLite not installed - no database to test with"; + exit 0; +} + +eval { require Test::HTML::Content; }; +if ( $@ ) { + plan skip_all => "Test::HTML::Content not installed"; + exit 0; +} + +plan tests => 2; + +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/prefs.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/prefs.db" } ); +my $config = OpenGuides::Test->make_basic_config; +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; + +$config->gmaps_api_key( "This is not a real API key." ); +$config->show_gmap_in_node_display( 1 ); + +my $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + display_google_maps => 1, + ); +$ENV{HTTP_COOKIE} = $cookie; + +# If the google API is present and node maps are enabled, we should have the pref +Test::HTML::Content::tag_ok( get_output($wiki, $config), 'input', + { type => 'checkbox', name => 'display_google_maps' }, + 'Google maps pref shown' + ); + +# But not if the node map is globally disabled +$config->show_gmap_in_node_display( 0 ); +Test::HTML::Content::no_tag( get_output($wiki, $config), 'input', + { type => 'checkbox', name => 'display_google_maps' }, + 'No google maps prefs if node maps disabled' + ); + +sub get_output { + my ($wiki, $config) = @_; + + return OpenGuides::Template->output( + wiki => $wiki, + config => $config, + template => "preferences.tt", + content_type => '', + vars => { OpenGuides::CGI->get_prefs_from_cookie( config => $config ), + not_editable => 1, + show_form => 1 + }, + ); +} + Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2007-06-09 18:46:46 UTC (rev 1049) +++ trunk/templates/preferences.tt 2007-06-09 19:10:30 UTC (rev 1050) @@ -66,7 +66,7 @@ <label for="track_recent_changes_views">Track my visits to Recent Changes and offer me a link for “changes since I last viewed Recent Changes”.</label> </p> - [% IF gmaps_api_key %] + [% IF gmaps_api_key AND config.show_gmap_in_node_display %] <p> [% IF display_google_maps %] <input type="checkbox" id="display_google_maps" name="display_google_maps" value="1" checked="1" /> @@ -152,7 +152,7 @@ [% UNLESS track_recent_changes_views %] not [% END %] be tracked.</p> - [% IF gmaps_api_key %] + [% IF gmaps_api_key AND config.show_gmap_in_node_display %] <p>Google Maps will [% UNLESS display_google_maps %] not [% END %] be displayed.</p>

1 0

r1049 - in trunk: . templates
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: kake Date: 2007-06-09 19:46:46 +0100 (Sat, 09 Jun 2007) New Revision: 1049 Modified: trunk/MANIFEST trunk/templates/header.tt trunk/templates/map_index.tt Log: Add test to MANIFEST that I forgot to add in [1045]. Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-09 18:40:16 UTC (rev 1048) +++ trunk/MANIFEST 2007-06-09 18:46:46 UTC (rev 1049) @@ -121,6 +121,7 @@ t/55_node_history.t t/56_diffs_with_macros.t t/57_random_page.t +t/58_recent_changes_navbar.t t/61_bug_textareas.t t/62_bug_trailing_whitespace.t t/63_bug_map_link_no_address.t Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2007-06-09 18:40:16 UTC (rev 1048) +++ trunk/templates/header.tt 2007-06-09 18:46:46 UTC (rev 1049) @@ -33,9 +33,9 @@ <link rel="alternate" type="application/rss+xml" title="Page as RSS" href="[% feed_base %];format=rss" /> <link rel="alternate" type="application/atom+xml" title="Page as Atom" href="[% feed_base %];format=atom" /> [% END %] - [% IF latitude AND longitude %] - <meta name="ICBM" content="[% latitude %], [% longitude %]" /> - <meta name="geo.position" content="[% latitude %], [% longitude %]" /> + [% IF wgs84_lat AND wgs84_long %] + <meta name="ICBM" content="[% wgs84_lat %], [% wgs84_long %]" /> + <meta name="geo.position" content="[% wgs84_lat %], [% wgs84_long %]" /> [% END %] <link rel="alternate" type="application/rss+xml" title="[% site_name %] - Recent Changes (RSS 1.0)" href="[% full_cgi_url %]?action=rc;format=rss" /> <link rel="alternate" type="application/atom+xml" title="[% site_name %] - Recent Changes (Atom)" href="[% full_cgi_url %]?action=rc;format=atom" /> Modified: trunk/templates/map_index.tt =================================================================== --- trunk/templates/map_index.tt 2007-06-09 18:40:16 UTC (rev 1048) +++ trunk/templates/map_index.tt 2007-06-09 18:46:46 UTC (rev 1049) @@ -11,9 +11,9 @@ [% FOREACH node = nodes %] [% metadata = node.node_data.metadata %] [% i = i + 1 %] - [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] - [% NEXT IF metadata.latitude.list.first.match('m') %] - [% NEXT IF metadata.longitude.list.first.match('m') %] + [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %] + [% NEXT IF metadata.wgs84_lat.list.first.match('m') %] + [% NEXT IF metadata.wgs84_long.list.first.match('m') %] <li><a href='#' onclick="marker[% i %].openInfoWindowHtml(htmlString[% i %]); return false;">[% node.name %]</a>[% IF metadata.city.list.first %], [% metadata.city.list.first %][% END %]</li> [% END %] [% END %] @@ -39,9 +39,9 @@ [% FOREACH node = nodes %] [% i = i + 1 %] [% metadata = node.node_data.metadata %] - [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] - [% NEXT IF metadata.latitude.list.first.match('m') %] - [% NEXT IF metadata.longitude.list.first.match('m') %] + [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %] + [% NEXT IF metadata.wgs84_lat.list.first.match('m') %] + [% NEXT IF metadata.wgs84_long.list.first.match('m') %] var point[% i %] = new GPoint([% metadata.wgs84_long.list.first %], [% metadata.wgs84_lat.list.first %]); var marker[% i %] = new GMarker(point[% i %],baseIcon); [% IF metadata.source %]

1 0

r1048 - trunk
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: dom Date: 2007-06-09 19:40:16 +0100 (Sat, 09 Jun 2007) New Revision: 1048 Modified: trunk/MANIFEST Log: Remove old example CSS files Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-09 18:36:40 UTC (rev 1047) +++ trunk/MANIFEST 2007-06-09 18:40:16 UTC (rev 1048) @@ -12,9 +12,7 @@ SIGNATURE TROUBLESHOOTING UPGRADING -examples/london.css examples/reindex.pl -examples/vegan-oxford.css lib/OpenGuides/Build.pm lib/OpenGuides/CGI.pm lib/OpenGuides/Config.pm

1 0

r1047 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: ilmari Date: 2007-06-09 19:36:40 +0100 (Sat, 09 Jun 2007) New Revision: 1047 Modified: trunk/lib/OpenGuides/Template.pm Log: Mention that the config object is passed to templates Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-09 18:23:34 UTC (rev 1046) +++ trunk/lib/OpenGuides/Template.pm 2007-06-09 18:36:40 UTC (rev 1047) @@ -56,11 +56,11 @@ Returns everything you need to send to STDOUT, including the Content-Type: header. Croaks unless C<template> is supplied. -The variables supplied in C<vars> are passed through to the template -specified. Additional Template Toolkit variables are automatically -set and passed through as well, as described below. B<Note:> -variables set in C<vars> will over-ride any variables of the same name -in the config object or the user cookies. +The config object and variables supplied in C<vars> are passed through +to the template specified. Additional Template Toolkit variables are +automatically set and passed through as well, as described below. +B<Note:> variables set in C<vars> will over-ride any variables of the +same name in the config object or the user cookies. =over

1 0

r1046 - trunk
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: dom Date: 2007-06-09 19:23:34 +0100 (Sat, 09 Jun 2007) New Revision: 1046 Modified: trunk/Build.PL trunk/Changes trunk/PREREQUISITES Log: Be able to specify dbport (closes #165) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2007-06-09 16:49:43 UTC (rev 1045) +++ trunk/Build.PL 2007-06-09 18:23:34 UTC (rev 1046) @@ -92,7 +92,7 @@ my $use_plucene = 1; # keep track of this so we know what to put in prereqs my $centre_lat = ''; # contains centre lat derived from Google Maps URL foreach my $var ( qw( - dbname dbuser dbpass dbhost script_name + dbname dbuser dbpass dbhost dbport script_name install_directory template_path custom_template_path script_url custom_lib_path use_plucene indexing_directory enable_page_deletion admin_pass stylesheet_url site_name navbar_on_home_page @@ -118,7 +118,8 @@ } if ( $dbtype eq "sqlite" and - ( $var eq "dbuser" or $var eq "dbpass" or $var eq "dbhost" ) + ( $var eq "dbuser" or $var eq "dbpass" or $var eq "dbhost" or + $var eq "dbport") ) { print "$var not relevant for SQLite... skipping...\n" unless $skip_config; @@ -276,7 +277,7 @@ 'CGI' => '2.92', # avoid escapeHTML bug 'CGI::Carp' => 0, 'CGI::Cookie' => 0, - 'Wiki::Toolkit' => '0.73', + 'Wiki::Toolkit' => '0.74', # for dbport 'Wiki::Toolkit::Feed::Atom' => 0, 'Wiki::Toolkit::Feed::RSS' => 0, 'Wiki::Toolkit::Formatter::UseMod' => 0, Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-09 16:49:43 UTC (rev 1045) +++ trunk/Changes 2007-06-09 18:23:34 UTC (rev 1046) @@ -10,6 +10,7 @@ want it, add div#title_edit_link {display:none;} to your stylesheet. Removed dependency on Test::MockObject. Remove misleading CSS examples + Support alternative database ports 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2007-06-09 16:49:43 UTC (rev 1045) +++ trunk/PREREQUISITES 2007-06-09 18:23:34 UTC (rev 1046) @@ -6,7 +6,7 @@ CGI (version 2.92 or later) CGI::Carp CGI::Cookie -Wiki::Toolkit (version 0.73 or later) +Wiki::Toolkit (version 0.74 or later) Wiki::Toolkit::Feed::Atom Wiki::Toolkit::Feed::RSS Wiki::Toolkit::Formatter::UseMod

1 0

r1045 - in trunk: . lib t
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: kake Date: 2007-06-09 17:49:43 +0100 (Sat, 09 Jun 2007) New Revision: 1045 Added: trunk/t/58_recent_changes_navbar.t Modified: trunk/lib/OpenGuides.pm trunk/newpage.cgi Log: Make sure that common categories and locales (if configured) show up on recent changes and create new page form (fixes #199). Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-09 14:38:14 UTC (rev 1044) +++ trunk/lib/OpenGuides.pm 2007-06-09 16:49:43 UTC (rev 1045) @@ -628,6 +628,13 @@ } } $tt_vars{not_editable} = 1; + if ($config->enable_common_categories || $config->enable_common_locales) { + $tt_vars{common_catloc} = 1; + $tt_vars{common_categories} = $config->enable_common_categories; + $tt_vars{common_locales} = $config->enable_common_locales; + $tt_vars{catloc_link} = $config->script_url . $config->script_name + . "?id="; + } $tt_vars{recent_changes} = \%recent_changes; my %processing_args = ( id => $id, Modified: trunk/newpage.cgi =================================================================== --- trunk/newpage.cgi 2007-06-09 14:38:14 UTC (rev 1044) +++ trunk/newpage.cgi 2007-06-09 16:49:43 UTC (rev 1045) @@ -30,15 +30,24 @@ } sub show_form { + my %tt_vars = ( + not_editable => 1, + not_deletable => 1, + deter_robots => 1, + disallowed_chars => \@badchars, + pagename => $pagename, + ); + if ($config->enable_common_categories || $config->enable_common_locales) { + $tt_vars{common_catloc} = 1; + $tt_vars{common_categories} = $config->enable_common_categories; + $tt_vars{common_locales} = $config->enable_common_locales; + $tt_vars{catloc_link} = $config->script_url . $config->script_name + . "?id="; + } print OpenGuides::Template->output( wiki => $wiki, config => $config, template => "newpage.tt", - vars => { - not_editable => 1, - not_deletable => 1, - deter_robots => 1, - disallowed_chars => \@badchars, - pagename => $pagename } + vars => \%tt_vars, ); } Added: trunk/t/58_recent_changes_navbar.t =================================================================== --- trunk/t/58_recent_changes_navbar.t (rev 0) +++ trunk/t/58_recent_changes_navbar.t 2007-06-09 16:49:43 UTC (rev 1045) @@ -0,0 +1,56 @@ +use strict; +use OpenGuides; +use OpenGuides::Test; +use Test::More; +use Wiki::Toolkit::Setup::SQLite; + +eval { require DBD::SQLite; }; +if ( $@ ) { + plan skip_all => "DBD::SQLite not installed - no database to test with"; + exit 0; +} + +eval { require Test::HTML::Content; }; +if ( $@ ) { + plan skip_all => "Test::HTML::Content not installed"; + exit 0; +} + +plan tests => 4; + +my ( $config, $guide, $wiki, $output ); + +# Clear out the database from any previous runs. +unlink "t/node.db"; +unlink <t/indexes/*>; +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + +# Make a guide with common categories and locales enabled. +$config = OpenGuides::Test->make_basic_config; +$config->enable_common_categories( 1 ); +$config->enable_common_locales( 1 ); +$guide = OpenGuides->new( config => $config ); + +# Make sure common categories and locales show up on recent changes display. +$output = $guide->display_recent_changes( + return_output => 1, + ); +$output =~ s/^Content-Type.*[\r\n]+//m; +Test::HTML::Content::tag_ok( $output, "div", { id => "navbar_categories" }, + "common categories in recent changes navbar" ); +Test::HTML::Content::tag_ok( $output, "div", { id => "navbar_locales" }, + "...common locales too" ); + +# Now make a guide with common categories and locales disabled. +$config = OpenGuides::Test->make_basic_config; +$guide = OpenGuides->new( config => $config ); + +# Make sure common categories/locales are omitted from recent changes display. +$output = $guide->display_recent_changes( + return_output => 1, + ); +$output =~ s/^Content-Type.*[\r\n]+//m; +Test::HTML::Content::no_tag( $output, "div", { id => "navbar_categories" }, + "common categories in recent changes navbar" ); +Test::HTML::Content::no_tag( $output, "div", { id => "navbar_locales" }, + "...common locales too" );

1 0

r1044 - trunk/lib
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: kake Date: 2007-06-09 15:38:14 +0100 (Sat, 09 Jun 2007) New Revision: 1044 Modified: trunk/lib/OpenGuides.pm Log: Fix uninitialized value warning in test 53 (fixes #168). Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-09 14:11:28 UTC (rev 1043) +++ trunk/lib/OpenGuides.pm 2007-06-09 14:38:14 UTC (rev 1044) @@ -781,6 +781,9 @@ return_output => 1, ); +If either the C<type> or the C<value> parameter is omitted, then all pages +will be returned. + =cut sub show_index { @@ -906,7 +909,6 @@ %conf = ( %conf, - node => "$args{type} index", # KLUDGE template => $template, tt_vars => \%tt_vars, );

1 0

r1043 - in trunk: . examples
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: dom Date: 2007-06-09 15:11:28 +0100 (Sat, 09 Jun 2007) New Revision: 1043 Removed: trunk/examples/london.css trunk/examples/vegan-oxford.css Modified: trunk/Changes Log: Remove misleading CSS examples Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-09 13:47:33 UTC (rev 1042) +++ trunk/Changes 2007-06-09 14:11:28 UTC (rev 1043) @@ -9,6 +9,7 @@ Added extra "edit this page" link next to the node name; if you don't want it, add div#title_edit_link {display:none;} to your stylesheet. Removed dependency on Test::MockObject. + Remove misleading CSS examples 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Deleted: trunk/examples/london.css =================================================================== --- trunk/examples/london.css 2007-06-09 13:47:33 UTC (rev 1042) +++ trunk/examples/london.css 2007-06-09 14:11:28 UTC (rev 1043) @@ -1,199 +0,0 @@ -body -{ - background: #fff; - color: #000; - margin: 0px -} - -a:link -{ - background: transparent; - color: #00f -} - -a:visited -{ - background: transparent; - color: #f00 -} - -a:hover -{ - background: transparent; - color: #00f -} - -/* The banner that runs across the top of all nodes */ -#banner -{ - padding: 10px; - background-color: #ccc; - color: #fff; - border-bottom: 1px solid #000 -} - -/* The area underneath the banner on all nodes */ -#content -{ - padding: 1em -} - -/* The navigation bar that appears on all nodes */ -#navbar -{ - float: right; - width: 175px; - padding: 10px; - border: 1px solid #000; - background-color: #fff; - color: #000; - font-size: 0.8em; - margin: 0px 0px 10px 10px -} - -/* A group of items in the navbar */ -.navbar_group -{ -} - -/* A title for that group */ -.navbar_group_title -{ - margin: 1em 0em 0em 0em; - font-weight: bold -} - -/* An item in the navbar */ -.navbar_item -{ - margin-top: 0em; - margin-bottom: 0em -} - -/* The "Search" label, text field and "Go" button in the navbar */ -.search_group -{ -} - -/* The "Search" label itself */ -.search_label -{ - font-weight: bold -} - -/* The link on all nodes saying "edit this page" */ -.edit_page_link -{ - font-weight: bold; - margin-bottom: 1em; - padding-top: 1em; - border-top: 1px solid #000 -} - -/* The Recent Changes listing on the home page */ -#recent -{ - float: right; - padding: 1em; - border: 1px dashed #666; - width: 250px; - margin: 10px; - font-size: 0.8em -} - -/* An item title in the listing */ -#recent dt -{ - font-weight: bold -} - -/* An item definition in the listing */ -#recent dd -{ -} - -/* The name of a node */ -.node_name -{ - font-style: italic -} - -/* Listing of categories and locales for a node */ -#categories_and_locales -{ - font-size: small -} - -/* The widget for distance lookups */ -#find_within_distance -{ -} - -/* The listing of coordinates on nodes with geo metadata */ -#coordinates -{ -} - -/* The node version indicator */ -#version -{ - margin-top: 10px; - font-size: small -} - -/* The 'RDF/XML for this node' link that appears on all nodes */ -#rdf_link -{ - font-size: small; - float: right -} - -/* The search form that appears on all nodes */ -#search_form -{ - padding-top: 10px; - border-top: 1px solid #999 -} - -/* The footer that appears on all nodes */ -#footer -{ - margin-top: 10px; - padding-top: 10px; - border-top: 1px solid #999; - font-size: 0.8em; - text-align: right -} - -/* Submit buttons in forms */ -input.form_button -{ - font-size: 0.9em; - font-style: bold; - background-color: #fff; - color: #000 -} - -/* The 'before' part of a diff listing */ -.diff1 -{ - background-color: yellow; -} - -/* The 'after' part of a diff listing */ -.diff2 -{ - background-color: pink; -} - -/* Hidden elements */ -.hidden -{ - display: none; -} - -/* Labels for form elements */ -.label -{ - font-weight: bold; -} \ No newline at end of file Deleted: trunk/examples/vegan-oxford.css =================================================================== --- trunk/examples/vegan-oxford.css 2007-06-09 13:47:33 UTC (rev 1042) +++ trunk/examples/vegan-oxford.css 2007-06-09 14:11:28 UTC (rev 1043) @@ -1,196 +0,0 @@ -body -{ - background: #fff; - color: #000; - margin: 0px -} - -/* -a:link -{ - background: transparent; - color: #00f -} - -a:visited -{ - background: transparent; - color: #f00 -} - -a:hover -{ - background: transparent; - color: #00f -} -*/ - -/* The banner that runs across the top of all nodes */ -#banner -{ - margin-top/**/: 5em; - padding-top/**/: 0.5em; - padding-right: 10px; - font-size: smaller; - text-align: right; -} - -/* The area underneath the banner on all nodes */ -#content -{ - padding: 0em 1em 1em 1em; -} - -/* The navigation bar that appears on all nodes */ -#navbar -{ - position/**/: absolute; - top/**/: 0px; - left/**/: 0px; - width/**/: 99%; - padding: 0.1em 0.2em 0.1em 0.2em; - background-color: #cfc; - color: #000; - font-size: 0.8em; -} - -/* A group of items in the navbar */ -.navbar_group -{ - float: left; - margin: 0em 1em 0.5em 0em; -} - -/* A title for that group */ -.navbar_group_title -{ - display: inline; - font-weight: bold; -} - -/* An item in the navbar */ -.navbar_item -{ - border-right/**/: 1px solid black; - padding: 0em 0.5em 0em 0.5em; -} - -/* The "Search" label, text field and "Go" button in the navbar */ -.search_group -{ - float: right; -} - -/* The "Search" label itself */ -.search_label -{ - display: inline; - font-weight: bold -} - -/* The link on all nodes saying "edit this page" */ -.edit_page_link -{ - float: right; - text-align: right; - font-weight: bold; - font-size: 1.5em; - padding-right: 5px; -} - -/* The Recent Changes listing on the home page */ -#recent -{ - float: right; - padding: 0em 1em 1em 1em; - border: solid #000; - width: 250px; - margin: 10px; - font-size: 0.9em -} - -/* An item title in the listing */ -#recent dt -{ - font-weight: bold -} - -/* An item definition in the listing */ -#recent dd -{ -} - -/* The name of a node */ -.node_name -{ -} - -/* Listing of categories and locales for a node */ -#categories_and_locales -{ - font-size: small -} - -/* The widget for distance lookups */ -#find_within_distance -{ -} - -/* The listing of coordinates on nodes with geo metadata */ -#coordinates -{ -} - -/* The node version indicator */ -#version -{ - border-top: 1px solid #999; - margin-top: 10px; - font-size: small; - padding-top: 5px; -} - -/* The 'RDF/XML for this node' link that appears on all nodes */ -#rdf_link -{ - font-size: small; - padding-top: 5px; - float: right; -} - -/* The search form that appears on all nodes */ -#search_form -{ - border-top: 1px solid #999; - padding-top: 5px; -} - -/* The footer that appears on all nodes */ -#footer -{ - margin-top: 10px; - padding-top: 10px; - font-size: 0.8em; - text-align: right -} - -/* Submit buttons in forms */ -input.form_button -{ - font-size: 0.9em; - font-style: bold; - background-color: #fff; - color: #000 -} - -/* The 'before' part of a diff listing */ -.diff1 -{ - background-color: yellow; -} - -/* The 'after' part of a diff listing */ -.diff2 -{ - background-color: pink; -}

1 0

r1042 - in trunk: . t
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: kake Date: 2007-06-09 14:47:33 +0100 (Sat, 09 Jun 2007) New Revision: 1042 Modified: trunk/Build.PL trunk/Changes trunk/PREREQUISITES trunk/t/41_deletion.t Log: Remove dependency on Test::MockObject. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2007-06-09 13:36:35 UTC (rev 1041) +++ trunk/Build.PL 2007-06-09 13:47:33 UTC (rev 1042) @@ -297,7 +297,6 @@ $search_module => 0, 'POSIX' => 0, 'Template' => '2.15', # for hash.delete and string.remove vmethods - 'Test::MockObject' => '0.07', # earlier doesn't use 'mock' 'Time::Piece' => 0, 'URI::Escape' => 0, 'XML::RSS' => 0, Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-09 13:36:35 UTC (rev 1041) +++ trunk/Changes 2007-06-09 13:47:33 UTC (rev 1042) @@ -8,6 +8,7 @@ commit_node method in "perldoc OpenGuides" for details. Added extra "edit this page" link next to the node name; if you don't want it, add div#title_edit_link {display:none;} to your stylesheet. + Removed dependency on Test::MockObject. 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2007-06-09 13:36:35 UTC (rev 1041) +++ trunk/PREREQUISITES 2007-06-09 13:47:33 UTC (rev 1042) @@ -40,7 +40,6 @@ Plucene POSIX Template -Test::MockObject (version 0.07 or later) Time::Piece URI::Escape XML::RSS Modified: trunk/t/41_deletion.t =================================================================== --- trunk/t/41_deletion.t 2007-06-09 13:36:35 UTC (rev 1041) +++ trunk/t/41_deletion.t 2007-06-09 13:47:33 UTC (rev 1042) @@ -1,24 +1,18 @@ use strict; -use Wiki::Toolkit::Formatter::UseMod; +use OpenGuides; use OpenGuides::Template; use OpenGuides::Test; -use Test::MockObject; use Test::More tests => 3; my $config = OpenGuides::Test->make_basic_config; $config->site_name( "Test Site" ); $config->script_url( "/" ); -# White box testing - we know that OpenGuides::Template only actually uses -# the node_name_to_node_param method of the formatter component of the wiki -# object passed in, and I CBA to faff about with picking out the test DB -# info to make a proper wiki object here. -my $fake_wiki = Test::MockObject->new; -$fake_wiki->mock("formatter", - sub { return Wiki::Toolkit::Formatter::UseMod->new( munge_urls => 1 ); } ); +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; my $output = OpenGuides::Template->output( - wiki => $fake_wiki, + wiki => $wiki, config => $config, template => "node.tt", ); @@ -26,7 +20,7 @@ "doesn't offer page deletion link by default" ); $config->enable_page_deletion( "y" ); $output = OpenGuides::Template->output( - wiki => $fake_wiki, + wiki => $wiki, config => $config, template => "node.tt", ); @@ -34,7 +28,7 @@ "...but does when enable_page_deletion is set to 'y'" ); $config->enable_page_deletion( 1 ); $output = OpenGuides::Template->output( - wiki => $fake_wiki, + wiki => $wiki, config => $config, template => "node.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 June 2007