openguides-commits

openguides-commits@lists.openguides.org

873 discussions

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

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

12 Jun '07

Author: dom Date: 2007-06-12 22:47:03 +0100 (Tue, 12 Jun 2007) New Revision: 1070 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm trunk/t/17_commit_node.t trunk/templates/edit_form.tt Log: Add general validation framework, and add test for lat/long and os_x/os_y (closes #22) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/Changes 2007-06-12 21:47:03 UTC (rev 1070) @@ -18,6 +18,7 @@ action=display (partial fix for #102) Added new div#nonexistent_node_message for displaying message when someone tries to view a nonexistent node. + Validate input geodata (#22) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-12 21:47:03 UTC (rev 1070) @@ -355,6 +355,43 @@ } } +=item B<validate_edit> + + my $fails = OpenGuides::Utils->validate_edit( + id => $node, + cgi_obj => $q + ); + +Checks supplied content for general validity. If anything is invalid, +returns an array ref of errors to report to the user. + +=cut + +sub validate_edit { + my ( $self, %args ) = @_; + my $q = $args{cgi_obj}; + my @fails; + push @fails, "Content missing" unless $q; + return \@fails if @fails; + + # Now do our real validation + # Numeric tests + foreach my $var (qw(os_x os_y)) { + if ($q->param($var) and $q->param($var) !~ /^-?\d+$/) { + push @fails, "$var must be integer, was: " . $q->param($var); + } + } + + foreach my $var (qw(latitude longitude)) { + if ($q->param($var) and $q->param($var) !~ /^-?\d+\.?(\d+)?$/) { + push @fails, "$var must be numeric, was: " . $q->param($var); + } + } + + return \@fails; + +}; + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/lib/OpenGuides.pm 2007-06-12 21:47:03 UTC (rev 1070) @@ -459,12 +459,21 @@ $guide->display_edit_form( id => "Vivat Bacchus", + vars => \%vars, + content => $content, + metadata => \%metadata, + checksum => $checksum ); Display an edit form for the specified node. As with other methods, the C<return_output> parameter can be used to return the output instead of printing it to STDOUT. +If this is to redisplay an existing edit, the content, metadata +and checksum may be supplied in those arguments + +Extra template variables may be supplied in the vars argument + =cut sub display_edit_form { @@ -500,6 +509,22 @@ deter_robots => 1, ); + # Override some things if we were supplied with them + $tt_vars{content} = $args{content} if $args{content}; + $tt_vars{checksum} = $args{checksum} if $args{checksum}; + if (defined $args{vars}) { + my %supplied_vars = %{$args{vars}}; + foreach my $key ( keys %supplied_vars ) { + $tt_vars{$key} = $supplied_vars{$key}; + } + } + if (defined $args{metadata}) { + my %supplied_metadata = %{$args{metadata}}; + foreach my $key ( keys %supplied_metadata ) { + $tt_vars{$key} = $supplied_metadata{$key}; + } + } + my $output = $self->process_template( id => $node, template => "edit_form.tt", @@ -1340,6 +1365,30 @@ ? 1 : 0; + # General validation + my $fails = OpenGuides::Utils->validate_edit( + cgi_obj => $q + ); + + if ( scalar @{$fails} ) { + my %vars = ( + validate_failed => $fails + ); + + my $output = $self->display_edit_form( + id => $node, + content => CGI->escapeHTML($content), + metadata => \%new_metadata, + vars => \%vars, + checksum => CGI->escapeHTML($checksum), + return_output => 1 + ); + + return $output if $return_output; + print $output; + return; + } + # If we can, check to see if this edit looks like spam. my $spam_detector = $config->spam_detector_module; my $is_spam; Modified: trunk/t/17_commit_node.t =================================================================== --- trunk/t/17_commit_node.t 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/t/17_commit_node.t 2007-06-12 21:47:03 UTC (rev 1070) @@ -18,7 +18,7 @@ } -plan tests => 5; +plan tests => 7; # Clear out the database from any previous runs. unlink "t/node.db"; @@ -97,3 +97,34 @@ %node = $wiki->retrieve_node("Wombats"); is( $node{version}, 2, "First version" ); 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" ); + +$output = $guide->commit_node( + return_output => 1, + id => "Wombats again", + cgi_obj => $q, + ); + +like( $output, qr/Your input was invalid/, + "Edit form displayed and invalid input message shown if invalid input" ); + +like( $output, qr/os_x must be integer/, + "Edit form displayed and os_x integer message displayed" ); Modified: trunk/templates/edit_form.tt =================================================================== --- trunk/templates/edit_form.tt 2007-06-11 22:26:47 UTC (rev 1069) +++ trunk/templates/edit_form.tt 2007-06-12 21:47:03 UTC (rev 1070) @@ -11,6 +11,21 @@ </div> [% END %] + [% IF validate_failed %] + <div class="warning_text"> + <p> + Your input was invalid: + </p> + <ul> + [% FOREACH error = validate_failed %] + <li>[% error %]</li> + [% END %] + </ul> + <p> + Please correct your input data and try again. + </p> + [% END %] + [% IF preview_html AND preview_above_edit_box %] <div id="maincontent"> <h2>Preview</h2>

1 0

r1069 - in trunk/lib: . OpenGuides
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: dom Date: 2007-06-11 23:26:47 +0100 (Mon, 11 Jun 2007) New Revision: 1069 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm Log: Undo incomplete change from previous commit; sorry for the noise Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-11 20:37:06 UTC (rev 1068) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-11 22:26:47 UTC (rev 1069) @@ -355,26 +355,6 @@ } } -=item B<validate_edit> - - eval { OpenGuides::Utils->validate_edit( - id => $node, - content => $content - metadata => \%new_metadata - ) }; - -Checks supplied content for general validity. If anything is invalid, -dies with an error string suitable for reporting to the user. - -=cut - -sub validate_edit { - my ( $self, %args ) = @_; - die "Content missing\n" unless $args{content}; - die "Metadata missing\n" unless $args{metadata}; - -}; - =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 20:37:06 UTC (rev 1068) +++ trunk/lib/OpenGuides.pm 2007-06-11 22:26:47 UTC (rev 1069) @@ -1335,26 +1335,6 @@ } $new_metadata{host} = $ENV{REMOTE_ADDR}; - # General validation - eval { OpenGuides::Utils->validate_edit( - content => $content, - metadata => \%new_metadata - ) }; - - if ( $@ ) { - my $output = OpenGuides::Template->output( - wiki => $self->wiki, - config => $config, - template => "validate_edit_failed.tt", - vars => { - message => $@ - } - ); - return $output if $return_output; - print $output; - return; - } - # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set. $new_metadata{major_change} = ( $new_metadata{edit_type} eq "Normal edit" ) ? 1

