openguides-commits September 2006

openguides-commits@lists.openguides.org

1 participants
26 discussions

r852 - in trunk: . lib templates
by svnadmin＠urchin.earth.li 11 Sep '06

11 Sep '06

Author: dom Date: 2006-09-11 08:55:40 +0100 (Mon, 11 Sep 2006) New Revision: 852 Modified: trunk/lib/OpenGuides.pm trunk/templates/admin_home.tt trunk/templates/moderate_confirm.tt trunk/wiki.cgi Log: More cleanups after nick in admin code: - remove unnecessary capitalization - fix all links to wiki.cgi Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-09-10 18:02:17 UTC (rev 851) +++ trunk/lib/OpenGuides.pm 2006-09-11 07:55:40 UTC (rev 852) @@ -213,7 +213,7 @@ $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 . "?id="; + $tt_vars{catloc_link} = $config->script_name . "?id="; } if ( $raw =~ /^#REDIRECT\s+(.+?)\s*$/ ) { @@ -1341,7 +1341,7 @@ my $wiki = $self->wiki; my $formatter = $self->wiki->formatter; - my $script_url = $self->config->script_url; + my $script_name = $self->config->script_name; my ($metadata_type, $metadata_value, $exclude_locales, $exclude_categories) = @args{ qw( metadata_type metadata_value exclude_locales exclude_categories ) }; @@ -1381,8 +1381,8 @@ # Save into the hash $n{'name'} = $node; - $n{'view_url'} = $script_url . "?id=" . $node_param; - $n{'edit_url'} = $script_url . "?id=" . $node_param . ";action=edit"; + $n{'view_url'} = $script_name . "?id=" . $node_param; + $n{'edit_url'} = $script_name . "?id=" . $node_param . ";action=edit"; push @tt_nodes, \%n; } @@ -1422,7 +1422,7 @@ my $wiki = $self->wiki; my $formatter = $self->wiki->formatter; - my $script_url = $self->config->script_url; + my $script_name = $self->config->script_name; # Grab all the nodes my @all_nodes = $wiki->list_all_nodes(with_details=>1); @@ -1436,9 +1436,11 @@ for my $node (@all_nodes) { # Make the URLs my $node_param = uri_escape( $formatter->node_name_to_node_param( $node->{'name'} ) ); - $node->{'view_url'} = $script_url . "?id=" . $node_param; - $node->{'versions_url'} = $script_url . "?action=list_all_versions;id=" . $node_param; - $node->{'moderation_url'} = $script_url . "?action=set_moderation;id=" . $node_param; + $node->{'view_url'} = $script_name . "?id=" . $node_param; + $node->{'versions_url'} = $script_name . + "?action=list_all_versions;id=" . $node_param; + $node->{'moderation_url'} = $script_name . + "?action=set_moderation;id=" . $node_param; # Filter if($node->{'name'} =~ /^Category /) { @@ -1458,10 +1460,10 @@ my $completed_action = ""; if($args{moderation_completed}) { if($args{moderation_completed} eq "moderation") { - $completed_action = "Version Moderated"; + $completed_action = "Version moderated"; } if($args{moderation_completed} eq "changed") { - $completed_action = "Node Moderate Flag Changed"; + $completed_action = "Node moderation flag changed"; } } Modified: trunk/templates/admin_home.tt =================================================================== --- trunk/templates/admin_home.tt 2006-09-10 18:02:17 UTC (rev 851) +++ trunk/templates/admin_home.tt 2006-09-11 07:55:40 UTC (rev 852) @@ -12,8 +12,8 @@ <li><a href="#nodes">Nodes</a></li> <li><a href="#locales">Locales</a></li> <li><a href="#categories">Categories</a></li> - <li><a href="?action=show_needing_moderation">Pages Needing Moderation</a> - <li><a href="?action=show_missing_metadata">Pages Missing Metadata</a> + <li><a href="[% cgi_url %]?action=show_needing_moderation">Pages needing moderation</a> + <li><a href="[% cgi_url %]?action=show_missing_metadata">Pages missing metadata</a> </ul> <a name="nodes"></a> @@ -25,9 +25,8 @@ <td class="admin_version">[% node.version %]</td> <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> <td class="admin_action"> - <a href="[% node.view_url %]">View</a> or <a href="[% node.versions_url %]">View all versions</a> or - <a href="[% node.moderation_url %]">Set Moderation</a> + <a href="[% node.moderation_url %]">Set moderation</a> </td> </tr> [% END %] @@ -44,9 +43,8 @@ <td class="admin_version">[% locale.version %]</td> <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> <td class="admin_action"> - <a href="[% locale.view_url %]">View</a> or <a href="[% locale.versions_url %]">View all versions</a> or - <a href="[% locale.moderation_url %]">Set Moderation</a> + <a href="[% locale.moderation_url %]">Set moderation</a> </td> </tr> [% END %] @@ -63,9 +61,8 @@ <td class="admin_version">[% cat.version %]</td> <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> <td class="admin_action"> - <a href="[% cat.view_url %]">View</a> or <a href="[% cat.versions_url %]">View all versions</a> or - <a href="[% cat.moderation_url %]">Set Moderation</a> + <a href="[% cat.moderation_url %]">Set moderation</a> </td> </tr> [% END %] Modified: trunk/templates/moderate_confirm.tt =================================================================== --- trunk/templates/moderate_confirm.tt 2006-09-10 18:02:17 UTC (rev 851) +++ trunk/templates/moderate_confirm.tt 2006-09-11 07:55:40 UTC (rev 852) @@ -31,7 +31,7 @@ [% END %] <strong>Password:</strong> <input type="password" name="password" /> - <input type="submit" value="Action Moderation" /> + <input type="submit" value="Go!" /> </form> </div> Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-09-10 18:02:17 UTC (rev 851) +++ trunk/wiki.cgi 2006-09-11 07:55:40 UTC (rev 852) @@ -401,9 +401,9 @@ foreach my $node (@nodes) { my $node_param = uri_escape($formatter->node_name_to_node_param($node->{'name'})); - $node->{'moderate_url'} = $script_url . "?action=moderate&id=".$node_param."&version=".$node->{'version'}; - $node->{'view_url'} = $script_url . "?id=".$node_param."&version=".$node->{'version'}; - $node->{'diff_url'} = $script_url . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'}; + $node->{'moderate_url'} = $script_name . "?action=moderate&id=".$node_param."&version=".$node->{'version'}; + $node->{'view_url'} = $script_name . "?id=".$node_param."&version=".$node->{'version'}; + $node->{'diff_url'} = $script_name . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'}; } process_template( "needing_moderation.tt",

1 0

r851 - trunk
by svnadmin＠urchin.earth.li 10 Sep '06

10 Sep '06

Author: dom Date: 2006-09-10 19:02:17 +0100 (Sun, 10 Sep 2006) New Revision: 851 Modified: trunk/Build.PL Log: Actually install the new templates Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2006-09-10 17:58:49 UTC (rev 850) +++ trunk/Build.PL 2006-09-10 18:02:17 UTC (rev 851) @@ -278,8 +278,11 @@ [ "wiki.conf", "preferences.cgi", "search.cgi", "newpage.cgi" ]; $build->{config}{__templates} = [ + "admin_home.tt", "backlink_results.tt", "banner.tt", + "common_categories.tt", + "common_locales.tt", "delete_confirm.tt", "delete_done.tt", "delete_password_wrong.tt", @@ -292,10 +295,15 @@ "header.tt", "home_node.tt", "map_index.tt", + "missing_metadata.tt", + "moderate_confirm.tt", + "moderate_password_wrong.tt", "navbar.tt", + "needing_moderation.tt", "newpage.tt", "node.tt", "node_history.tt", + "node_photo_notes.tt", "openguides_information_boxes.tt", "preferences.tt", "rdf_index.tt",

1 0

r850 - trunk
by svnadmin＠urchin.earth.li 10 Sep '06

10 Sep '06

Author: dom Date: 2006-09-10 18:58:49 +0100 (Sun, 10 Sep 2006) New Revision: 850 Modified: trunk/Build.PL Log: Actually ask the new questions Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2006-09-10 15:36:42 UTC (rev 849) +++ trunk/Build.PL 2006-09-10 17:58:49 UTC (rev 850) @@ -22,7 +22,9 @@ my $existing_config = OpenGuides::Config->new( file => "wiki.conf" ); my %yn_vars = map { $_ => 1 } - qw(use_plucene enable_page_deletion navbar_on_home_page backlinks_in_title); + qw(use_plucene enable_page_deletion navbar_on_home_page backlinks_in_title + moderation_requires_password enable_node_image enable_common_categories + enable_common_locales); my $skip_config = Module::Build->y_n("Skip OpenGuides configuration?", "n"); if ( $skip_config ) { @@ -78,7 +80,8 @@ site_desc default_city default_country contact_email default_language formatting_rules_node backlinks_in_title gmaps_api_key centre_long centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84 - licence_name licence_url licence_info_url + licence_name licence_url licence_info_url moderation_requires_password + enable_node_image enable_common_categories enable_common_locales ) ) { my $q_method = $var . "__qu"; my $qu = $existing_config->$q_method;

1 0

r849 - in trunk: . templates
by svnadmin＠urchin.earth.li 10 Sep '06

10 Sep '06

Author: dom Date: 2006-09-10 16:36:42 +0100 (Sun, 10 Sep 2006) New Revision: 849 Modified: trunk/Changes trunk/README.CSS trunk/templates/backlink_results.tt trunk/templates/differences.tt trunk/templates/display_metadata.tt trunk/templates/edit_conflict.tt trunk/templates/node_history.tt trunk/templates/preferences.tt Log: Tidies up various template bugs (closes #132, #133) Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/Changes 2006-09-10 15:36:42 UTC (rev 849) @@ -8,6 +8,7 @@ enable_node_image, enable_common_categories, enable_common_locales Search::InvertedIndex support is deprecated as of this release. Please upgrade to Plucene if you are still using it. + Tidy up some template bits 0.56 14 June 2006 Fix bug introduced in feed formatting where Atom feeds would be Modified: trunk/README.CSS =================================================================== --- trunk/README.CSS 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/README.CSS 2006-09-10 15:36:42 UTC (rev 849) @@ -60,7 +60,7 @@ span.node_name Used in: backlink_results.tt delete_confirm.tt delete_done.tt - differences.tt node_history.tt + differences.tt node_history.tt, edit_conflict.tt Purpose: Inlines a node name in a snippet of explanatory text, without linking to it. @@ -99,9 +99,9 @@ div#maincontent Used in: backlink_results.tt, delete_confirm.tt, delete_done.tt, delete_password_wrong.tt, edit_conflict.tt, edit_form.tt, - home_node.tt, newpage.tt, node.tt, preferences.tt, + home_node.tt, newpage.tt, node.tt, node_history.tt, preferences.tt, recent_changes.tt, search_results.tt, site_index.tt, - search.tt, userstats.tt, wanted_pages.tt + search.tt, userstats.tt, wanted_pages.tt, differences.tt Purpose: Defines the main textual content of the page content includes the navbar and footer; maincontent does not Modified: trunk/templates/backlink_results.tt =================================================================== --- trunk/templates/backlink_results.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/backlink_results.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -3,7 +3,7 @@ <div id="content"> [% INCLUDE navbar.tt %] <div id="maincontent"> -<h1 align=center> +<h1> [% site_name %] - Backlinks to <span class="node_name">[% node_name %]</span> </h1> Modified: trunk/templates/differences.tt =================================================================== --- trunk/templates/differences.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/differences.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -1,8 +1,8 @@ -[% USE CGI %] [% INCLUDE header.tt %] [% INCLUDE banner.tt %] <div id="content"> [% INCLUDE navbar.tt %] +<div id="maincontent"> <h1> [% site_name %] - Differences between [% right_version %] and [% left_version %] of <span class="node_name">[% node_name %]</span> </h1> @@ -37,5 +37,5 @@ <input type="submit" name="Go" value="Search" class="form_button" /> </form> </p> - +</div> [% INCLUDE footer.tt %] Modified: trunk/templates/display_metadata.tt =================================================================== --- trunk/templates/display_metadata.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/display_metadata.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -1,6 +1,8 @@ [% USE CGI %]  - +[% IF phone OR fax OR address OR postcode OR formatted_website_text + OR hours_text OR map_link OR categories.size OR locales.size OR + node_image %] <div id="metadata" class="vcard"> [% IF node_image %] <div id="node_image_box"> @@ -82,5 +84,5 @@ </ul> [% END %] </div> - +[% END %]  Modified: trunk/templates/edit_conflict.tt =================================================================== --- trunk/templates/edit_conflict.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/edit_conflict.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -4,7 +4,7 @@ <div id="content"> [% INCLUDE navbar.tt %] <div id="maincontent"> -<h2>Edit "[% node_name %]"</h2> +<h2>Edit "<span class="node_name">[% node_name %]</span>"</h2> <div class="warning_text"> Someone has committed changes to this node since you began editing. Modified: trunk/templates/node_history.tt =================================================================== --- trunk/templates/node_history.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/node_history.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -3,8 +3,8 @@ [% INCLUDE banner.tt %] <div id="content"> [% INCLUDE navbar.tt %] - -<h1 align="center"> +<div id="maincontent"> +<h1> [% site_name %] - History of <span class="node_name">[% node_name %]</span> </h1> <p> @@ -44,5 +44,5 @@ and as an <a href="[% cgi_url %]?action=list_all_versions;format=atom;id=[% node_param %]">atom feed</a>. </p> - +</div> [% INCLUDE footer.tt %] Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/preferences.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -1,13 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html lang="[% language %]"> -<head> - <title>[% site_name %] - Set username/preferences</title> - [% IF stylesheet %] - <link rel="stylesheet" href="[% stylesheet %]" type="text/css"> - [% END %] -</head> - -<body> +[% INCLUDE header.tt page_title = "Set username/preferences" %] [% INCLUDE banner.tt %] <div id="content"> [% INCLUDE navbar.tt %]

1 0

r848 - trunk
by svnadmin＠urchin.earth.li 10 Sep '06

10 Sep '06

Author: dom Date: 2006-09-10 16:21:39 +0100 (Sun, 10 Sep 2006) New Revision: 848 Modified: trunk/Build.PL Log: Default to Plucene for the benefit of META.yml generation Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2006-09-10 15:07:08 UTC (rev 847) +++ trunk/Build.PL 2006-09-10 15:21:39 UTC (rev 848) @@ -69,7 +69,7 @@ value => $dbtype }; my $install_directory; # used to suggest template paths -my $use_plucene; # keep track of this so we know what to put in prereqs +my $use_plucene = 1; # keep track of this so we know what to put in prereqs foreach my $var ( qw( dbname dbuser dbpass dbhost script_name install_directory template_path custom_template_path script_url

1 0

r847 - trunk/t
by svnadmin＠urchin.earth.li 10 Sep '06

10 Sep '06

Author: dom Date: 2006-09-10 16:07:08 +0100 (Sun, 10 Sep 2006) New Revision: 847 Modified: trunk/t/24_feed_node_listings.t trunk/t/53_show_index.t trunk/t/72_node_moderation.t Log: Minor warning fixes Modified: trunk/t/24_feed_node_listings.t =================================================================== --- trunk/t/24_feed_node_listings.t 2006-08-30 21:39:25 UTC (rev 846) +++ trunk/t/24_feed_node_listings.t 2006-09-10 15:07:08 UTC (rev 847) @@ -133,7 +133,7 @@ } # Ask build_feed_for_nodes to make a feed of these - my $output = $feed->build_feed_for_nodes($feed_type,@all_nodes); + $output = $feed->build_feed_for_nodes($feed_type,@all_nodes); like( $output, qr/<title>Wombats/, "Found wombats" ); like( $output, qr/<title>Badgers/, "Found badgers" ); @@ -159,7 +159,7 @@ like( $output, qr/<title>Wombats/, "Wombats had wombats" ); unlike( $output, qr/<title>Badgers/, "Wombats didn't have Badgers" ); - my @wombats = $output =~ /(<title>Wombats)/g; + @wombats = $output =~ /(<title>Wombats)/g; is( scalar @wombats, 3, "All 3 wombat versions found" ); # Check it was really the mini version Modified: trunk/t/53_show_index.t =================================================================== --- trunk/t/53_show_index.t 2006-08-30 21:39:25 UTC (rev 846) +++ trunk/t/53_show_index.t 2006-09-10 15:07:08 UTC (rev 847) @@ -74,7 +74,7 @@ "RSS output gets content-type of application/rdf+xml" ); like( $output, "/\<rdf\:RDF.*?http\:\/\/purl.org\/rss\//s", "Really is rss" ); #like( $output, qr|<title>Category Alpha</title>|, "Right rss title" ); - my @entries = ($output =~ /(\<\/item\>)/g); + @entries = ($output =~ /(\<\/item\>)/g); is( 2, scalar @entries, "Right number of nodes included in rss" ); # Test the Atom version @@ -91,6 +91,6 @@ "Atom output gets content-type of application/atom+xml" ); like( $output, qr|<feed|, "Really is atom" ); #like( $output, qr|<title>Category Alpha</title>|, "Right atom title" ); - my @entries = ($output =~ /(\<entry\>)/g); + @entries = ($output =~ /(\<entry\>)/g); is( 2, scalar @entries, "Right number of nodes included in atom" ); } Modified: trunk/t/72_node_moderation.t =================================================================== --- trunk/t/72_node_moderation.t 2006-08-30 21:39:25 UTC (rev 846) +++ trunk/t/72_node_moderation.t 2006-09-10 15:07:08 UTC (rev 847) @@ -70,7 +70,7 @@ $q->param( -name => "locales", -value => "Hello" ); $q->param( -name => "edit_type", -value => "Normal edit" ); $q->param( -name => "checksum", -value => $details{checksum} ); - my $output = $guide->commit_node( + $output = $guide->commit_node( return_output => 1, id => "Wombats", cgi_obj => $q,

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits September 2006