openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1104 - in trunk: . t
by svnadmin＠urchin.earth.li 03 Jul '07

03 Jul '07

Author: dom Date: 2007-07-03 19:22:29 +0100 (Tue, 03 Jul 2007) New Revision: 1104 Modified: trunk/INSTALL trunk/t/69_bug_zero_geo.t trunk/t/77_send_email.t Log: Small cleanups prior to release Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2007-07-02 13:45:46 UTC (rev 1103) +++ trunk/INSTALL 2007-07-03 18:22:29 UTC (rev 1104) @@ -294,6 +294,11 @@ You will need to configure the above directory in your web server, then input the URL the content will be visible at here. + "Should we send email notifications when a moderated node is edited?" + +For spam avoidance, you can configure certain nodes to require moderation. +To ensure that such edits are noticed, OpenGuides can email you. + "Distance calculation methods available are: 1) British National Grid 2) Irish National Grid Modified: trunk/t/69_bug_zero_geo.t =================================================================== --- trunk/t/69_bug_zero_geo.t 2007-07-02 13:45:46 UTC (rev 1103) +++ trunk/t/69_bug_zero_geo.t 2007-07-03 18:22:29 UTC (rev 1104) @@ -47,9 +47,6 @@ my %details = $guide->wiki->retrieve_node("Test Node"); -use Data::Dumper; -#print STDERR Dumper %details; - is( @{$details{metadata}->{os_x}}[0], 0, "Zero os_x saved" ); is( @{$details{metadata}->{os_y}}[0], 0, "Zero os_y saved" ); Modified: trunk/t/77_send_email.t =================================================================== --- trunk/t/77_send_email.t 2007-07-02 13:45:46 UTC (rev 1103) +++ trunk/t/77_send_email.t 2007-07-03 18:22:29 UTC (rev 1104) @@ -32,7 +32,8 @@ body => 'Test body' ); -like( $output, qr|^To: admin\(a)example\.com|m, "Admin address appropriately" ); +like( $output, qr|^To: admin\(a)example\.com|m, "Admin address used ". + "appropriately" ); eval { $output = OpenGuides::Utils->send_email( config => $config,

1 0

r1103 - utils
by svnadmin＠urchin.earth.li 02 Jul '07

02 Jul '07