1 0

r1068 - in trunk/lib: . OpenGuides
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: dom Date: 2007-06-11 21:37:06 +0100 (Mon, 11 Jun 2007) New Revision: 1068 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm Log: Add framework for generic content/metadata validation into commit_node Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-11 03:24:22 UTC (rev 1067) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-11 20:37:06 UTC (rev 1068) @@ -355,6 +355,26 @@ } } +=item B<validate_edit> + + eval { OpenGuides::Utils->validate_edit( + id => $node, + content => $content + metadata => \%new_metadata + ) }; + +Checks supplied content for general validity. If anything is invalid, +dies with an error string suitable for reporting to the user. + +=cut + +sub validate_edit { + my ( $self, %args ) = @_; + die "Content missing\n" unless $args{content}; + die "Metadata missing\n" unless $args{metadata}; + +}; + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 03:24:22 UTC (rev 1067) +++ trunk/lib/OpenGuides.pm 2007-06-11 20:37:06 UTC (rev 1068) @@ -1335,6 +1335,26 @@ } $new_metadata{host} = $ENV{REMOTE_ADDR}; + # General validation + eval { OpenGuides::Utils->validate_edit( + content => $content, + metadata => \%new_metadata + ) }; + + if ( $@ ) { + my $output = OpenGuides::Template->output( + wiki => $self->wiki, + config => $config, + template => "validate_edit_failed.tt", + vars => { + message => $@ + } + ); + return $output if $return_output; + print $output; + return; + } + # Wiki::Toolkit::Plugin::RSS::ModWiki wants "major_change" to be set. $new_metadata{major_change} = ( $new_metadata{edit_type} eq "Normal edit" ) ? 1

1 0

