openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1054 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: dom Date: 2007-06-10 14:45:21 +0100 (Sun, 10 Jun 2007) New Revision: 1054 Added: trunk/t/50_http_response_codes.t Modified: trunk/MANIFEST trunk/lib/OpenGuides/Template.pm Log: Add support in output routine for specifying HTTP status code (see #102) Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-10 01:50:29 UTC (rev 1053) +++ trunk/MANIFEST 2007-06-10 13:45:21 UTC (rev 1054) @@ -114,6 +114,7 @@ t/47_navbar_placement.t t/48_google_analytics.t t/49_custom_header.t +t/50_http_response_codes.t t/51_display_node.t t/52_display_diffs.t t/53_show_index.t Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-10 01:50:29 UTC (rev 1053) +++ trunk/lib/OpenGuides/Template.pm 2007-06-10 13:45:21 UTC (rev 1054) @@ -109,6 +109,8 @@ Content-Type: defaults to C<text/html> and is omitted if the C<content_type> arg is explicitly set to the blank string. +The HTTP response code may be explictly set with the C<http_status> arg. + =cut sub output { @@ -180,19 +182,31 @@ $tt_vars = { %$tt_vars, %{ $args{vars} || {} } }; my $header = ""; - unless ( defined $args{content_type} and $args{content_type} eq "" ) { - my $content_type; - if ($args{content_type}) { - $content_type = $args{content_type}; + my %cgi_header_args; + + if ( defined $args{content_type} and $args{content_type} eq "" ) { + $cgi_header_args{'-type'} = ''; + } else { + if ( $args{content_type} ) { + $cgi_header_args{'-type'} = $args{content_type}; } else { - $content_type = "text/html"; + $cgi_header_args{'-type'} = "text/html"; } - if ($tt_vars->{http_charset}) { - $content_type .= "; charset=".$tt_vars->{http_charset}; + if ( $tt_vars->{http_charset} ) { + $cgi_header_args{'-type'} .= "; charset=".$tt_vars->{http_charset}; } - $header = CGI::header( -type => $content_type, -cookie => $args{cookies} ); + # XXX should possibly not be inside this block, but retaining + # existing functionality for now. See + # http://dev.openguides.org/ticket/220 + $cgi_header_args{'-cookie'} = $args{cookies}; } + if ( $args{http_status} ) { + $cgi_header_args{'-status'} = $args{http_status}; + } + + $header = CGI::header( %cgi_header_args ); + # vile hack my %field_vars = OpenGuides::Template->extract_metadata_vars( wiki => $args{wiki}, Added: trunk/t/50_http_response_codes.t =================================================================== --- trunk/t/50_http_response_codes.t (rev 0) +++ trunk/t/50_http_response_codes.t 2007-06-10 13:45:21 UTC (rev 1054) @@ -0,0 +1,39 @@ +use strict; +use Cwd; +use OpenGuides; +use OpenGuides::Template; +use OpenGuides::Test; +use Test::More tests => 3; + +my $config = OpenGuides::Test->make_basic_config; +$config->template_path( cwd . "/t/templates" ); + +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; + +eval { + OpenGuides::Template->output( wiki => $wiki, + config => $config, + template => "15_test.tt" ); +}; +is( $@, "", "is happy doing output" ); + +my $output = OpenGuides::Template->output( + wiki => $wiki, + config => $config, + template => "15_test.tt" +); + +unlike( $output, qr/^Status:/, + "HTTP status not printed when not explicitly specified "); + +# Now supply a http status + +$output = OpenGuides::Template->output( + wiki => $wiki, + config => $config, + template => "15_test.tt", + http_status => '404' +); +like( $output, qr/^Status: 404/, + "Correct HTTP status printed when specified" );

1 0

r1053 - trunk/templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 02:50:29 +0100 (Sun, 10 Jun 2007) New Revision: 1053 Modified: trunk/templates/edit_form.tt trunk/templates/missing_metadata.tt trunk/templates/moderate_confirm.tt trunk/templates/preferences.tt Log: Sync up up label tags and form element id attributes (closes #217) Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2007-06-09 21:54:06 UTC (rev 1052) +++ trunk/templates/edit_form.tt 2007-06-10 01:50:29 UTC (rev 1053) @@ -47,7 +47,7 @@ <legend>Main information</legend> <div class="edit_form_group" id="content_group"> - <label for="content"> + <label for="content_textarea"> [% IF conflict %] Current content: [% ELSE %] Modified: trunk/templates/missing_metadata.tt =================================================================== --- trunk/templates/missing_metadata.tt 2007-06-09 21:54:06 UTC (rev 1052) +++ trunk/templates/missing_metadata.tt 2007-06-10 01:50:29 UTC (rev 1053) @@ -31,17 +31,17 @@ </div> <div> <label for="metadata_value">Metadata Value:</label> - <input name="metadata_value" value="[% metadata_value %]" /> + <input name="metadata_value" id="metadata_value" value="[% metadata_value %]" />       <i>Optional, eg 'pub' when metadata value is Category</i> </div> <div> <label for="exclude_locales">Exclude Locales:</label> - <input type="checkbox" name="exclude_locales" [% IF exclude_locales %]checked="true"[% END %] /> + <input type="checkbox" name="exclude_locales" id="exclude_locales" [% IF exclude_locales %]checked="true"[% END %] /> </div> <div> <label for="exclude_categories">Exclude Categories:</label> - <input type="checkbox" name="exclude_categories" [% IF exclude_categories %]checked="true"[% END %] /> + <input type="checkbox" name="exclude_categories" id="exclude_categories" [% IF exclude_categories %]checked="true"[% END %] /> </div> <div> <input type="submit" value="Find Nodes" /> Modified: trunk/templates/moderate_confirm.tt =================================================================== --- trunk/templates/moderate_confirm.tt 2007-06-09 21:54:06 UTC (rev 1052) +++ trunk/templates/moderate_confirm.tt 2007-06-10 01:50:29 UTC (rev 1053) @@ -24,13 +24,13 @@ <input type="hidden" name="id" value="[% node_param %]" /> [% IF moderation_action == 'set_moderation' %] <label for="moderation_flag">Moderation Required:</label> - <input type="checkbox" name="moderation_flag" [% IF moderation_flag %]checked="yes"[% END %] /> + <input type="checkbox" name="moderation_flag" id="moderation_flag" [% IF moderation_flag %]checked="yes"[% END %] /> <br /> [% ELSE %] <input type="hidden" name="version" value="[% version %]" /> [% END %] - <strong>Password:</strong> - <input type="password" name="password" /> + <strong><label for="password">Password:</label></strong> + <input type="password" name="password" id="password" /> <input type="submit" value="Go!" /> </form> Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2007-06-09 21:54:06 UTC (rev 1052) +++ trunk/templates/preferences.tt 2007-06-10 01:50:29 UTC (rev 1053) @@ -79,7 +79,7 @@ <p> <label for="default_edit_type">Default edit type:</label> - <select name="default_edit_type"> + <select name="default_edit_type" id="default_edit_type"> [% IF default_edit_type == 'normal' %] <option value="normal" selected="1">Normal edit</option> <option value="tidying">Minor tidying</option> @@ -92,7 +92,7 @@ <p> <label for="cookie_expires">Preferences expire:</label> - <select name="cookie_expires"> + <select name="cookie_expires" id="cookie_expires"> [% IF cookie_expires == 'never' %] <option value="month">in one month</option> <option value="year">in one year</option>

1 0

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

09 Jun '07

Author: kake Date: 2007-06-09 22:54:06 +0100 (Sat, 09 Jun 2007) New Revision: 1052 Modified: trunk/lib/OpenGuides/RDF.pm Log: Fix bug introduced in my last commit (forgot to run tests, sorry). Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-09 21:33:04 UTC (rev 1051) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-09 21:54:06 UTC (rev 1052) @@ -113,6 +113,15 @@ : "rdf:Description"; $tt_vars{is_geospatial} = $is_geospatial; + # Fix up lat and long. + eval { + @tt_vars{ qw( wgs84_long wgs84_lat ) } = + OpenGuides::Utils->get_wgs84_coords( + longitude => $tt_vars{longitude}, + latitude => $tt_vars{latitude}, + config => $config ); + }; + # Timestamp of last edited. my $timestamp = $node_data{last_modified}; if ( $timestamp ) {

1 0

r1051 - trunk/templates
by svnadmin＠urchin.earth.li 09 Jun '07

09 Jun '07

Author: kake Date: 2007-06-09 22:33:04 +0100 (Sat, 09 Jun 2007) New Revision: 1051 Modified: trunk/templates/navbar_tools.tt trunk/templates/node.tt trunk/templates/node_rdf.tt trunk/templates/rdf_index.tt Log: Finish changing from use of "latitude" and "longitude" template variables to "wgs84_lat" and "wgs84_long" (the first lot of this was accidentally committed in [1049], sorry). Fixes #176. Modified: trunk/templates/navbar_tools.tt =================================================================== --- trunk/templates/navbar_tools.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/navbar_tools.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -5,8 +5,8 @@ <li><a href="[% script_url %]newpage.cgi">Create New Page</a></li> <li><a href="[% full_cgi_url %]?action=random">Random Page</a></li> <li><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a></li> - [% IF geocache_link AND latitude AND longitude %] - <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% latitude %];origin_long=[% longitude %]">Look for nearby geocaches</a></li> + [% IF geocache_link AND wgs84_lat AND wgs84_long %] + <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% wgs84_lat %];origin_long=[% wgs84_long %]">Look for nearby geocaches</a></li> [% END %] </ul> </div> Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/node.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -47,7 +47,7 @@ <span class="node_name">[% node_name %]</span></em> </h2> [% END %] -[% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %] +[% IF not (content || coord_field_1_value || coord_field_2_value || wgs84_lat || wgs84_long) %] </div> We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>? [% ELSE %] @@ -86,7 +86,7 @@ </form> </div> [% END %] -[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %] +[% IF (wgs84_lat AND wgs84_long) OR (os_x AND os_y) OR (osie_x AND osie_y) %] <div id="coordinates" class="geo"> [% END %] [% IF os_x AND os_y %] @@ -108,15 +108,15 @@ </small>     [% END %] -[% IF latitude AND longitude %] +[% IF wgs84_lat AND wgs84_long %] <small> (Latitude: - <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr> + <abbr class="latitude" title="[% wgs84_lat %]">[% wgs84_lat %]</abbr> Longitude: - <abbr class="longitude" title="[% wgs84_long %]">[% longitude %]</abbr>) + <abbr class="longitude" title="[% wgs84_long %]">[% wgs84_long %]</abbr>) </small> [% END %] -[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%] +[% IF (wgs84_lat AND wgs84_long) OR (os_x AND os_y) OR (osie_x AND osie_y)%] </div> [% END %] <div id="rdf_link"> Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/node_rdf.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -67,9 +67,9 @@ </foaf:based_near> [% END %] - [% IF latitude AND longitude %] - <geo:lat>[% latitude %]</geo:lat> - <geo:long>[% longitude %]</geo:long> + [% IF wgs84_lat AND wgs84_long %] + <geo:lat>[% wgs84_lat %]</geo:lat> + <geo:long>[% wgs84_long %]</geo:long> [% END %] [% IF os_x AND os_y %] Modified: trunk/templates/rdf_index.tt =================================================================== --- trunk/templates/rdf_index.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/rdf_index.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -24,7 +24,7 @@ [%- FOREACH node = nodes %] [% metadata = node.node_data.metadata %] - [%- IF metadata.os_x.list.first || metadata.os_y.list.first || metadata.latitude.list.first || metadata.longitude.list.first || + [%- IF metadata.os_x.list.first || metadata.os_y.list.first || metadata.wgs84_lat.list.first || metadata.wgs84_long.list.first || metadata.locale.list.first || metadata.address.list.first || metadata.postcode.list.first || metadata.map_link.list.first -%] [% nodeType = 'geo:SpatialThing' %] [%- ELSE -%] @@ -35,9 +35,9 @@ <[% nodeType %] rdf:about="[% full_cgi_url %]?id=[% node.param %];format=rdf#obj"> <rdfs:seeAlso rdf:resource="[% full_cgi_url %]?id=[% node.param %];format=rdf" /> <dc:title>[% node.name %]</dc:title> - [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] - <geo:lat>[% metadata.latitude.list.first %]</geo:lat> - <geo:long>[% metadata.longitude.list.first %]</geo:long> + [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %] + <geo:lat>[% metadata.wgs84_lat.list.first %]</geo:lat> + <geo:long>[% metadata.wgs84_long.list.first %]</geo:long> [% END %] <link>[% full_cgi_url %]?[% node.param %]</link> </[% nodeType %]>

1 0

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

← Newer
1
...
61
62
63
64
65
66
67
...
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