openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1374 - in trunk: lib/OpenGuides t
by svnadmin＠urchin.earth.li 02 May '12

02 May '12

Author: kake Date: 2012-05-02 14:39:43 +0100 (Wed, 02 May 2012) New Revision: 1374 Modified: trunk/lib/OpenGuides/Template.pm trunk/t/68_bug_website_displayed.t Log: And strip trailing / from displayed websites when it's the only / in the URL. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2012-05-02 13:14:07 UTC (rev 1373) +++ trunk/lib/OpenGuides/Template.pm 2012-05-02 13:39:43 UTC (rev 1374) @@ -366,11 +366,17 @@ my $website = $args{metadata} ? $metadata{website}[0] : $q->param("website"); + # Do truncation for website name display. Max length of field is set in + # conf file (website_link_max_chars). Leading http:// and www. if present + # is stripped; trailing / is also stripped if it's the only / in the URL. my $formatted_website_text = ""; if ( $website && $website ne "http://" && is_web_uri( $website ) ) { my $maxlen = $config->website_link_max_chars; my $trunc_website = $website; $trunc_website =~ s|http://(www.)?||; + if ( $trunc_website =~ tr|/|| == 1 ) { + $trunc_website =~ s|/$||; + } if ( length( $trunc_website ) > $maxlen ) { $trunc_website = substr( $trunc_website, 0, $maxlen - 3 ) . "..."; } Modified: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2012-05-02 13:14:07 UTC (rev 1373) +++ trunk/t/68_bug_website_displayed.t 2012-05-02 13:39:43 UTC (rev 1374) @@ -11,7 +11,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 6; +plan tests => 7; OpenGuides::Test::refresh_db(); @@ -24,12 +24,16 @@ "A busy main-line station that actually exists.", undef, { website => "http://www.example.com/foo" } ) or die "Couldn't write node"; +$guide->wiki->write_node( "West Croydon Station", + "Another main-line station that actually exists.", undef, + { website => "http://www.example.com/bar/" } ) + or die "Couldn't write node"; $config->website_link_max_chars( 20 ); my %tt_vars = $guide->display_node( id => "South Croydon Station", return_tt_vars => 1 ); is( $tt_vars{formatted_website_text}, - '<a href="http://example.com/">example.com/</a>', + '<a href="http://example.com/">example.com</a>', "Website correctly displayed when no need for truncation," ); %tt_vars = $guide->display_node( id => "East Croydon Station", @@ -38,6 +42,12 @@ '<a href="http://www.example.com/foo">example.com/foo</a>', "Website correctly truncated when there's a leading www" ); +%tt_vars = $guide->display_node( id => "West Croydon Station", + return_tt_vars => 1 ); +is( $tt_vars{formatted_website_text}, + '<a href="http://www.example.com/bar/">example.com/bar/</a>', + "Trailing slash not stripped unless it's immediately after domain name" ); + %tt_vars = $guide->display_node( id => "North Croydon Station", return_tt_vars => 1 ); is( $tt_vars{formatted_website_text},

1 0

r1373 - in trunk: lib/OpenGuides t
by svnadmin＠urchin.earth.li 02 May '12

02 May '12

Author: kake Date: 2012-05-02 14:14:07 +0100 (Wed, 02 May 2012) New Revision: 1373 Modified: trunk/lib/OpenGuides/Template.pm trunk/t/68_bug_website_displayed.t Log: Also strip the http:// and any leading www. from the truncated website display text. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2012-05-02 11:18:32 UTC (rev 1372) +++ trunk/lib/OpenGuides/Template.pm 2012-05-02 13:14:07 UTC (rev 1373) @@ -370,8 +370,9 @@ if ( $website && $website ne "http://" && is_web_uri( $website ) ) { my $maxlen = $config->website_link_max_chars; my $trunc_website = $website; - if ( length( $website ) > $maxlen ) { - $trunc_website = substr( $website, 0, $maxlen - 3 ) . "..."; + $trunc_website =~ s|http://(www.)?||; + if ( length( $trunc_website ) > $maxlen ) { + $trunc_website = substr( $trunc_website, 0, $maxlen - 3 ) . "..."; } $formatted_website_text = '<a href="' . $website . '">' . $trunc_website . '</a>'; Modified: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2012-05-02 11:18:32 UTC (rev 1372) +++ trunk/t/68_bug_website_displayed.t 2012-05-02 13:14:07 UTC (rev 1373) @@ -11,51 +11,59 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 5; +plan tests => 6; OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); -$config->website_link_max_chars( 23 ); $guide->wiki->write_node( "South Croydon Station", "A sleepy main-line station in what is arguably the nicest part of Croydon.", undef, { website => "http://example.com/" } ) or die "Couldn't write node"; $guide->wiki->write_node( "North Croydon Station", "A busy main-line station in what is arguably the furthest North part of Croydon.", undef, { website => "http://longer.example.com/asdfasdf" } ) or die "Couldn't write node"; +$guide->wiki->write_node( "East Croydon Station", + "A busy main-line station that actually exists.", undef, + { website => "http://www.example.com/foo" } ) + or die "Couldn't write node"; -my $output = $guide->display_node( - id => "South Croydon Station", - return_output => 1, - ); -like( $output, qr#Website:</span> <span class="url"><a href="http://example.com/">http://example.com/</a>#, "website correctly displayed" ); +$config->website_link_max_chars( 20 ); +my %tt_vars = $guide->display_node( id => "South Croydon Station", + return_tt_vars => 1 ); +is( $tt_vars{formatted_website_text}, + '<a href="http://example.com/">example.com/</a>', + "Website correctly displayed when no need for truncation," ); -$output = $guide->display_node( - id => "North Croydon Station", - return_output => 1, - ); +%tt_vars = $guide->display_node( id => "East Croydon Station", + return_tt_vars => 1 ); +is( $tt_vars{formatted_website_text}, + '<a href="http://www.example.com/foo">example.com/foo</a>', + "Website correctly truncated when there's a leading www" ); -like( $output, qr#Website:</span> <span class="url"><a href="http://longer.example.com/asdfasdf">http://longer.exampl...</a>#, "website correctly truncated" ); +%tt_vars = $guide->display_node( id => "North Croydon Station", + return_tt_vars => 1 ); +is( $tt_vars{formatted_website_text}, + '<a href="http://longer.example.com/asdfasdf">longer.example.co...</a>', + "Website correctly truncated when much too long." ); # Make sure website isn't truncated unnecessarily, e.g. that we don't end up # just replacing the final three characters with the ellipsis. Our full URL -# has 34 characters. -$config->website_link_max_chars( 33 ); -my %tt_vars = $guide->display_node( id => "North Croydon Station", - return_tt_vars => 1 ); +# has 27 characters (not counting the http://). +$config->website_link_max_chars( 26 ); +%tt_vars = $guide->display_node( id => "North Croydon Station", + return_tt_vars => 1 ); is( $tt_vars{formatted_website_text}, - '<a href="http://longer.example.com/asdfasdf">http://longer.example.com/asdf...</a>', + '<a href="http://longer.example.com/asdfasdf">longer.example.com/asdf...</a>', "Website truncated correctly when 1 character longer than allowed." ); -$config->website_link_max_chars( 34 ); +$config->website_link_max_chars( 27 ); %tt_vars = $guide->display_node( id => "North Croydon Station", return_tt_vars => 1 ); is( $tt_vars{formatted_website_text}, - '<a href="http://longer.example.com/asdfasdf">http://longer.example.com/asdfasdf</a>', +'<a href="http://longer.example.com/asdfasdf">longer.example.com/asdfasdf</a>', "Website not truncated when exact length allowed." ); -$config->website_link_max_chars( 35 ); +$config->website_link_max_chars( 28 ); %tt_vars = $guide->display_node( id => "North Croydon Station", return_tt_vars => 1 ); is( $tt_vars{formatted_website_text}, - '<a href="http://longer.example.com/asdfasdf">http://longer.example.com/asdfasdf</a>', +'<a href="http://longer.example.com/asdfasdf">longer.example.com/asdfasdf</a>', "Website not truncated when 1 character shorter than allowed." ); -

1 0

r1372 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 02 May '12

02 May '12

Author: kake Date: 2012-05-02 12:18:32 +0100 (Wed, 02 May 2012) New Revision: 1372 Modified: trunk/Changes trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/Template.pm trunk/t/68_bug_website_displayed.t Log: Made website truncation a bit more intelligent. Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-04-28 15:31:20 UTC (rev 1371) +++ trunk/Changes 2012-05-02 11:18:32 UTC (rev 1372) @@ -27,6 +27,9 @@ Added JSON output for the preferences page (#293). IP addresses no longer show on recent changes for people without the admin preference set. + Website truncation on node display is now a little more intelligent + (you can still tweak this by setting website_link_max_chars in + your wiki.conf). 0.66 12 April 2012 All templates now have access to the "username" TT variable. Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2012-04-28 15:31:20 UTC (rev 1371) +++ trunk/lib/OpenGuides/Config.pm 2012-05-02 11:18:32 UTC (rev 1372) @@ -118,7 +118,7 @@ host_checker_module => "", static_path => "/usr/local/share/openguides/static", send_moderation_notifications => 1, - website_link_max_chars => 20, + website_link_max_chars => 25, read_only => 0, ); @@ -357,7 +357,7 @@ =item * moderate_whitelist -=item * website_link_max_chars (default: C<20>) +=item * website_link_max_chars (default: C<25>) =item * read_only Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2012-04-28 15:31:20 UTC (rev 1371) +++ trunk/lib/OpenGuides/Template.pm 2012-05-02 11:18:32 UTC (rev 1372) @@ -368,10 +368,10 @@ : $q->param("website"); my $formatted_website_text = ""; if ( $website && $website ne "http://" && is_web_uri( $website ) ) { - my $trunc_website = substr( $website, 0, - $config->website_link_max_chars ); - unless ($website eq $trunc_website ) { - $trunc_website .= '...'; + my $maxlen = $config->website_link_max_chars; + my $trunc_website = $website; + if ( length( $website ) > $maxlen ) { + $trunc_website = substr( $website, 0, $maxlen - 3 ) . "..."; } $formatted_website_text = '<a href="' . $website . '">' . $trunc_website . '</a>'; Modified: trunk/t/68_bug_website_displayed.t =================================================================== --- trunk/t/68_bug_website_displayed.t 2012-04-28 15:31:20 UTC (rev 1371) +++ trunk/t/68_bug_website_displayed.t 2012-05-02 11:18:32 UTC (rev 1372) @@ -11,12 +11,13 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 2; +plan tests => 5; - OpenGuides::Test::refresh_db(); +OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); +$config->website_link_max_chars( 23 ); $guide->wiki->write_node( "South Croydon Station", "A sleepy main-line station in what is arguably the nicest part of Croydon.", undef, { website => "http://example.com/" } ) or die "Couldn't write node"; $guide->wiki->write_node( "North Croydon Station", "A busy main-line station in what is arguably the furthest North part of Croydon.", undef, { website => "http://longer.example.com/asdfasdf" } ) or die "Couldn't write node"; @@ -33,3 +34,28 @@ ); like( $output, qr#Website:</span> <span class="url"><a href="http://longer.example.com/asdfasdf">http://longer.exampl...</a>#, "website correctly truncated" ); + +# Make sure website isn't truncated unnecessarily, e.g. that we don't end up +# just replacing the final three characters with the ellipsis. Our full URL +# has 34 characters. +$config->website_link_max_chars( 33 ); +my %tt_vars = $guide->display_node( id => "North Croydon Station", + return_tt_vars => 1 ); +is( $tt_vars{formatted_website_text}, + '<a href="http://longer.example.com/asdfasdf">http://longer.example.com/asdf...</a>', + "Website truncated correctly when 1 character longer than allowed." ); + +$config->website_link_max_chars( 34 ); +%tt_vars = $guide->display_node( id => "North Croydon Station", + return_tt_vars => 1 ); +is( $tt_vars{formatted_website_text}, + '<a href="http://longer.example.com/asdfasdf">http://longer.example.com/asdfasdf</a>', + "Website not truncated when exact length allowed." ); + +$config->website_link_max_chars( 35 ); +%tt_vars = $guide->display_node( id => "North Croydon Station", + return_tt_vars => 1 ); +is( $tt_vars{formatted_website_text}, + '<a href="http://longer.example.com/asdfasdf">http://longer.example.com/asdfasdf</a>', + "Website not truncated when 1 character shorter than allowed." ); +

1 0

r1371 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 28 Apr '12

28 Apr '12

Author: kake Date: 2012-04-28 16:31:20 +0100 (Sat, 28 Apr 2012) New Revision: 1371 Modified: trunk/Changes trunk/lib/OpenGuides/JSON.pm trunk/preferences.cgi trunk/t/59_preferences.t Log: Added JSON output for the preferences page (fixes #293). Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-04-27 18:04:12 UTC (rev 1370) +++ trunk/Changes 2012-04-28 15:31:20 UTC (rev 1371) @@ -24,6 +24,7 @@ Added a basic stylesheet, installed into the static_path directory. Fixed the JSON output for action=index (using a new dependency on Template::Plugin::JSON::Escape). + Added JSON output for the preferences page (#293). IP addresses no longer show on recent changes for people without the admin preference set. Modified: trunk/lib/OpenGuides/JSON.pm =================================================================== --- trunk/lib/OpenGuides/JSON.pm 2012-04-27 18:04:12 UTC (rev 1370) +++ trunk/lib/OpenGuides/JSON.pm 2012-04-28 15:31:20 UTC (rev 1371) @@ -9,6 +9,8 @@ use Time::Piece; use URI::Escape; use Carp 'croak'; +use JSON; +use OpenGuides::CGI; sub new { my ( $class, @args ) = @_; @@ -143,6 +145,13 @@ return $self->{json_maker}; } +sub make_prefs_json { + my $self = shift; + my %prefs = OpenGuides::CGI->get_prefs_from_cookie( + config => $self->{config} ); + return encode_json( \%prefs ); +} + sub make_recentchanges_json { my ( $self, %args ) = @_; @@ -245,6 +254,15 @@ Returns a raw L<Wiki::Toolkit::Plugin::JSON> object created with the values you invoked this module with. +=item B<make_prefs_json> + + my $json_writer = OpenGuides::JSON->new( wiki => $wiki, + config => $config ); + print $json_writer->make_prefs_json(); + +Retrieves the preferences from any stored preferences cookie, supplies +defaults for any preferences not set, returns the result as JSON. + =item B<make_recentchanges_json> # Ten most recent changes. Modified: trunk/preferences.cgi =================================================================== --- trunk/preferences.cgi 2012-04-27 18:04:12 UTC (rev 1370) +++ trunk/preferences.cgi 2012-04-28 15:31:20 UTC (rev 1371) @@ -6,6 +6,7 @@ use CGI; use OpenGuides::Config; use OpenGuides::CGI; +use OpenGuides::JSON; use OpenGuides::Utils; use OpenGuides::Template; @@ -14,9 +15,15 @@ my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); my $cgi = CGI->new(); my $action = $cgi->param('action') || ''; +my $format = $cgi->param('format') || ''; if ( $action eq "set_preferences" ) { set_preferences(); +} elsif ( $action eq "show" && $format eq "json" ) { + my $json_writer = OpenGuides::JSON->new( wiki => $wiki, + config => $config ); + print "Content-type: text/javascript\n\n"; + print $json_writer->make_prefs_json(); } else { show_form(); } Modified: trunk/t/59_preferences.t =================================================================== --- trunk/t/59_preferences.t 2012-04-27 18:04:12 UTC (rev 1370) +++ trunk/t/59_preferences.t 2012-04-28 15:31:20 UTC (rev 1371) @@ -1,31 +1,25 @@ use strict; -use Wiki::Toolkit::Setup::SQLite; +use JSON; use OpenGuides; +use OpenGuides::JSON; 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 => 4; +plan tests => 12; - OpenGuides::Test::refresh_db(); +OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); @@ -70,6 +64,59 @@ "input", { type => "checkbox", name => "display_google_maps" }, "...but not when node maps are globally disabled." ); +# Test JSON version of prefs page. +my $json_writer = OpenGuides::JSON->new( wiki => $wiki, + config => $config ); +delete $ENV{HTTP_COOKIE}; +my $output = eval { + $json_writer->make_prefs_json(); +}; +ok( !$@, "->make_prefs_json() doesn't die when no cookie set." ); +if ( $@ ) { warn "# Error was: $@"; } +# Need to strip out the Content-Type: header or the decoder gets confused. +$output =~ s/^Content-Type:.*\n//s; +my $parsed = eval { + local $SIG{__WARN__} = sub { die $_[0]; }; + decode_json( $output ); +}; +ok( !$@, "...and its output looks like JSON." ); +if ( $@ ) { warn "# Warning was: $@"; } +ok( $parsed->{username}, "...and a username is included in the output" ); +#use Data::Dumper; print Dumper $parsed; exit 0; + +$ENV{HTTP_COOKIE} = OpenGuides::CGI->make_prefs_cookie( config => $config ); +$output = eval { + $json_writer->make_prefs_json(); +}; +ok( !$@, "->make_prefs_json() doesn't die when cookie set with all defaults."); +if ( $@ ) { warn "# Error was: $@"; } +$output =~ s/^Content-Type:.*\n//s; +$parsed = eval { + local $SIG{__WARN__} = sub { die $_[0]; }; + decode_json( $output ); +}; +ok( !$@, "...and its output looks like JSON." ); +if ( $@ ) { warn "# Warning was: $@"; } +# We don't get a username set in this case. + +$ENV{HTTP_COOKIE} = OpenGuides::CGI->make_prefs_cookie( config => $config, + username => "Kake" ); +$output = eval { + $json_writer->make_prefs_json(); +}; +ok( !$@, + "->make_prefs_json() doesn't die when cookie set with given username."); +if ( $@ ) { warn "# Error was: $@"; } +$output =~ s/^Content-Type:.*\n//s; +$parsed = eval { + local $SIG{__WARN__} = sub { die $_[0]; }; + decode_json( $output ); +}; +ok( !$@, "...and its output looks like JSON." ); +if ( $@ ) { warn "# Warning was: $@"; } +is( $parsed->{username}, "Kake", + "...and the correct username is included in the output" ); + sub get_output { my ($wiki, $config) = @_;

1 0

r1370 - in trunk: . t templates
by svnadmin＠urchin.earth.li 27 Apr '12

27 Apr '12

Author: kake Date: 2012-04-27 19:04:12 +0100 (Fri, 27 Apr 2012) New Revision: 1370 Added: trunk/templates/node_image.tt Modified: trunk/Build.PL trunk/MANIFEST trunk/t/43_preview_edits.t trunk/templates/edit_form.tt trunk/templates/node.tt trunk/templates/node_image_fields.tt Log: Make sure node image shows up on edit preview. Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2012-04-27 16:30:27 UTC (rev 1369) +++ trunk/Build.PL 2012-04-27 18:04:12 UTC (rev 1370) @@ -418,6 +418,7 @@ "newpage.tt", "node.tt", "node_history.tt", + "node_image.tt", "node_image_fields.tt", "node_photo_notes.tt", "node_rdf.tt", Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2012-04-27 16:30:27 UTC (rev 1369) +++ trunk/MANIFEST 2012-04-27 18:04:12 UTC (rev 1370) @@ -69,6 +69,7 @@ templates/newpage.tt templates/node.tt templates/node_history.tt +templates/node_image.tt templates/node_image_fields.tt templates/node_photo_notes.tt templates/node_rdf.tt Modified: trunk/t/43_preview_edits.t =================================================================== --- trunk/t/43_preview_edits.t 2012-04-27 16:30:27 UTC (rev 1369) +++ trunk/t/43_preview_edits.t 2012-04-27 18:04:12 UTC (rev 1370) @@ -15,19 +15,23 @@ plan skip_all => "Test::HTML::Content not installed"; } -plan tests => 1; +plan tests => 6; # Clear out the database from any previous runs. - OpenGuides::Test::refresh_db(); +OpenGuides::Test::refresh_db(); my $config = OpenGuides::Test->make_basic_config; my $guide = OpenGuides->new( config => $config ); my $wiki = $guide->wiki; my $q = OpenGuides::Test->make_cgi_object( - content => "I am some content.", - summary => "I am a summary.", - ); + content => "I am some content.", + summary => "I am a summary.", + node_image => "http://example.com/image.png", + node_image_copyright => "PhotoKake", + node_image_licence => "http://example.com/licence", + node_image_url => "http://example.com/info", +); # Get a checksum for a "blank" node. my %node_data = $wiki->retrieve_node( "Clapham Junction Station" ); @@ -42,5 +46,18 @@ # Strip Content-Type header to stop Test::HTML::Content getting confused. $output =~ s/^Content-Type.*[\r\n]+//m; -Test::HTML::Content::text_ok( $output, "I am a summary.", - "Summary shows up in preview." ); +my $warned; +eval { + local $SIG{__WARN__} = sub { $warned = 1; }; + Test::HTML::Content::text_ok( $output, "I am a summary.", + "Summary shows up in preview." ); +}; +ok( !$warned, "...and HTML seems to be valid" ); +Test::HTML::Content::tag_ok( $output, "img", + { src => "http://example.com/image.png" }, + "Image URL shows up too" ); +like( $output, qr|©\s+PhotoKake|, "...so does image copyright holder" ); +Test::HTML::Content::link_ok( $output, "http://example.com/licence", + "...and we link to the licence" ); +Test::HTML::Content::link_ok( $output, "http://example.com/info", + "...and we link to the info page" ); Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2012-04-27 16:30:27 UTC (rev 1369) +++ trunk/templates/edit_form.tt 2012-04-27 18:04:12 UTC (rev 1370) @@ -34,6 +34,7 @@ [% IF summary %] <div id="summary">[% summary %]</div> [% END %] + [% INCLUDE node_image.tt %] [% INCLUDE display_metadata.tt %] [% preview_html %] </div> @@ -416,6 +417,7 @@ [% IF summary %] <div id="summary">[% summary %]</div> [% END %] + [% INCLUDE node_image.tt %] [% INCLUDE display_metadata.tt %] [% preview_html %] </div> Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2012-04-27 16:30:27 UTC (rev 1369) +++ trunk/templates/node.tt 2012-04-27 18:04:12 UTC (rev 1370) @@ -48,26 +48,7 @@ [% END %] [% END %] -[% IF node_image %] - <div id="node_image_box"> - [% IF node_image_url %]<a href="[% node_image_url %]">[% END %] - <img id="node_image" src="[% node_image %]" - alt="Picture of [% node_name %]" /> - [% IF node_image_url %]</a>[% END %] - [% IF node_image_copyright %] - <div id="node_image_copyright"> - [% IF node_image_licence %] - <a href="[% node_image_licence %]">© - [% node_image_copyright %]</a> - [% ELSE %] - © [% node_image_copyright %] - [% END %] - </div> - [% END %] - </div> -[% ELSE %] - <span id="node_no_image" /> -[% END %] +[% INCLUDE node_image.tt %] <div id="node_title"> [% IF current %] Added: trunk/templates/node_image.tt =================================================================== --- trunk/templates/node_image.tt (rev 0) +++ trunk/templates/node_image.tt 2012-04-27 18:04:12 UTC (rev 1370) @@ -0,0 +1,20 @@ +[% IF node_image %] + <div id="node_image_box"> + [% IF node_image_url %]<a href="[% node_image_url %]">[% END %] + <img id="node_image" src="[% node_image %]" + alt="Picture of [% node_name %]" /> + [% IF node_image_url %]</a>[% END %] + [% IF node_image_copyright %] + <div id="node_image_copyright"> + [% IF node_image_licence %] + <a href="[% node_image_licence %]">© + [% node_image_copyright %]</a> + [% ELSE %] + © [% node_image_copyright %] + [% END %] + </div> + [% END %] + </div> +[% ELSE %] + <span id="node_no_image" /> +[% END %] Modified: trunk/templates/node_image_fields.tt =================================================================== --- trunk/templates/node_image_fields.tt 2012-04-27 16:30:27 UTC (rev 1369) +++ trunk/templates/node_image_fields.tt 2012-04-27 18:04:12 UTC (rev 1370) @@ -2,7 +2,7 @@ <legend>Image to illustrate this page</legend> <div class="edit_form_group" id="node_image_group"> - <label for="node_image"> + <label for="node_image_input"> [% IF conflict %] Current image: [% ELSE %] @@ -10,7 +10,7 @@ [% END %] </label> <div class="edit_box"> - <input type="text" size="50" id="node_image" name="node_image" + <input type="text" size="50" id="node_image_input" name="node_image" value="[% node_image %]" /> [% INCLUDE node_photo_notes.tt %] </div> @@ -25,7 +25,7 @@ </div> <div class="edit_form_group" id="node_image_copyright_group"> - <label for="node_image_copyright"> + <label for="node_image_copyright_input"> [% IF conflict %] Current copyright holder: [% ELSE %] @@ -33,7 +33,7 @@ [% END %] </label> <div class="edit_box"> - <input type="text" size="50" id="node_image_copyright" + <input type="text" size="50" id="node_image_copyright_input" name="node_image_copyright" value="[% node_image_copyright %]" /> </div> [% IF conflict %]

1 0

r1369 - trunk
by svnadmin＠urchin.earth.li 27 Apr '12

27 Apr '12

Author: bob Date: 2012-04-27 17:30:27 +0100 (Fri, 27 Apr 2012) New Revision: 1369 Modified: trunk/Build.PL Log: Skip configuration question is AUTOMATED_TESTING=1. closes #291 Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2012-04-27 15:11:11 UTC (rev 1368) +++ trunk/Build.PL 2012-04-27 16:30:27 UTC (rev 1369) @@ -15,7 +15,8 @@ GetOptions('force' => \$force); -unless ($force) { + +unless ($force || $ENV{'AUTOMATED_TESTING'}) { print <<EOF; Beginning install process... if you already have an OpenGuides @@ -51,7 +52,7 @@ content_above_navbar_in_html show_gmap_in_node_display force_wgs84 send_moderation_notifications read_only); -my $skip_config = $force ? 'y' : Module::Build->y_n("Skip OpenGuides configuration?", "n"); +my $skip_config = $force || $ENV{AUTOMATED_TESTING} ? 'y' : Module::Build->y_n("Skip OpenGuides configuration?", "n"); if ( $skip_config ) { print <<EOF; ===========================================================================

1 0

r1368 - in trunk: t templates
by svnadmin＠urchin.earth.li 27 Apr '12

27 Apr '12

Author: kake Date: 2012-04-27 16:11:11 +0100 (Fri, 27 Apr 2012) New Revision: 1368 Modified: trunk/t/86_recent_changes.t trunk/templates/recent_changes.tt Log: Make sure IP address is always shown for anonymous edits; also, don't try to show host userstats for Auto Create. Modified: trunk/t/86_recent_changes.t =================================================================== --- trunk/t/86_recent_changes.t 2012-04-27 13:41:38 UTC (rev 1367) +++ trunk/t/86_recent_changes.t 2012-04-27 15:11:11 UTC (rev 1368) @@ -21,7 +21,7 @@ } -plan tests => 10; +plan tests => 14; OpenGuides::Test::refresh_db(); @@ -158,3 +158,35 @@ local $TODO = "http://dev.openguides.org/ticket/270"; unlike ($output, qr/First edit/, "showing a page edit twice when not showing minor edits"); } + +# Now write a node that will Auto Create a locale, and check the +# Recent Changes output with minor edits and admin links switched on. +# We can't use OG::Test->write_data() for this, because it calls +# make_cgi_object(), which overwrites REMOTE_ADDR (and we want to test +# output of IP address). +$q = OpenGuides::Test->make_cgi_object(); +$q->param( -name => "username", -value => "Anonymous" ); +$q->param( -name => "locales", -value => "London" ); +my $test_host = "198.51.100.255"; +$ENV{REMOTE_ADDR} = $test_host; +$guide->commit_node( id => "A Pub", cgi_obj => $q, return_output => 1 ); +$ENV{HTTP_COOKIE} = OpenGuides::CGI->make_prefs_cookie( + config => $config, show_minor_edits_in_rc => 1, is_admin => 1 ); +$output = $guide->display_recent_changes( return_output => 1 ); +like( $output, qr|Auto\s+Create|, + "Auto Create stuff shown on Recent Changes." ); +unlike( $output, qr|host=;action=userstats|, + "...and no spurious link to host userstats" ); + +# Make sure IP addresses always show up for anonymous edits. +$ENV{HTTP_COOKIE} = OpenGuides::CGI->make_prefs_cookie( + config => $config, is_admin => 1 ); +$output = $guide->display_recent_changes( return_output => 1 ); +like( $output, qr|$test_host|, + "IP addresses show for anon edits when admin links switched on" ); +$ENV{HTTP_COOKIE} = OpenGuides::CGI->make_prefs_cookie( + config => $config, is_admin => 0 ); +$output = $guide->display_recent_changes( return_output => 1 ); +like( $output, qr|$test_host|, + "...also when admin links switched off" ); + Modified: trunk/templates/recent_changes.tt =================================================================== --- trunk/templates/recent_changes.tt 2012-04-27 13:41:38 UTC (rev 1367) +++ trunk/templates/recent_changes.tt 2012-04-27 15:11:11 UTC (rev 1368) @@ -48,10 +48,10 @@ [% END %] [% IF (node.username != 'Anonymous') %] <a href="[% cgi_url %]?username=[% node.username %];action=userstats">[% node.username %]</a> - [% IF is_admin %] + [% IF is_admin AND node.host %] ([% host_link %]) [% END %] - [% ELSIF is_admin %] + [% ELSE %] [% host_link %] [% END %] </span> [% IF node.comment %]- [% END %]<span class="recentchanges_comment">[% node.comment %]</span>

1 0

r1367 - trunk/templates
by svnadmin＠urchin.earth.li 27 Apr '12

27 Apr '12

Author: kake Date: 2012-04-27 14:41:38 +0100 (Fri, 27 Apr 2012) New Revision: 1367 Modified: trunk/templates/navbar_search.tt Log: Made navbar search form do GET instead of POST. Modified: trunk/templates/navbar_search.tt =================================================================== --- trunk/templates/navbar_search.tt 2012-04-27 13:37:06 UTC (rev 1366) +++ trunk/templates/navbar_search.tt 2012-04-27 13:41:38 UTC (rev 1367) @@ -2,7 +2,7 @@ <div class="navbar_group_title">Search:</div> <ul> <li> - <form method="post" action="[% script_url %]search.cgi" enctype="application/x-www-form-urlencoded"> + <form method="get" action="[% script_url %]search.cgi"> <input type="hidden" name="action" value="search" /> <input type="text" size="15" name="search" id="nav_search" value="Search text" onfocus="this.value=''" /> <label for="nav_search" class="hidden">Search text</label> <input type="submit" value="Go" class="form_button" />

1 0

r1366 - in trunk: t templates
by svnadmin＠urchin.earth.li 27 Apr '12

27 Apr '12

Author: kake Date: 2012-04-27 14:37:06 +0100 (Fri, 27 Apr 2012) New Revision: 1366 Modified: trunk/t/33_search_advanced_search.t trunk/templates/search.tt Log: Stopped spurious 'score' output for non-scored search results. Modified: trunk/t/33_search_advanced_search.t =================================================================== --- trunk/t/33_search_advanced_search.t 2012-04-27 09:52:18 UTC (rev 1365) +++ trunk/t/33_search_advanced_search.t 2012-04-27 13:37:06 UTC (rev 1366) @@ -18,12 +18,11 @@ } -plan tests => 8; +plan tests => 9; # Clear out the database from any previous runs. +OpenGuides::Test::refresh_db(); - OpenGuides::Test::refresh_db(); - my $config = OpenGuides::Config->new( vars => { dbtype => "sqlite", @@ -100,6 +99,15 @@ is_deeply( \@ordered, [ "Crabtree Tavern", "Hammersmith Bridge", "Blue Anchor" ], "...and returns them in the right order" ); +my $output = $search->run( + return_output => 1, + vars => { + latitude => 51.484320, + longitude => -0.223484, + latlong_dist => 1000, + }, + ); +unlike( $output, qr|(score:\s+)|, "...no spurious 'scores' printed" ); %tt_vars = $search->run( return_tt_vars => 1, Modified: trunk/templates/search.tt =================================================================== --- trunk/templates/search.tt 2012-04-27 09:52:18 UTC (rev 1365) +++ trunk/templates/search.tt 2012-04-27 13:37:06 UTC (rev 1366) @@ -66,7 +66,10 @@ <ol start="[% first_num %]"> [% FOREACH result = results %] <li> - <a href="[% result.url %]"><b>[% result.name %]</b></a> (score: [% result.score %]) + <a href="[% result.url %]"><b>[% result.name %]</b></a> + [% IF result.score %] + (score: [% result.score %]) + [% END %] [% IF result.distance %] ([% result.distance %] metres away) [% END %][% IF result.summary %]

1 0

r1365 - in trunk: . t templates
by svnadmin＠urchin.earth.li 27 Apr '12

27 Apr '12

Author: kake Date: 2012-04-27 10:52:18 +0100 (Fri, 27 Apr 2012) New Revision: 1365 Modified: trunk/README.CSS trunk/t/55_node_history.t trunk/templates/node.tt Log: Added another link to current version on historical display of nodes (this one is near the title, and can be hidden with CSS). Modified: trunk/README.CSS =================================================================== --- trunk/README.CSS 2012-04-24 15:16:38 UTC (rev 1364) +++ trunk/README.CSS 2012-04-27 09:52:18 UTC (rev 1365) @@ -120,6 +120,11 @@ Purpose: Defines content that will be hidden for users with a CSS-conforming user agent +span.current_version_title_link + Used in: node.tt + Purpose: On display of historical versions of nodes, provides a link to + the current version. + span.node_name Used in: backlink_results.tt delete_confirm.tt delete_done.tt differences.tt node_history.tt Modified: trunk/t/55_node_history.t =================================================================== --- trunk/t/55_node_history.t 2012-04-24 15:16:38 UTC (rev 1364) +++ trunk/t/55_node_history.t 2012-04-27 09:52:18 UTC (rev 1365) @@ -11,10 +11,13 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 2; +eval { require Test::HTML::Content; }; +my $thc = $@ ? 0 : 1; - OpenGuides::Test::refresh_db(); +plan tests => 4; +OpenGuides::Test::refresh_db(); + my $config = OpenGuides::Test->make_basic_config; $config->script_name( "mywiki.cgi" ); $config->script_url( "http://example.com/" ); @@ -22,7 +25,7 @@ $guide->wiki->write_node( "South Croydon Station", "A sleepy main-line station in what is arguably the nicest part of Croydon.", undef, { comment => "<myfaketag>" } ) or die "Can't write node"; my %data = $guide->wiki->retrieve_node( "South Croydon Station" ); -$guide->wiki->write_node( "South Croydon Station", "A sleepy main-line station in what is arguably the nicest part of Croydon.", $data{checksum}, { comment => "<myfaketag>" } ) or die "Can't write node"; +$guide->wiki->write_node( "South Croydon Station", "A sleepy mainline station in what is arguably the nicest part of Croydon.", $data{checksum}, { comment => "<myfaketag>" } ) or die "Can't write node"; my $output = $guide->display_node( id => "South Croydon Station", @@ -33,4 +36,12 @@ "node param escaped properly in links in historic view" ); unlike( $output, qr'South%20Croydon%20Station', "...in all links" ); - +SKIP: { + skip "Test::HTML::Content not available", 2 unless $thc; + Test::HTML::Content::tag_ok( + $output, "span", { class => "current_version_title_link" }, + "historical version has link to current version near title" ); + Test::HTML::Content::link_ok( $output, + "mywiki.cgi?South_Croydon_Station", + "...and the link is correct" ); +} Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2012-04-24 15:16:38 UTC (rev 1364) +++ trunk/templates/node.tt 2012-04-27 09:52:18 UTC (rev 1365) @@ -92,6 +92,9 @@ [% END %] version [% version %] of <span class="node_name">[% node_name %]</span></em> + <span class="current_version_title_link"> + <a href="[% cgi_url %]?[% node_param %]">(view current version)</a> + </span> </h2> [% END %] [% IF empty_node %]

1 0

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