r1067 - trunk/lib
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: kake Date: 2007-06-11 04:24:22 +0100 (Mon, 11 Jun 2007) New Revision: 1067 Modified: trunk/lib/OpenGuides.pm Log: Make sure all TT vars are returned if return_tt_vars is passed to OpenGuides->display_node Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 03:06:21 UTC (rev 1066) +++ trunk/lib/OpenGuides.pm 2007-06-11 03:24:22 UTC (rev 1067) @@ -274,8 +274,8 @@ if ( $redirect ) { # Don't redirect if the parameter "redirect" is given as 0. if ($do_redirect == 0) { + $tt_vars{current} = 1; return %tt_vars if $args{return_tt_vars}; - $tt_vars{current} = 1; my $output = $self->process_template( id => $id, template => "node.tt",

1 0

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

11 Jun '07

Author: kake Date: 2007-06-11 04:06:21 +0100 (Mon, 11 Jun 2007) New Revision: 1066 Modified: trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/RDF.pm trunk/lib/OpenGuides/Utils.pm trunk/t/11_utils.t Log: Refactor redirect detection into OpenGuides::Utils->detect_redirect Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-11 02:26:08 UTC (rev 1065) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-11 03:06:21 UTC (rev 1066) @@ -2,6 +2,8 @@ use strict; +use OpenGuides::Utils; + use vars qw( $VERSION ); $VERSION = '0.09'; @@ -139,9 +141,9 @@ = $self->{make_node_url}->( $node_name, $tt_vars{version} ); - # Should probably be moved into OpenGuides::Utils. - if ($node_data{content} =~ /^\#REDIRECT \[\[(.*?)]\]$/) { - my $redirect = $1; + my $redirect = OpenGuides::Utils->detect_redirect( content => + $node_data{content} ); + if ( $redirect ) { $tt_vars{redirect} = $config->script_url . $config->script_name . "?id=" . $formatter->node_name_to_node_param( $redirect ) Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-11 02:26:08 UTC (rev 1065) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-11 03:06:21 UTC (rev 1066) @@ -328,6 +328,33 @@ } } +=item B<detect_redirect> + + $redir = OpenGuides::Utils->detect_redirect( content => "foo" ); + +Checks the content of a node to see if the node is a redirect to another +node. If so, returns the name of the node that this one redirects to. If +not, returns false. + +(Also returns false if no content is provided.) + +=cut + +sub detect_redirect { + my ( $self, %args ) = @_; + return unless $args{content}; + + if ( $args{content} =~ /^#REDIRECT\s+(.+?)\s*$/ ) { + my $redirect = $1; + + # Strip off enclosing [[ ]] in case this is an extended link. + $redirect =~ s/^\[\[//; + $redirect =~ s/\]\]\s*$//; + + return $redirect; + } +} + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-11 02:26:08 UTC (rev 1065) +++ trunk/lib/OpenGuides.pm 2007-06-11 03:06:21 UTC (rev 1066) @@ -268,13 +268,10 @@ $tt_vars{catloc_link} = $config->script_url . $config->script_name . "?id="; } - - if ( $node_data{content} && $node_data{content} =~ /^#REDIRECT\s+(.+?)\s*$/ ) { - my $redirect = $1; - # Strip off enclosing [[ ]] in case this is an extended link. - $redirect =~ s/^\[\[//; - $redirect =~ s/\]\]\s*$//; + my $redirect = OpenGuides::Utils->detect_redirect( + content => $node_data{content} ); + if ( $redirect ) { # Don't redirect if the parameter "redirect" is given as 0. if ($do_redirect == 0) { return %tt_vars if $args{return_tt_vars}; Modified: trunk/t/11_utils.t =================================================================== --- trunk/t/11_utils.t 2007-06-11 02:26:08 UTC (rev 1065) +++ trunk/t/11_utils.t 2007-06-11 03:06:21 UTC (rev 1066) @@ -2,7 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides::Utils; -use Test::More tests => 8; +use Test::More tests => 10; eval { my $wiki = OpenGuides::Utils->make_wiki_object; }; ok( $@, "->make_wiki_object croaks if no config param supplied" ); @@ -28,7 +28,8 @@ } SKIP: { - skip "DBD::SQLite could not be used - no database to test with. ($sqlite_error)", 5 + skip "DBD::SQLite could not be used - no database to test with. " + . "($sqlite_error)", 7 unless $have_sqlite; # Clear out the database from any previous runs. @@ -59,4 +60,11 @@ ok( $wiki->store, "...and store defined" ); ok( $wiki->search_obj, "...and search defined" ); ok( $wiki->formatter, "...and formatter defined" ); + + # Now test ->detect_redirect + is( OpenGuides::Utils->detect_redirect( content => "#REDIRECT [[Foo]]" ), + "Foo", + "->detect_redirect successfully detects redirect content" ); + ok( !OpenGuides::Utils->detect_redirect( content => "Mmmm, tea." ), + "...and successfully detects non-redirect content" ); }

1 0

r1065 - in trunk: . templates
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: kake Date: 2007-06-11 03:26:08 +0100 (Mon, 11 Jun 2007) New Revision: 1065 Modified: trunk/Changes trunk/README.CSS trunk/templates/node.tt Log: Added new div#nonexistent_node_message for displaying message when someone tries to view a nonexistent node. Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-11 02:23:11 UTC (rev 1064) +++ trunk/Changes 2007-06-11 02:26:08 UTC (rev 1065) @@ -16,6 +16,8 @@ Respect redirect=0 (#104). If an unknown action is supplied to wiki.cgi, redirect to action=display (partial fix for #102) + Added new div#nonexistent_node_message for displaying message when + someone tries to view a nonexistent node. 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/README.CSS =================================================================== --- trunk/README.CSS 2007-06-11 02:23:11 UTC (rev 1064) +++ trunk/README.CSS 2007-06-11 02:26:08 UTC (rev 1065) @@ -284,6 +284,10 @@ Used in: node.tt Purpose: Display the node name and an "edit this page" link. +div#nonexistent_node_message + Used in: node.tt + Purpose: Display message when someone tries to view a nonexistent node. + div#rdf_link Used in: node.tt Purpose: Link to an RDF version of the node Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2007-06-11 02:23:11 UTC (rev 1064) +++ trunk/templates/node.tt 2007-06-11 02:26:08 UTC (rev 1065) @@ -49,7 +49,7 @@ [% END %] [% IF not (content || coord_field_1_value || coord_field_2_value || wgs84_lat || wgs84_long) %] </div> -We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>? +<div id="nonexistent_node_message">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>?</div> [% ELSE %] <div id="title_edit_link"> <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">Edit this page</a>

1 0

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