Author: dom Date: 2007-07-02 14:45:46 +0100 (Mon, 02 Jul 2007) New Revision: 1103 Modified: utils/get-guide-versions Log: Restore full path to output file (munged in [879]). Modified: utils/get-guide-versions =================================================================== --- utils/get-guide-versions 2007-07-02 13:36:29 UTC (rev 1102) +++ utils/get-guide-versions 2007-07-02 13:45:46 UTC (rev 1103) @@ -7,7 +7,7 @@ use XML::Simple; use LWP::UserAgent; -my $out = "versions.html"; +my $out = "/srv/www/dev.openguides.org/html/static/versions.html"; my %guides = ( Birmingham => 'http://birmingham.openguides.org/', Cotswolds => 'http://cotswolds.openguides.org/',

1 0

r1102 - utils
by svnadmin＠urchin.earth.li 02 Jul '07

02 Jul '07

Author: dom Date: 2007-07-02 14:36:29 +0100 (Mon, 02 Jul 2007) New Revision: 1102 Modified: utils/get-guide-versions Log: Sync with guides on http://openguides.org. Modified: utils/get-guide-versions =================================================================== --- utils/get-guide-versions 2007-07-01 19:05:58 UTC (rev 1101) +++ utils/get-guide-versions 2007-07-02 13:36:29 UTC (rev 1102) @@ -10,12 +10,12 @@ my $out = "versions.html"; my %guides = ( Birmingham => 'http://birmingham.openguides.org/', - Chester => 'http://chesterguide.org.uk/', Cotswolds => 'http://cotswolds.openguides.org/', Glasgow => 'http://glasgow.openguides.org/', Lancaster => 'http://lancaster.openguides.org/', London => 'http://london.openguides.org/', Manchester => 'http://manchester.openguides.org/', + 'Randomness (London)' => 'http://london.randomness.org.uk/', 'Milton Keynes' => 'http://miltonkeynes.openguides.org/', Norwich => 'http://norwich.openguides.org/', Nottingham => 'http://nottingham.openguides.org/', @@ -23,11 +23,12 @@ 'Vegan Oxford' => 'http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi', Southampton => 'http://southampton.openguides.org/', Vienna => 'http://vienna.openguides.org/', + 'Montreal, QC' => 'http://montreal.openguides.org/', 'Victoria, BC' => 'http://victoria.openguides.org/', 'Boston, MA' => 'http://boston.openguides.org/', 'Saint Paul, MN' => 'http://saintpaul.openguides.org/', + 'New York' => 'http://newyork.openguides.org/', 'The Tourist Engineer' => 'http://engineer.openguides.org/', - "Earle's testing" => 'http://openguides.org/testing/' ); my $ua = LWP::UserAgent->new(agent => "OpenGuides get-guide-versions"); @@ -60,14 +61,14 @@ $response = $ua->get($guides{$guide}); if ($response->is_success) { my $content = $response->content; - if ($content =~ /version.(0\.\d+)/s) { + if ($content =~ /version.(0\.\d+(-\w+)?)/s) { print OUT $1; } else { print OUT "Not found"; } print OUT " (HTML)"; } else { - print "No methods worked"; + print OUT "No methods worked"; } print OUT "</td></tr>\n"; }

1 0

r1101 - trunk
by svnadmin＠urchin.earth.li 01 Jul '07

01 Jul '07

Author: dom Date: 2007-07-01 20:05:58 +0100 (Sun, 01 Jul 2007) New Revision: 1101 Modified: trunk/UPGRADING Log: Add note about [1086] Modified: trunk/UPGRADING =================================================================== --- trunk/UPGRADING 2007-06-28 23:20:37 UTC (rev 1100) +++ trunk/UPGRADING 2007-07-01 19:05:58 UTC (rev 1101) @@ -1,3 +1,17 @@ +0.61 + Customized navbar_categories.tt and navbar_locales.tt templates + need to be updated: + - First of all, your template needs to check for + [% config.enable_common_categories %] + rather than + [% common_categories %] + in order to know whether to add this <div> to the navbar or not. + + - Secondly, you need to replace + <a href="[% catloc_link %]Category_[% cat %]"> + with + <a href="[% config.script_url _ config.script_name %]?id=Category_[% cat %]"> + 0.60 The edit form now uses stylable <div>s rather than tables. You will probably want to provide at least basic styling for these.

1 0

r1100 - trunk
by svnadmin＠urchin.earth.li 29 Jun '07

29 Jun '07

Author: dom Date: 2007-06-29 00:20:37 +0100 (Fri, 29 Jun 2007) New Revision: 1100 Modified: trunk/Changes Log: Add missing ticket reference Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-28 23:06:45 UTC (rev 1099) +++ trunk/Changes 2007-06-28 23:20:37 UTC (rev 1100) @@ -10,7 +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 + Support alternative database ports (#165) Only display the google maps preference if node maps are enabled (#192). Respect redirect=0 (#104).

1 0

r1099 - in trunk: . templates
by svnadmin＠urchin.earth.li 29 Jun '07

29 Jun '07

Author: dom Date: 2007-06-29 00:06:45 +0100 (Fri, 29 Jun 2007) New Revision: 1099 Modified: trunk/Changes trunk/templates/header.tt Log: Include licence URL in <head> (fixes #226) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-24 02:10:37 UTC (rev 1098) +++ trunk/Changes 2007-06-28 23:06:45 UTC (rev 1099) @@ -27,6 +27,7 @@ Add email notifications when moderated nodes are edited (#138) Add IP addresses into non-anonymous changes in Recent Changes (#113) Add an OpenSearch description, and automatic discovery for it (#180) + Include machine-readable link to licence, if configured (#226) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2007-06-24 02:10:37 UTC (rev 1098) +++ trunk/templates/header.tt 2007-06-28 23:06:45 UTC (rev 1099) @@ -49,6 +49,9 @@ type="application/opensearchdescription+xml" title="Search the site '[% site_name %]'" href="[% full_cgi_url %]?action=about;format=opensearch" /> + [% IF licence_url %] + <link rel="copyright" href="[% licence_url %]" /> + [% END %] [% IF deter_robots %] <meta name="robots" content="noindex,nofollow" /> [% END %]

1 0

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

24 Jun '07

Author: kake Date: 2007-06-24 03:10:37 +0100 (Sun, 24 Jun 2007) New Revision: 1098 Modified: trunk/lib/OpenGuides/Template.pm trunk/t/51_display_node.t Log: Fix changeset [1095] - categories and locales weren't getting linkified even if they _did_ exist. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-21 11:25:06 UTC (rev 1097) +++ trunk/lib/OpenGuides/Template.pm 2007-06-24 02:10:37 UTC (rev 1098) @@ -290,7 +290,8 @@ my ($class, %args) = @_; my %metadata = %{$args{metadata} || {} }; my $q = $args{cgi_obj}; - my $formatter = $args{wiki}->formatter; + my $wiki = $args{wiki}; + my $formatter = $wiki->formatter; my $config = $args{config}; my $script_name = $config->script_name; @@ -318,13 +319,33 @@ split("\r\n", $locales_text); } - my @categories = map { { name => $_, - url => $args{wiki}->node_exists( "Category_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Category_" - . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @catlist; + # Some stuff here is copied from OpenGuides->_autoCreateCategoryLocale + # - we should rationalise this. + my @categories = map { + my $param = $formatter->node_name_to_node_param( $_ ); + my $name = $_; + $name =~ s/(.*)/\u$1/; + $name = $wiki->formatter->_do_freeupper( "Category $name" ); + { + name => $_, + url => $wiki->node_exists( $name ) + ? "$script_name?Category_" . uri_escape( $param ) + : "", + }; + } @catlist; - my @locales = map { { name => $_, - url => $args{wiki}->node_exists( "Locale_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Locale_" - . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @loclist; + my @locales = map { + my $param = $formatter->node_name_to_node_param( $_ ); + my $name = $_; + $name =~ s/(.*)/\u$1/; + $name = $wiki->formatter->_do_freeupper( "Locale $name" ); + { + name => $_, + url => $wiki->node_exists( $name ) + ? "$script_name?Locale_" . uri_escape( $param ) + : "", + }; + } @loclist; # The 'website' attribute might contain a URL so we wiki-format it here # rather than just CGI::escapeHTMLing it all in the template. Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2007-06-21 11:25:06 UTC (rev 1097) +++ trunk/t/51_display_node.t 2007-06-24 02:10:37 UTC (rev 1098) @@ -2,6 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -12,7 +13,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 13; +plan tests => 15; Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); @@ -26,6 +27,7 @@ site_name => "Test Site", template_path => "./templates", home_name => "Home", + admin_pass => "password", } ); eval { require Wiki::Toolkit::Search::Plucene; }; @@ -62,36 +64,49 @@ unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' ); -$wiki->write_node( "Non-existent categories and locales", "foo", undef, - { category => [ "Does not exist" ], - locale => [ "Does not exist" ] } ); +# Write a node, then delete one each of its categories and locales. +OpenGuides::Test->write_data( + guide => $guide, + node => "Non-existent categories and locales", + categories => "Does Not Exist\r\nDoes Exist", + locales => "Does Not Exist\r\nDoes Exist", + return_output => 1, + ); +foreach my $id ( ( "Category Does Not Exist", "Locale Does Not Exist" ) ) { + $guide->delete_node( + id => $id, + password => "password", + return_output => 1, + ); +} +# Check the display comes up right for the existent and nonexistent. $output = $guide->display_node( id => 'Non-existent categories and locales', return_output => 1 ); unlike( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"}, - 'Category name not linked if category does not exist' ); - -$wiki->write_node( "Category_Does_Not_Exist", "bar", undef, undef ); - -$output = $guide->display_node( id => 'Non-existent categories and locales', - return_output => 1 - ); - -like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"}, - 'but does when it does exist' ); - + "category name not linked if category does not exist" ); +like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Exist"}, + "...but does when it does exist" ); unlike( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"}, - 'Locale name not linked if category does not exist' ); + "locale name not linked if category does not exist" ); +like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Exist"}, + "...but does when it does exist" ); -$wiki->write_node( "Locale_Does_Not_Exist", "wibble", undef, undef ); +# Check it works when the case is different too. +OpenGuides::Test->write_data( + guide => $guide, + node => "Existent categories and locales", + categories => "does exist", + locales => "does exist", + return_output => 1, + ); -$output = $guide->display_node( id => 'Non-existent categories and locales', +$output = $guide->display_node( id => "Existent categories and locales", return_output => 1 ); - -like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"}, - 'but does when it does exist' ); - - +like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Exist"}, + "wrongly-cased categories are linked as they should be" ); +like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Exist"}, + "wrongly-cased locales are linked as they should be" );

1 0

r1097 - in trunk: . lib templates
by svnadmin＠urchin.earth.li 21 Jun '07

21 Jun '07

Author: dom Date: 2007-06-21 12:25:06 +0100 (Thu, 21 Jun 2007) New Revision: 1097 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/templates/header.tt Log: Tweak OpenSearch description, and add autodiscovery (fixes #180) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-20 18:54:54 UTC (rev 1096) +++ trunk/Changes 2007-06-21 11:25:06 UTC (rev 1097) @@ -26,6 +26,7 @@ templates (#214). Add email notifications when moderated nodes are edited (#138) Add IP addresses into non-anonymous changes in Recent Changes (#113) + Add an OpenSearch description, and automatic discovery for it (#180) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-20 18:54:54 UTC (rev 1096) +++ trunk/lib/OpenGuides.pm 2007-06-21 11:25:06 UTC (rev 1097) @@ -1206,7 +1206,7 @@ <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>$site_name</ShortName> - <Description>Search the $site_name</Description> + <Description>Search the site '$site_name'</Description> <Tags>$site_name</Tags> <Contact>$contact_email</Contact> <Url type="application/atom+xml" Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2007-06-20 18:54:54 UTC (rev 1096) +++ trunk/templates/header.tt 2007-06-21 11:25:06 UTC (rev 1097) @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html lang="[% language %]"> -<head> +<head profile="http://a9.com/-/spec/opensearch/1.1/"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> [% IF page_title %] <title>[% page_title %]</title> @@ -37,8 +37,18 @@ <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" /> + <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" /> + <link rel="search" + type="application/opensearchdescription+xml" + title="Search the site '[% site_name %]'" + href="[% full_cgi_url %]?action=about;format=opensearch" /> [% IF deter_robots %] <meta name="robots" content="noindex,nofollow" /> [% END %]

1 0

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

20 Jun '07

Author: dom Date: 2007-06-20 19:54:54 +0100 (Wed, 20 Jun 2007) New Revision: 1096 Added: trunk/t/78_about.t Modified: trunk/MANIFEST trunk/lib/OpenGuides.pm Log: Add OpenSearch description (references #180) Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-20 16:34:42 UTC (rev 1095) +++ trunk/MANIFEST 2007-06-20 18:54:54 UTC (rev 1096) @@ -141,5 +141,6 @@ t/75_revert_user.t t/76_detect_spam.t t/77_send_email.t +t/78_about.t t/templates/15_test.tt wiki.cgi Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-20 16:34:42 UTC (rev 1095) +++ trunk/lib/OpenGuides.pm 2007-06-20 18:54:54 UTC (rev 1096) @@ -1123,6 +1123,14 @@ print $output; } +=item B<display_about> + + print $guide->display_about(format => "rdf"); + +Displays static 'about' information in various format. Defaults to HTML. + +=cut + sub display_about { my ($self, %args) = @_; @@ -1188,8 +1196,28 @@ </Project> </rdf:RDF>}; - } - else { + } elsif ($args{format} && $args{format} eq 'opensearch') { + my $site_name = $self->config->site_name; + my $search_url = $self->config->script_url . 'search.cgi'; + my $contact_email = $self->config->contact_email; + $output = qq{Content-Type: application/opensearchdescription+xml; charset=utf-8 + +<?xml version="1.0" encoding="UTF-8"?> + +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>$site_name</ShortName> + <Description>Search the $site_name</Description> + <Tags>$site_name</Tags> + <Contact>$contact_email</Contact> + <Url type="application/atom+xml" + template="$search_url?search={searchTerms};format=atom"/> + <Url type="application/rss+xml" + template="$search_url?search={searchTerms};format=rss"/> + <Url type="text/html" + template="$search_url?search={searchTerms}"/> + <Query role="example" searchTerms="pubs"/> +</OpenSearchDescription>}; + } else { my $site_name = $self->config->{site_name}; my $script_name = $self->config->{script_name}; $output = qq{Content-Type: text/html; charset=utf-8 Added: trunk/t/78_about.t =================================================================== --- trunk/t/78_about.t (rev 0) +++ trunk/t/78_about.t 2007-06-20 18:54:54 UTC (rev 1096) @@ -0,0 +1,32 @@ +use strict; +use warnings; + +use Test::More; +use OpenGuides; +use OpenGuides::Test; + +plan tests => 3; + +my $config = OpenGuides::Test->make_basic_config; +$config->site_name('My site'); +$config->contact_email('me(a)example.com'); +my $guide = OpenGuides->new(config => $config); + +my $output = $guide->display_about(return_output => 1); + +like( $output, qr|My site</a></h1>.*<h2>is powered by|ms, + "HTML about text is displayed, including the site name" ); + +$output = $guide->display_about(return_output => 1, + format => "opensearch" + ); + +like( $output, qr|OpenSearchDescription.*<Tags>My site</Tags>.*<Contact>me\(a)example.com</Contact>|ms, + "OpenSearch about text is displayed, including the site name and contact"); + +$output = $guide->display_about(return_output => 1, + format => "rdf" + ); + +like( $output, qr|<Project rdf:ID="OpenGuides">|ms, + "RDF about text is displayed");

1 0

r1095 - in trunk: lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 20 Jun '07

20 Jun '07

Author: dom Date: 2007-06-20 17:34:42 +0100 (Wed, 20 Jun 2007) New Revision: 1095 Modified: trunk/lib/OpenGuides/Template.pm trunk/t/51_display_node.t trunk/templates/display_metadata.tt Log: Only linkify categories and locales if they exist (fixes #15) Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-19 18:32:56 UTC (rev 1094) +++ trunk/lib/OpenGuides/Template.pm 2007-06-20 16:34:42 UTC (rev 1095) @@ -319,12 +319,12 @@ } my @categories = map { { name => $_, - url => "$script_name?Category_" - . uri_escape($formatter->node_name_to_node_param($_)) } } @catlist; + url => $args{wiki}->node_exists( "Category_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Category_" + . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @catlist; my @locales = map { { name => $_, - url => "$script_name?Locale_" - . uri_escape($formatter->node_name_to_node_param($_)) } } @loclist; + url => $args{wiki}->node_exists( "Locale_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Locale_" + . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @loclist; # The 'website' attribute might contain a URL so we wiki-format it here # rather than just CGI::escapeHTMLing it all in the template. Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2007-06-19 18:32:56 UTC (rev 1094) +++ trunk/t/51_display_node.t 2007-06-20 16:34:42 UTC (rev 1095) @@ -12,8 +12,9 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 9; +plan tests => 13; +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { @@ -60,3 +61,37 @@ $output = $guide->display_node( id => 'Redirect Test', return_output => 1, redirect => 0 ); unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' ); + +$wiki->write_node( "Non-existent categories and locales", "foo", undef, + { category => [ "Does not exist" ], + locale => [ "Does not exist" ] } ); + +$output = $guide->display_node( id => 'Non-existent categories and locales', + return_output => 1 + ); + +unlike( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"}, + 'Category name not linked if category does not exist' ); + +$wiki->write_node( "Category_Does_Not_Exist", "bar", undef, undef ); + +$output = $guide->display_node( id => 'Non-existent categories and locales', + return_output => 1 + ); + +like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"}, + 'but does when it does exist' ); + +unlike( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"}, + 'Locale name not linked if category does not exist' ); + +$wiki->write_node( "Locale_Does_Not_Exist", "wibble", undef, undef ); + +$output = $guide->display_node( id => 'Non-existent categories and locales', + return_output => 1 + ); + +like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"}, + 'but does when it does exist' ); + + Modified: trunk/templates/display_metadata.tt =================================================================== --- trunk/templates/display_metadata.tt 2007-06-19 18:32:56 UTC (rev 1094) +++ trunk/templates/display_metadata.tt 2007-06-20 16:34:42 UTC (rev 1095) @@ -81,7 +81,11 @@ <li class="categories_list"> <span class="metadata_label">Categories:</span> [% FOREACH category = categories %] - <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %] + [% IF category.url != "" %] + <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %] + [% ELSE %] + [% category.name %][%- "," UNLESS loop.last %] + [% END %] [% END %] </li> [% END %] @@ -90,7 +94,11 @@ <li class="locales_list"> <span class="metadata_label">Locales:</span> [% FOREACH locale = locales %] - <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %] + [% IF locale.url != "" %] + <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %] + [% ELSE %] + [% locale.name %][%- "," UNLESS loop.last %] + [% END %] [% END %] </li> [% END %]

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
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