openguides-commits June 2007

openguides-commits@lists.openguides.org

1 participants
59 discussions

r1080 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: ilmari Date: 2007-06-16 18:30:53 +0100 (Sat, 16 Jun 2007) New Revision: 1080 Modified: trunk/lib/OpenGuides/Template.pm Log: Make sure coordinates are non-empty as well as defined. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-16 15:41:13 UTC (rev 1079) +++ trunk/lib/OpenGuides/Template.pm 2007-06-16 17:30:53 UTC (rev 1080) @@ -423,19 +423,19 @@ $os_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( defined $os_x && defined $os_y ) { + if ( defined $os_x && length $os_x && defined $os_y && length $os_y ) { my $point = Geography::NationalGrid::GB->new( Easting =>$os_x, Northing=>$os_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( defined $lat && defined $long ) { + } elsif ( defined $lat && length $lat && defined $long && length $long ) { my $point = Geography::NationalGrid::GB->new(Latitude => $lat, Longitude => $long); $os_x = $point->easting; $os_y = $point->northing; } - if ( defined $os_x && defined $os_y ) { + if ( defined $os_x && length $os_x && defined $os_y && length $os_y ) { %vars = ( %vars, latitude => $lat, @@ -468,18 +468,18 @@ $osie_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( defined $osie_x && defined $osie_y ) { + if ( defined $osie_x && length $osie_x && defined $osie_y && length $osie_y ) { my $point = Geography::NationalGrid::IE->new(Easting=>$osie_x, Northing=>$osie_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( defined $lat && defined $long ) { + } elsif ( defined $lat && length $lat && defined $long && length $long ) { my $point = Geography::NationalGrid::GB->new(Latitude => $lat, Longitude => $long); $osie_x = $point->easting; $osie_y = $point->northing; } - if ( defined $osie_x && defined $osie_y ) { + if ( defined $osie_x && length $osie_x && defined $osie_y && length $osie_y ) { %vars = ( %vars, latitude => $lat, @@ -505,7 +505,7 @@ my $lat = $q->param("latitude"); my $long = $q->param("longitude"); - if ( defined $lat && defined $long ) { + if ( defined $lat && length $lat && defined $long && length $long ) { # Trim whitespace. $lat =~ s/\s+//g; $long =~ s/\s+//g; @@ -542,7 +542,7 @@ my %prefs = OpenGuides::CGI->get_prefs_from_cookie( config => $config ); if ( $prefs{latlong_traditional} ) { foreach my $var ( qw( latitude longitude ) ) { - next unless defined $vars{$var}; + next unless defined $vars{$var} && length $vars{$var}; $vars{$var."_unmunged"} = $vars{$var}; $vars{$var} = Geography::NationalGrid->deg2string($vars{$var}); }

1 0

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

16 Jun '07

Author: dom Date: 2007-06-16 16:41:13 +0100 (Sat, 16 Jun 2007) New Revision: 1079 Added: trunk/t/69_bug_zero_geo.t Modified: trunk/lib/OpenGuides/Template.pm Log: Fix bug representing zero geodata (fixes #215) Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-16 14:20:24 UTC (rev 1078) +++ trunk/lib/OpenGuides/Template.pm 2007-06-16 15:41:13 UTC (rev 1079) @@ -423,19 +423,19 @@ $os_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( $os_x && $os_y ) { + if ( defined $os_x && defined $os_y ) { my $point = Geography::NationalGrid::GB->new( Easting =>$os_x, Northing=>$os_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( $lat && $long ) { + } elsif ( defined $lat && defined $long ) { my $point = Geography::NationalGrid::GB->new(Latitude => $lat, Longitude => $long); $os_x = $point->easting; $os_y = $point->northing; } - if ( $os_x && $os_y ) { + if ( defined $os_x && defined $os_y ) { %vars = ( %vars, latitude => $lat, @@ -468,18 +468,18 @@ $osie_y =~ s/\s+//g; # If we were sent x and y, work out lat/long; and vice versa. - if ( $osie_x && $osie_y ) { + if ( defined $osie_x && defined $osie_y ) { my $point = Geography::NationalGrid::IE->new(Easting=>$osie_x, Northing=>$osie_y); $lat = sprintf("%.6f", $point->latitude); $long = sprintf("%.6f", $point->longitude); - } elsif ( $lat && $long ) { + } elsif ( defined $lat && defined $long ) { my $point = Geography::NationalGrid::GB->new(Latitude => $lat, Longitude => $long); $osie_x = $point->easting; $osie_y = $point->northing; } - if ( $osie_x && $osie_y ) { + if ( defined $osie_x && defined $osie_y ) { %vars = ( %vars, latitude => $lat, @@ -505,7 +505,7 @@ my $lat = $q->param("latitude"); my $long = $q->param("longitude"); - if ( $lat && $long ) { + if ( defined $lat && defined $long ) { # Trim whitespace. $lat =~ s/\s+//g; $long =~ s/\s+//g; Added: trunk/t/69_bug_zero_geo.t =================================================================== --- trunk/t/69_bug_zero_geo.t (rev 0) +++ trunk/t/69_bug_zero_geo.t 2007-06-16 15:41:13 UTC (rev 1079) @@ -0,0 +1,103 @@ +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides::Config; +use Cwd; +use OpenGuides; +use Test::More; +use OpenGuides::Test; + +eval { require DBD::SQLite; }; +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; +} + +plan tests => 6; + +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +my $config = OpenGuides::Config->new( + vars => { + dbtype => "sqlite", + dbname => "t/node.db", + indexing_directory => "t/indexes", + script_url => "http://wiki.example.com/", + script_name => "mywiki.cgi", + site_name => "Wiki::Toolkit Test Site", + template_path => cwd . "/templates", + } +); +eval { require Wiki::Toolkit::Search::Plucene; }; +if ( $@ ) { $config->use_plucene ( 0 ) }; + +$config->{geo_handler} = 1; + +my $guide = OpenGuides->new( config => $config ); + +my $q = OpenGuides::Test->make_cgi_object( + content => "Blah", + os_x => 0, + os_y => 0 +); + +my $output = $guide->commit_node( + id => "Test Node", + cgi_obj => $q, + return_output => 1 +); + +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" ); + +$config->{geo_handler} = 2; + +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + +$guide = OpenGuides->new( config => $config ); + +$q = OpenGuides::Test->make_cgi_object( + content => "Blah", + osie_x => 0, + osie_y => 0 +); + +$output = $guide->commit_node( + id => "Test Node IE", + cgi_obj => $q, + return_output => 1 +); + +%details = $guide->wiki->retrieve_node("Test Node IE"); + +is( @{$details{metadata}->{osie_x}}[0], 0, "Zero osie_x saved" ); +is( @{$details{metadata}->{osie_y}}[0], 0, "Zero osie_y saved" ); + +$config->{geo_handler} = 3; + +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + +$guide = OpenGuides->new( config => $config ); + +$q = OpenGuides::Test->make_cgi_object( + content => "Blah", + latitude => 0, + longitude => 0 +); + +$output = $guide->commit_node( + id => "Test Node lat/long", + cgi_obj => $q, + return_output => 1 +); + +%details = $guide->wiki->retrieve_node("Test Node lat/long"); + +is( @{$details{metadata}->{latitude}}[0], 0, "Zero latitude saved" ); +is( @{$details{metadata}->{longitude}}[0], 0, "Zero longitude saved" ); +

1 0

r1078 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: dom Date: 2007-06-16 15:20:24 +0100 (Sat, 16 Jun 2007) New Revision: 1078 Modified: trunk/lib/OpenGuides/Test.pm Log: make_cgi_object: "0" is a valid value; don't lose this Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2007-06-16 13:55:52 UTC (rev 1077) +++ trunk/lib/OpenGuides/Test.pm 2007-06-16 14:20:24 UTC (rev 1078) @@ -190,7 +190,11 @@ latitude longitude summary username comment edit_type ) ) { - $q->param( -name => $param, -value => $args{$param} || "" ); + if (defined $args{$param}) { + $q->param( -name => $param, -value => $args{$param} ); + } else { + $q->param( -name => $param, -value => '' ); + } } $ENV{REMOTE_ADDR} = "127.0.0.1";

1 0

r1077 - trunk/t
by svnadmin＠urchin.earth.li 16 Jun '07

16 Jun '07

Author: dom Date: 2007-06-16 14:55:52 +0100 (Sat, 16 Jun 2007) New Revision: 1077 Modified: trunk/t/17_commit_node.t Log: Fix silly my $foo bug Modified: trunk/t/17_commit_node.t =================================================================== --- trunk/t/17_commit_node.t 2007-06-12 22:39:09 UTC (rev 1076) +++ trunk/t/17_commit_node.t 2007-06-16 13:55:52 UTC (rev 1077) @@ -88,7 +88,7 @@ is( $node{metadata}->{edit_type}[0], "Normal edit", "Right edit type" ); # Now try to commit some invalid data, and make sure we get an edit form back -my $q = OpenGuides::Test->make_cgi_object( +$q = OpenGuides::Test->make_cgi_object( content => "foo", os_x => "fooooo", username => "bob",

1 0

r1076 - sites/oxford.openguides.org/templates
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

Author: dom Date: 2007-06-12 23:39:09 +0100 (Tue, 12 Jun 2007) New Revision: 1076 Added: sites/oxford.openguides.org/templates/custom_header.tt sites/oxford.openguides.org/templates/navbar_this_page.tt Removed: sites/oxford.openguides.org/templates/display_metadata.tt.old sites/oxford.openguides.org/templates/header.tt sites/oxford.openguides.org/templates/navbar.tt sites/oxford.openguides.org/templates/needing_moderation.tt Modified: sites/oxford.openguides.org/templates/display_metadata.tt sites/oxford.openguides.org/templates/map_index.tt Log: Sync with 0.60 templates Added: sites/oxford.openguides.org/templates/custom_header.tt =================================================================== --- sites/oxford.openguides.org/templates/custom_header.tt (rev 0) +++ sites/oxford.openguides.org/templates/custom_header.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -0,0 +1,3 @@ +[% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] + <script src="http://media.mapnik.org/js/mapnik.js" type="text/javascript"></script> +[% END %] Modified: sites/oxford.openguides.org/templates/display_metadata.tt =================================================================== --- sites/oxford.openguides.org/templates/display_metadata.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/display_metadata.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -5,14 +5,27 @@ node_image %] <div id="metadata" class="vcard"> [% IF node_image %] - <div id="node_image_box"> - <img id="node_image" src="[% node_image %]" alt="Picture of [% node_name %]" /> - </div> + <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" /> + <span id="node_no_image" /> [% END %] -  +  <span class="fn" style="display:none">[% node_name %]</span> [% IF phone OR fax OR address OR postcode OR formatted_website_text OR hours_text OR map_link %] @@ -20,12 +33,12 @@ [% IF phone %] <li class="telephone"> - <span class="metadata_label">Telephone (area code 01865 if omitted):</span> <span class="tel">[% CGI.escapeHTML(phone) %]</span> + <span class="metadata_label">Telephone (01865 if omitted):</span> <span class="tel">[% CGI.escapeHTML(phone) %]</span> </li> [% END %] [% IF fax %] <li class="fax"> - <span class="metadata_label">Fax: (area code 01865 if omitted)</span> [% CGI.escapeHTML(fax) %] + <span class="metadata_label">Fax (01865 if omitted):</span> [% CGI.escapeHTML(fax) %] </li> [% END %] [% IF address %] @@ -35,15 +48,17 @@ [% IF map_link %] <a href="[% map_link %]">(map of this place)</a> [% ELSIF os_x AND os_y %] - <a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %] -&[% os_y %]&arrow=yes">(map of this place)</a> - + <a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">(map of this place)</a> [% END %] </li> [% ELSIF map_link %] <li class="map"> <span class="metadata_label"><a href="[% map_link %]">Map of this place</a></span> </li> + [% ELSIF os_x AND os_y %] + <li class="map"> + <span class="metadata_label"><a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">(map of this place)</a></span> + </li> [% END %] [% IF postcode %] <li class="postcode"> Deleted: sites/oxford.openguides.org/templates/display_metadata.tt.old =================================================================== --- sites/oxford.openguides.org/templates/display_metadata.tt.old 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/display_metadata.tt.old 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,86 +0,0 @@ -[% USE CGI %] - - -<div id="metadata"> -[% IF phone OR fax OR address OR postcode OR formatted_website_text - OR hours_text OR map_link %] - <ul id="general_metadata"> - - [% IF phone %] - <li class="telephone"> - <label>Telephone (area code 01865 if omitted):</label> [% CGI.escapeHTML(phone) %] - </li> - [% END %] - [% IF fax %] - <li class="fax"> - <label>Fax: (area code 01865 if omitted)</label> [% CGI.escapeHTML(fax) %] - </li> - [% END %] - [% IF address %] - <li class="address"> - <label>Address:</label> - [% IF map_link %] - [<a href="[% map_link %]">[% CGI.escapeHTML(address) %]</a>] - [% ELSIF os_x AND os_y %] - [<a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">[% CGI.escapeHTML(address) %]</a>] - [% ELSE %] - [% CGI.escapeHTML(address) %] - [% END %] - </li> - [% ELSIF map_link %] - <li class="map"> - <label>Map:</label> - [<a href="[% map_link %]">[% CGI.escapeHTML(map_link) %]</a>] - </li> - [% ELSIF os_x AND os_y %] - <li class="map"> - [<a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">http://www.streetmap.co.uk/streetmap.dll?grid2map?[% CGI.escapeHTML(os_x) %]&[% CGI.escapeHTML(os_y) %]&arrow=yes</a>] - </li> - [% END %] - [% IF postcode %] - <li class="postcode"> - <label>Postcode:</label> - [% CGI.escapeHTML(postcode) %] - </li> - [% END %] - [% IF formatted_website_text %] - <li class="website_link"> - <label>Website:</label> [% formatted_website_text %] - </li> - [% END %] - [% IF hours_text %] - <li class="opening_hours"> - <label>Opening Hours:</label> - [% CGI.escapeHTML(hours_text) %] - </li> - [% END %] - </ul> -[% END %] - -[% IF (categories.size AND categories.size > 0) - OR (locales.size AND locales.size > 0) %] - <ul id="categories_and_locales"> - [% IF categories.size AND categories.size > 0 %] - <li class="categories_list"> - <label>Categories:</label> - [% FOREACH category = categories %] - <a href="[% category.url %]">[% category.name %]</a> - [% "/" UNLESS loop.last %] - [% END %] - </li> - [% END %] - - [% IF locales.size AND locales.size > 0 %] - <li class="locales_list"> - <label>Locale:</label> - [% FOREACH locale = locales %] - <a href="[% locale.url %]">[% locale.name %]</a> - [% "/" UNLESS loop.last %] - [% END %] - </li> - [% END %] - </ul> -[% END %] -</div> - - Deleted: sites/oxford.openguides.org/templates/header.tt =================================================================== --- sites/oxford.openguides.org/templates/header.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/header.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,52 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="[% language %]"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - [% IF page_title %] - <title>[% page_title %]</title> - [% ELSE %] - <title>[% node_name %] - [% site_name %]</title> - [% END %] - [% IF contact_email %] - <link rev="made" href="mailto:[% contact_email %]" /> - [% END %] - [% IF summary %] - <meta name="description" content="[% summary %]" /> - [% END %] - [% IF stylesheet %] - <link rel="stylesheet" href="[% stylesheet %]" type="text/css" title="Stylesheet for [% site_name %]" /> - [% END %] - [% IF feed_base %] - <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="DC.title" content="[% site_name %]" /> - [% 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" /> - [% IF deter_robots %] - <meta name="robots" content="noindex,nofollow" /> - [% END %] - [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] - <script src="http://maps.google.com/maps?file=api&v=2&key=[% gmaps_api_key %]" type="text/javascript"></script> - <script src="http://media.mapnik.org/js/mapnik.js" type="text/javascript"></script> - [% END %] -</head> -<body> - [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] - <script defer="defer" type="text/javascript"> - //<![CDATA[ - var baseIcon = new GIcon(); - baseIcon.image = "http://www.google.com/mapfiles/marker.png"; - baseIcon.shadow = "http://www.google.com/mapfiles/shadow50.png"; - baseIcon.iconSize = new GSize(10, 17); - baseIcon.shadowSize = new GSize(20, 17); - baseIcon.iconAnchor = new GPoint(5, 17); - baseIcon.infoWindowAnchor = new GPoint(9, 2); - baseIcon.infoShadowAnchor = new GPoint(9, 12); - //]]> - </script> - [% END %] Modified: sites/oxford.openguides.org/templates/map_index.tt =================================================================== --- sites/oxford.openguides.org/templates/map_index.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/map_index.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,4 +1,4 @@ -[% INCLUDE header.tt page_title = "Map of all nodes" %] +[% INCLUDE header.tt page_title = criterion.name || "Map of all nodes" %] [% INCLUDE banner.tt %] <div id="content"> <a href="" id="permalink">Link to this page</a> Deleted: sites/oxford.openguides.org/templates/navbar.tt =================================================================== --- sites/oxford.openguides.org/templates/navbar.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/navbar.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,60 +0,0 @@ -<div id="navbar"> - - <strong><a href="[% full_cgi_url %]">Back to home</a></strong> - - <div class="navbar_group"> - <div class="navbar_group_title">Tools:</div> - <div class="navbar_item"><a href="[% full_cgi_url %]?RecentChanges">Recent Changes</a> <span class="hidden">/</span></div> - <div class="navbar_item"><a href="newpage.cgi">Create a new page</a> <span class="hidden">/</span></div> - <div class="navbar_item"><a href="[% full_cgi_url %]?action=random">Random Page</a> <span class="hidden">/</span></div> - <div class="navbar_item"><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a> <span class="hidden">/</span></div> - [% IF geocache_link AND latitude AND longitude %] - <div class="navbar_item"><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% latitude %];origin_long=[% longitude %]">Look for nearby geocaches</a></div> - [% END %] - </div> - - [% UNLESS omit_help_links %] - <div class="navbar_group"> - <div class="navbar_group_title">Help: <span class="hidden">/</span></div> - <div class="navbar_item"><a href="[% full_cgi_url %]?FAQ">FAQ</a> <span class="hidden">/</span></div> - <div class="navbar_item"><a href="[% full_cgi_url %]?How_To_Get_Started">How To Get Started</a> <span class="hidden">/</span></div> - [% IF formatting_rules_link %] - <div class="navbar_item"><a href="[% formatting_rules_link %]">[% formatting_rules_node %]</a> <span class="hidden">/</span></div> - [% END %] - <div class="navbar_item"><a href="[% full_cgi_url %]?Wiki_Etiquette">Wiki Etiquette</a> <span class="hidden">/</span></div> - </div> - [% END %] - - <div class="navbar_group"> - <div class="navbar_group_title">Options:</div> - <div class="navbar_item"><a href="preferences.cgi">Set username/prefs</a></div> - </div> - - <div class="navbar_group"> - <div class="navbar_group_title">Search:</div> - <div class="navbar_item"> - <form method="post" action="search.cgi" enctype="application/x-www-form-urlencoded"> - <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" /> - </form> - </div> - <div class="navbar_item"> - <a href="search.cgi">Advanced Search</a> - </div> - </div> - - [% UNLESS not_editable %] - <div class="navbar_group"> - <div class="navbar_group_title">This page:</div> - <div class="edit_page_link"><a href="[% full_cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></div> - <div class="navbar_item"> - <a href="[% cgi_url %]?action=show_backlinks;id=[% node_param %]">Pages that link to here</a> - </div> - <div class="navbar_item"> - <a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi?[% node_param %]">Jump to Vegan Oxford entry</a> - </div> - </div> - [% END %] - -</div> Added: sites/oxford.openguides.org/templates/navbar_this_page.tt =================================================================== --- sites/oxford.openguides.org/templates/navbar_this_page.tt (rev 0) +++ sites/oxford.openguides.org/templates/navbar_this_page.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -0,0 +1,17 @@ +[% UNLESS not_editable %] + <div id="navbar_this_page"> + <div class="navbar_group_title">This page:</div> + <ul> + <li><a class="edit_page_link" href="[% source_site or full_cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></li> + <li><a href="[% full_cgi_url %]?action=show_backlinks;id=[% node_param %]">Show pages linking here</a></li> + [% IF version AND version > 1 %] + <li><a href="[% full_cgi_url %]?action=list_all_versions;id=[% node_param %]">List all revisions</a></li> + [% END %] + <li><a href="[% full_cgi_url %]?id=[% node_param %];format=rdf">RDF/XML version</a></li> + [% IF enable_page_deletion %] + <li><a href="[% full_cgi_url %]?id=[% node_param %];action=delete">Delete (admin only)</a></li> + [% END %] + <li><a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi?[% node_param %]">Jump to Vegan Oxford entry</a></li> + </ul> + </div> +[% END %] Deleted: sites/oxford.openguides.org/templates/needing_moderation.tt =================================================================== --- sites/oxford.openguides.org/templates/needing_moderation.tt 2007-06-12 22:22:53 UTC (rev 1075) +++ sites/oxford.openguides.org/templates/needing_moderation.tt 2007-06-12 22:39:09 UTC (rev 1076) @@ -1,27 +0,0 @@ -[% INCLUDE header.tt page_title = "Pages Needing Moderation - $site_name" %] -[% INCLUDE banner.tt %] -<div id="content"> -[% INCLUDE navbar.tt %] -<div id="maincontent"> -<h2>Pages Needing Moderation</h2> -<p> -These are nodes which have been created/edited, but not yet moderated. -</p> -<table id="needing_moderation" style="width:90%"> -<tr><th>Node name</th><th>Pending Version</th><th>Latest Moderated Version</th><th>Action</th></tr> - [% FOREACH node = nodes %] - <tr> - <td>[% node.name %]</td> - <td align="center">[% node.version %]</td> - <td align="center">[% node.moderated_version %]</td> - <td><a href="[% node.moderate_url %]">Moderate this version</a> - or <a href="[% node.delete_url %]">Delete this version</a> - or <a href="[% node.view_url %]">View this version</a> - or <a href="[% node.diff_url %]">See changes</a> - </td> - </tr> - [% END %] -</table> - -</div> -[% INCLUDE footer.tt %]

1 0

r1075 - sites
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

Author: dom Date: 2007-06-12 23:22:53 +0100 (Tue, 12 Jun 2007) New Revision: 1075 Added: sites/README Log: Add README for this dir Added: sites/README =================================================================== --- sites/README (rev 0) +++ sites/README 2007-06-12 22:22:53 UTC (rev 1075) @@ -0,0 +1,5 @@ +This is a spare for people to manage data on their on sites. +You are welcome to create a directory named after your own guide here, +but please leave other guides alone. + +-- Dom, 2007-06-12

1 0

r1074 - in sites/oxford.openguides.org: . templates
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

Author: dom Date: 2007-06-12 23:20:11 +0100 (Tue, 12 Jun 2007) New Revision: 1074 Added: sites/oxford.openguides.org/templates/ sites/oxford.openguides.org/templates/custom_banner.tt sites/oxford.openguides.org/templates/custom_footer_credits.tt sites/oxford.openguides.org/templates/custom_licence.tt sites/oxford.openguides.org/templates/display_metadata.tt sites/oxford.openguides.org/templates/display_metadata.tt.old sites/oxford.openguides.org/templates/header.tt sites/oxford.openguides.org/templates/map_index.tt sites/oxford.openguides.org/templates/navbar.tt sites/oxford.openguides.org/templates/needing_moderation.tt sites/oxford.openguides.org/templates/node.tt Log: Add oxford's custom templates Added: sites/oxford.openguides.org/templates/custom_banner.tt =================================================================== --- sites/oxford.openguides.org/templates/custom_banner.tt (rev 0) +++ sites/oxford.openguides.org/templates/custom_banner.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1 @@ +<h1>[% site_name %]</h1> Added: sites/oxford.openguides.org/templates/custom_footer_credits.tt =================================================================== --- sites/oxford.openguides.org/templates/custom_footer_credits.tt (rev 0) +++ sites/oxford.openguides.org/templates/custom_footer_credits.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,15 @@ + <table border="0" width="100%"> + <tr><td> + <a href="http://creativecommons.org/licenses/by-sa/2.5/"><img src="http://oxford.openguides.org/resources/somerights20.gif" width="88" height="31" alt="Creative Commons licence"></a> + This work is <a href="http://oxford.openguides.org/wiki/?Licensing_Policy">licensed</a> under a <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons licence</a>. + </td> +<td align="right"> + [% IF enable_page_deletion AND NOT not_deletable %] + <a href="?id=[% node_param %];action=delete">Delete page</a> (admins only) +<br> + [% END %] + + This wiki powered by <a href="http://openguides.org/">OpenGuides</a> (version [% openguides_version %]). +</td> +</tr> +</table> Added: sites/oxford.openguides.org/templates/custom_licence.tt =================================================================== --- sites/oxford.openguides.org/templates/custom_licence.tt (rev 0) +++ sites/oxford.openguides.org/templates/custom_licence.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,12 @@ +<strong>IMPORTANT: By contributing to this guide you +consent to it being placed under the terms of a <a href="http://creativecommons.org/licenses/">Creative Commons</a> +license, and agree that your contributions may be attributed to "The Oxford Guide" or +"The Open Guide to Oxford". Do not submit copyrighted material without written permission from the original author (this could constitute the material +being available under a compatible licence), unless it falls within the +scope of fair dealing as defined by UK law. Please see our +<a href="[% cgi_url %]?Licensing_Policy">licensing policy</a> for full +details.</strong> +<p> +<strong>Currently all submissions are being moderated so won't appear on the +wiki immediately. Don't panic! However, you may wish to make more careful use +of the preview function.</strong> Added: sites/oxford.openguides.org/templates/display_metadata.tt =================================================================== --- sites/oxford.openguides.org/templates/display_metadata.tt (rev 0) +++ sites/oxford.openguides.org/templates/display_metadata.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,92 @@ +[% 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"> + <img id="node_image" src="[% node_image %]" alt="Picture of [% node_name %]" /> + </div> +[% ELSE %] + <span id="node_no_image" /> +[% END %] + +  + <span class="fn" style="display:none">[% node_name %]</span> +[% IF phone OR fax OR address OR postcode OR formatted_website_text + OR hours_text OR map_link %] + <ul id="general_metadata"> + + [% IF phone %] + <li class="telephone"> + <span class="metadata_label">Telephone (area code 01865 if omitted):</span> <span class="tel">[% CGI.escapeHTML(phone) %]</span> + </li> + [% END %] + [% IF fax %] + <li class="fax"> + <span class="metadata_label">Fax: (area code 01865 if omitted)</span> [% CGI.escapeHTML(fax) %] + </li> + [% END %] + [% IF address %] + <li class="address"> + <span class="metadata_label">Address:</span> + <span class="adr"><span class="street-address">[% CGI.escapeHTML(address) %]</span></span> [%# uncomment at left to show city %] + [% IF map_link %] + <a href="[% map_link %]">(map of this place)</a> + [% ELSIF os_x AND os_y %] + <a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %] +&[% os_y %]&arrow=yes">(map of this place)</a> + + [% END %] + </li> + [% ELSIF map_link %] + <li class="map"> + <span class="metadata_label"><a href="[% map_link %]">Map of this place</a></span> + </li> + [% END %] + [% IF postcode %] + <li class="postcode"> + <span class="metadata_label">Postcode:</span> + <span class="adr"><span class="postal-code">[% CGI.escapeHTML(postcode) %]</span></span> + </li> + [% END %] + [% IF formatted_website_text %] + <li class="website_link"> + <span class="metadata_label">Website:</span> <span class="url">[% formatted_website_text %]</span> + </li> + [% END %] + [% IF hours_text %] + <li class="opening_hours"> + <span class="metadata_label">Opening Hours:</span> + [% CGI.escapeHTML(hours_text) %] + </li> + [% END %] + </ul> +[% END %] + +[% IF (categories.size AND categories.size > 0) + OR (locales.size AND locales.size > 0) %] + <ul id="categories_and_locales"> + [% IF categories.size AND categories.size > 0 %] + <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 %] + [% END %] + </li> + [% END %] + + [% IF locales.size AND locales.size > 0 %] + <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 %] + [% END %] + </li> + [% END %] + </ul> +[% END %] +</div> +[% END %] + Added: sites/oxford.openguides.org/templates/display_metadata.tt.old =================================================================== --- sites/oxford.openguides.org/templates/display_metadata.tt.old (rev 0) +++ sites/oxford.openguides.org/templates/display_metadata.tt.old 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,86 @@ +[% USE CGI %] + + +<div id="metadata"> +[% IF phone OR fax OR address OR postcode OR formatted_website_text + OR hours_text OR map_link %] + <ul id="general_metadata"> + + [% IF phone %] + <li class="telephone"> + <label>Telephone (area code 01865 if omitted):</label> [% CGI.escapeHTML(phone) %] + </li> + [% END %] + [% IF fax %] + <li class="fax"> + <label>Fax: (area code 01865 if omitted)</label> [% CGI.escapeHTML(fax) %] + </li> + [% END %] + [% IF address %] + <li class="address"> + <label>Address:</label> + [% IF map_link %] + [<a href="[% map_link %]">[% CGI.escapeHTML(address) %]</a>] + [% ELSIF os_x AND os_y %] + [<a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">[% CGI.escapeHTML(address) %]</a>] + [% ELSE %] + [% CGI.escapeHTML(address) %] + [% END %] + </li> + [% ELSIF map_link %] + <li class="map"> + <label>Map:</label> + [<a href="[% map_link %]">[% CGI.escapeHTML(map_link) %]</a>] + </li> + [% ELSIF os_x AND os_y %] + <li class="map"> + [<a href="http://www.streetmap.co.uk/streetmap.dll?grid2map?[% os_x %]&[% os_y %]&arrow=yes">http://www.streetmap.co.uk/streetmap.dll?grid2map?[% CGI.escapeHTML(os_x) %]&[% CGI.escapeHTML(os_y) %]&arrow=yes</a>] + </li> + [% END %] + [% IF postcode %] + <li class="postcode"> + <label>Postcode:</label> + [% CGI.escapeHTML(postcode) %] + </li> + [% END %] + [% IF formatted_website_text %] + <li class="website_link"> + <label>Website:</label> [% formatted_website_text %] + </li> + [% END %] + [% IF hours_text %] + <li class="opening_hours"> + <label>Opening Hours:</label> + [% CGI.escapeHTML(hours_text) %] + </li> + [% END %] + </ul> +[% END %] + +[% IF (categories.size AND categories.size > 0) + OR (locales.size AND locales.size > 0) %] + <ul id="categories_and_locales"> + [% IF categories.size AND categories.size > 0 %] + <li class="categories_list"> + <label>Categories:</label> + [% FOREACH category = categories %] + <a href="[% category.url %]">[% category.name %]</a> + [% "/" UNLESS loop.last %] + [% END %] + </li> + [% END %] + + [% IF locales.size AND locales.size > 0 %] + <li class="locales_list"> + <label>Locale:</label> + [% FOREACH locale = locales %] + <a href="[% locale.url %]">[% locale.name %]</a> + [% "/" UNLESS loop.last %] + [% END %] + </li> + [% END %] + </ul> +[% END %] +</div> + + Added: sites/oxford.openguides.org/templates/header.tt =================================================================== --- sites/oxford.openguides.org/templates/header.tt (rev 0) +++ sites/oxford.openguides.org/templates/header.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,52 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="[% language %]"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + [% IF page_title %] + <title>[% page_title %]</title> + [% ELSE %] + <title>[% node_name %] - [% site_name %]</title> + [% END %] + [% IF contact_email %] + <link rev="made" href="mailto:[% contact_email %]" /> + [% END %] + [% IF summary %] + <meta name="description" content="[% summary %]" /> + [% END %] + [% IF stylesheet %] + <link rel="stylesheet" href="[% stylesheet %]" type="text/css" title="Stylesheet for [% site_name %]" /> + [% END %] + [% IF feed_base %] + <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="DC.title" content="[% site_name %]" /> + [% 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" /> + [% IF deter_robots %] + <meta name="robots" content="noindex,nofollow" /> + [% END %] + [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] + <script src="http://maps.google.com/maps?file=api&v=2&key=[% gmaps_api_key %]" type="text/javascript"></script> + <script src="http://media.mapnik.org/js/mapnik.js" type="text/javascript"></script> + [% END %] +</head> +<body> + [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] + <script defer="defer" type="text/javascript"> + //<![CDATA[ + var baseIcon = new GIcon(); + baseIcon.image = "http://www.google.com/mapfiles/marker.png"; + baseIcon.shadow = "http://www.google.com/mapfiles/shadow50.png"; + baseIcon.iconSize = new GSize(10, 17); + baseIcon.shadowSize = new GSize(20, 17); + baseIcon.iconAnchor = new GPoint(5, 17); + baseIcon.infoWindowAnchor = new GPoint(9, 2); + baseIcon.infoShadowAnchor = new GPoint(9, 12); + //]]> + </script> + [% END %] Added: sites/oxford.openguides.org/templates/map_index.tt =================================================================== --- sites/oxford.openguides.org/templates/map_index.tt (rev 0) +++ sites/oxford.openguides.org/templates/map_index.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,85 @@ +[% INCLUDE header.tt page_title = "Map of all nodes" %] +[% INCLUDE banner.tt %] +<div id="content"> +<a href="" id="permalink">Link to this page</a> + +<div id="maincontent"> + +[% IF gmaps_api_key %] + <ul style="height:400px; overflow:auto;float:right; width:30%;"> + [% i = 0 %] + [% 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') %] + <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 %] + </ul> + + <table width="100%" height="100%"> + <tr><td><div id="map" style=" width: 65%; height: 450px"></div></td></tr> + </table> + + <script defer="defer" type="text/javascript"> + //<![CDATA[ + var map = new GMap2(document.getElementById("map")); + + var copycol = new GCopyrightCollection(""); + var copy = new GCopyright(1, new GLatLngBounds(new GLatLng(-90,-180),new GLatLng(90,180)), 0, "OpenStreetMap"); + copycol.addCopyright(copy); + var tileMapnik = new GTileLayer(copycol,1,17); + tileMapnik.myBaseURL = "http://mapnik.uberfoo.com/"; + tileMapnik.getTileUrl=MapnikGetTileUrl; + tileMapnik.isPng = function () { return true;} + tileMapnik.getOpacity = function() {return 1.0;} + + var layer0 = [tileMapnik]; + var mapnikMap = new GMapType(layer0, G_SATELLITE_MAP.getProjection(), "Mapnik", G_SATELLITE_MAP); + map.addMapType(mapnikMap); + + map.addControl(new GLargeMapControl()); + map.addControl(new GMapTypeControl()); + + map.setCenter(new GLatLng([% IF lat %][% lat %][% ELSE %][% centre_lat %][% END %],[% IF long %][% long %][% ELSE %][% centre_long %][% END %]), [% IF zoom %][% zoom %][% ELSE %][% default_gmaps_zoom %][% END %]); + //map.centerAndZoom(new GPoint([% IF long %][% long %][% ELSE %][% centre_long %][% END %],[% IF lat %][% lat %][% ELSE %][% centre_lat %][% END %]), [% IF zoom %][% zoom %][% ELSE %][% default_gmaps_zoom %][% END %]); + map.setMapType(mapnikMap); + + [% i = 0 %] + [% 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') %] + 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 %] + [% source_url = metadata.source.list.first.match('^(.*?)\?(?:\?|$)').first %] + [% END %] + var htmlString[% i %] = "<a href=\"?[% node.param %]\">[% node.name %]</a> <a style='text-decoration:none;' href=\"[% source_url %]?id=[% node.param %];action=edit\">(edit)</a><br />[% metadata.address.list.first %]<br />[% metadata.city.list.first %]"; + GEvent.addListener(marker[% i %], "click", function() { + marker[% i %].openInfoWindowHtml(htmlString[% i %]); + }); + map.addOverlay(marker[% i %]); + [% END %] + [% END %] + function map_recenter() { + var center = map.getCenterLatLng(); + var link = document.getElementById('permalink'); + var zoom = map.getZoomLevel(); + link.href = "?action=index;format=map&long="+center.x+"&lat="+center.y+"&zoom="+zoom; + } + GEvent.addListener(map, "moveend", map_recenter ); + //]]> + </script> +[% ELSE %] + Sorry, this guide doesn't have Google Maps functionality enabled. +[% END %] + +</div> +</div> + +[% INCLUDE footer.tt %] Added: sites/oxford.openguides.org/templates/navbar.tt =================================================================== --- sites/oxford.openguides.org/templates/navbar.tt (rev 0) +++ sites/oxford.openguides.org/templates/navbar.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,60 @@ +<div id="navbar"> + + <strong><a href="[% full_cgi_url %]">Back to home</a></strong> + + <div class="navbar_group"> + <div class="navbar_group_title">Tools:</div> + <div class="navbar_item"><a href="[% full_cgi_url %]?RecentChanges">Recent Changes</a> <span class="hidden">/</span></div> + <div class="navbar_item"><a href="newpage.cgi">Create a new page</a> <span class="hidden">/</span></div> + <div class="navbar_item"><a href="[% full_cgi_url %]?action=random">Random Page</a> <span class="hidden">/</span></div> + <div class="navbar_item"><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a> <span class="hidden">/</span></div> + [% IF geocache_link AND latitude AND longitude %] + <div class="navbar_item"><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% latitude %];origin_long=[% longitude %]">Look for nearby geocaches</a></div> + [% END %] + </div> + + [% UNLESS omit_help_links %] + <div class="navbar_group"> + <div class="navbar_group_title">Help: <span class="hidden">/</span></div> + <div class="navbar_item"><a href="[% full_cgi_url %]?FAQ">FAQ</a> <span class="hidden">/</span></div> + <div class="navbar_item"><a href="[% full_cgi_url %]?How_To_Get_Started">How To Get Started</a> <span class="hidden">/</span></div> + [% IF formatting_rules_link %] + <div class="navbar_item"><a href="[% formatting_rules_link %]">[% formatting_rules_node %]</a> <span class="hidden">/</span></div> + [% END %] + <div class="navbar_item"><a href="[% full_cgi_url %]?Wiki_Etiquette">Wiki Etiquette</a> <span class="hidden">/</span></div> + </div> + [% END %] + + <div class="navbar_group"> + <div class="navbar_group_title">Options:</div> + <div class="navbar_item"><a href="preferences.cgi">Set username/prefs</a></div> + </div> + + <div class="navbar_group"> + <div class="navbar_group_title">Search:</div> + <div class="navbar_item"> + <form method="post" action="search.cgi" enctype="application/x-www-form-urlencoded"> + <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" /> + </form> + </div> + <div class="navbar_item"> + <a href="search.cgi">Advanced Search</a> + </div> + </div> + + [% UNLESS not_editable %] + <div class="navbar_group"> + <div class="navbar_group_title">This page:</div> + <div class="edit_page_link"><a href="[% full_cgi_url %]?id=[% node_param %];action=edit">Edit this page</a></div> + <div class="navbar_item"> + <a href="[% cgi_url %]?action=show_backlinks;id=[% node_param %]">Pages that link to here</a> + </div> + <div class="navbar_item"> + <a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi?[% node_param %]">Jump to Vegan Oxford entry</a> + </div> + </div> + [% END %] + +</div> Added: sites/oxford.openguides.org/templates/needing_moderation.tt =================================================================== --- sites/oxford.openguides.org/templates/needing_moderation.tt (rev 0) +++ sites/oxford.openguides.org/templates/needing_moderation.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,27 @@ +[% INCLUDE header.tt page_title = "Pages Needing Moderation - $site_name" %] +[% INCLUDE banner.tt %] +<div id="content"> +[% INCLUDE navbar.tt %] +<div id="maincontent"> +<h2>Pages Needing Moderation</h2> +<p> +These are nodes which have been created/edited, but not yet moderated. +</p> +<table id="needing_moderation" style="width:90%"> +<tr><th>Node name</th><th>Pending Version</th><th>Latest Moderated Version</th><th>Action</th></tr> + [% FOREACH node = nodes %] + <tr> + <td>[% node.name %]</td> + <td align="center">[% node.version %]</td> + <td align="center">[% node.moderated_version %]</td> + <td><a href="[% node.moderate_url %]">Moderate this version</a> + or <a href="[% node.delete_url %]">Delete this version</a> + or <a href="[% node.view_url %]">View this version</a> + or <a href="[% node.diff_url %]">See changes</a> + </td> + </tr> + [% END %] +</table> + +</div> +[% INCLUDE footer.tt %] Added: sites/oxford.openguides.org/templates/node.tt =================================================================== --- sites/oxford.openguides.org/templates/node.tt (rev 0) +++ sites/oxford.openguides.org/templates/node.tt 2007-06-12 22:20:11 UTC (rev 1074) @@ -0,0 +1,170 @@ +[% USE CGI %] +[% INCLUDE header.tt %] +[% INCLUDE banner.tt %] +<div id="content"> +[% IF !config.content_above_navbar_in_html %] + [% INCLUDE navbar.tt %] +[% END %] +<div id="maincontent" class="hreview"> +[% IF oldid %] +<div id="redirect_message">(redirected from <a href="[% full_cgi_url %]?id=[% oldid %];redirect=0">[% oldid.replace('_', ' ') %]</a>)</div> +[% END %] + +[% IF wgs84_lat AND wgs84_long AND display_google_maps and gmaps_api_key %] + <div id="map" style="float:right; width: 300px; height: 200px"></div> + <script defer="defer" type="text/javascript"> + //<![CDATA[ + var map = new GMap2(document.getElementById("map")); + new GKeyboardHandler(map); + var copycol = new GCopyrightCollection(""); + var copy = new GCopyright(1, new GLatLngBounds(new GLatLng(-90,-180),new GLatLng(90,180)), 0, "OpenStreetMap"); + copycol.addCopyright(copy); + var tileMapnik = new GTileLayer(copycol,1,17); + tileMapnik.myBaseURL = "http://mapnik.uberfoo.com/"; + tileMapnik.getTileUrl=MapnikGetTileUrl; + tileMapnik.isPng = function () { return true;} + tileMapnik.getOpacity = function() {return 1.0;} + + var layer0 = [tileMapnik]; + var mapnikMap = new GMapType(layer0, G_SATELLITE_MAP.getProjection(), "Mapnik", G_SATELLITE_MAP); + map.addMapType(mapnikMap); + + + map.addControl(new GMapTypeControl()); + map.setCenter(new GLatLng([% wgs84_lat %], [% wgs84_long %]), 14); + map.setMapType(mapnikMap); + map.addControl(new GSmallMapControl()); + var point0 = new GPoint([% wgs84_long %], [% wgs84_lat %]); + var marker0 = new GMarker(point0,baseIcon); + GEvent.addListener(marker0, "click", function() { + marker0.openInfoWindowHtml("[% node_name %]"); + }); + map.addOverlay(marker0); + + //]]> + </script> +[% END %] + +[% IF current %] + [% IF backlinks_in_title AND is_indexable_node %] + <h2 class="node_name"><a href="[% cgi_url %]?action=index;index_type=[% CGI.escape(index_type) %];index_value=[% CGI.escape(index_value) %]">[% node_name %]</a></h2> + [% ELSIF backlinks_in_title %] + <h2 class="node_name"><a href="[% cgi_url %]?action=show_backlinks;id=[% CGI.escape(node_name) %]">[% node_name %]</a></h2> + [% ELSE %] + <h2 class="node_name">[% node_name %]</h2> + [% END %] +[% ELSE %] + <h2><em> + [% IF moderated %] + Historical + [% ELSE %] + Un-moderated + [% END %] + version [% version %] of + <span class="node_name">[% node_name %]</span></em> + </h2> +[% END %] +[% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %] +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 %] +[% INCLUDE display_metadata.tt %] + + +<div id="content_text" class="description"> +[% content %] +</div> + + +[% TRY %] + [% INCLUDE custom_node.tt %] +[% CATCH %] +[% END %] + +[% IF coord_field_1_value AND coord_field_2_value %] + <br clear="all" /> + <div id="find_within_distance"> + <form action="search.cgi"> + <label for="distance">Find all things within</label> + <select name="[% dist_field %]" id="distance"> + <option value="500">500 metres</option> + <option value="1000">1 kilometre</option> + <option value="1500">1.5 kilometres</option> + <option value="2000">2 kilometres</option> + </select> + of here. + <input type="hidden" name="[% coord_field_1 %]" value="[% coord_field_1_value %]" /> + <input type="hidden" name="[% coord_field_2 %]" value="[% coord_field_2_value %]" /> + <input type="submit" name="Go" value="Go" class="form_button" /> + </form> + </div> +[% END %] +[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %] +<div id="coordinates" class="geo"> +[% END %] +[% IF os_x AND os_y %] + <small>OS X co-ord: + <abbr class="osgb_x" title="[% CGI.escapeHTML(os_x) %]">[% CGI.escapeHTML(os_x) %]</abbr> + </small> +     + <small>OS Y co-ord: + <abbr class="osgb_y" title="[% CGI.escapeHTML(os_y) %]">[% CGI.escapeHTML(os_y) %]</abbr> + </small> +     +[% ELSIF osie_x AND osie_y %] + <small>OS IE X co-ord: + <abbr class="osie_x" title="[% CGI.escapeHTML(osie_x) %]">[% CGI.escapeHTML(osie_x) %]</abbr> + </small> +     + <small>OS IE Y co-ord: + <abbr class="osie_y" title="[% CGI.escapeHTML(osie_y) %]">[% CGI.escapeHTML(osie_y) %]</abbr> + </small> +     +[% END %] +[% IF latitude AND longitude %] + <small> + (Latitude: + <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr> + Longitude: + <abbr class="longitude" title="[% wgs84_long %]">[% longitude %]</abbr>) + </small> +[% END %] +[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%] +</div> +[% END %] +<div id="rdf_link"> + <a href="[% cgi_url %]?id=[% node_param %];format=rdf">RDF/XML for this + node</a> + [% IF rss_locale_url %] + / <a href="[% rss_locale_url %]">RSS feed for this locale</a> + [% END %] + [% IF rss_category_url %] + / <a href="[% rss_category_url %]">RSS feed for this category</a> + [% END %] +</div> +<div id="version"> +[% IF current %] + Last edited [% last_modified %] + [% IF version == 1 %] + (version [% version %]) + [% ELSE %] + (version [% version %]; + <a href="[% cgi_url %]?id=[% node_param %];version=[% version - 1 %];diffversion=[% version %]">diff</a>). + [% END %] +[% ELSE %] + This is version <span class="version">[% version %]</span> + (as of [% last_modified %]). + <a href="[% cgi_url %]?[% node_param %]">View current version.</a> +[% END %] +[% IF version AND version > 1 %] +<a href="[% cgi_url %]?action=list_all_versions;id=[% node_param %]">List all +versions.</a> +[% END %] +</div> +[% END %] +</div> + +[% IF config.content_above_navbar_in_html %] + [% INCLUDE navbar.tt %] +[% END %] + +[% INCLUDE footer.tt %]

1 0

r1073 - sites
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

Author: dom Date: 2007-06-12 23:19:14 +0100 (Tue, 12 Jun 2007) New Revision: 1073 Added: sites/oxford.openguides.org/ Log: Add stuff for oxford

1 0

r1072 - /
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

Author: dom Date: 2007-06-12 23:19:03 +0100 (Tue, 12 Jun 2007) New Revision: 1072 Added: sites/ Log: Add container for individual site stuff

1 0

r1071 - trunk/t
by svnadmin＠urchin.earth.li 12 Jun '07

12 Jun '07

Author: dom Date: 2007-06-12 22:56:36 +0100 (Tue, 12 Jun 2007) New Revision: 1071 Modified: trunk/t/17_commit_node.t Log: Refactor to use OpenGuides::Test Modified: trunk/t/17_commit_node.t =================================================================== --- trunk/t/17_commit_node.t 2007-06-12 21:47:03 UTC (rev 1070) +++ trunk/t/17_commit_node.t 2007-06-12 21:56:36 UTC (rev 1071) @@ -4,6 +4,7 @@ use OpenGuides; use OpenGuides::Feed; use OpenGuides::Utils; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -50,25 +51,13 @@ my $guide = OpenGuides->new( config => $config ); # Set up CGI parameters ready for a node write. -# Most of these are in here to avoid uninitialised value warnings. -my $q = CGI->new; -$q->param( -name => "content", -value => "foo" ); -$q->param( -name => "categories", -value => "" ); -$q->param( -name => "locales", -value => "" ); -$q->param( -name => "phone", -value => "" ); -$q->param( -name => "fax", -value => "" ); -$q->param( -name => "website", -value => "" ); -$q->param( -name => "hours_text", -value => "" ); -$q->param( -name => "address", -value => "" ); -$q->param( -name => "postcode", -value => "" ); -$q->param( -name => "map_link", -value => "" ); -$q->param( -name => "os_x", -value => "" ); -$q->param( -name => "os_y", -value => "" ); -$q->param( -name => "username", -value => "bob" ); -$q->param( -name => "comment", -value => "foo" ); -$q->param( -name => "node_image", -value => "image" ); -$q->param( -name => "edit_type", -value => "Minor tidying" ); -$ENV{REMOTE_ADDR} = "127.0.0.1"; +my $q = OpenGuides::Test->make_cgi_object( + content => "foo", + username => "bob", + comment => "foo", + node_image => "image", + edit_type => "Minor tidying" +); my $output = $guide->commit_node( return_output => 1, @@ -99,23 +88,14 @@ is( $node{metadata}->{edit_type}[0], "Normal edit", "Right edit type" ); # Now try to commit some invalid data, and make sure we get an edit form back -$q = CGI->new; -$q->param( -name => "content", -value => "foo" ); -$q->param( -name => "categories", -value => "" ); -$q->param( -name => "locales", -value => "" ); -$q->param( -name => "phone", -value => "" ); -$q->param( -name => "fax", -value => "" ); -$q->param( -name => "website", -value => "" ); -$q->param( -name => "hours_text", -value => "" ); -$q->param( -name => "address", -value => "" ); -$q->param( -name => "postcode", -value => "" ); -$q->param( -name => "map_link", -value => "" ); -$q->param( -name => "os_x", -value => "fooooo" ); -$q->param( -name => "os_y", -value => "" ); -$q->param( -name => "username", -value => "bob" ); -$q->param( -name => "comment", -value => "foo" ); -$q->param( -name => "node_image", -value => "image" ); -$q->param( -name => "edit_type", -value => "Minor tidying" ); +my $q = OpenGuides::Test->make_cgi_object( + content => "foo", + os_x => "fooooo", + username => "bob", + comment => "foo", + node_image => "image", + edit_type => "Minor tidying" +); $output = $guide->commit_node( return_output => 1,

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits June 2007