Author: earle
Date: 2006-08-30 22:39:25 +0100 (Wed, 30 Aug 2006)
New Revision: 846
Modified:
trunk/Changes
Log:
consistent indenting style on items
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2006-08-30 21:37:58 UTC (rev 845)
+++ trunk/Changes 2006-08-30 21:39:25 UTC (rev 846)
@@ -11,28 +11,28 @@
0.56 14 June 2006
Fix bug introduced in feed formatting where Atom feeds would be
- produced when asked for RSS and vice versa.
+ produced when asked for RSS and vice versa.
0.55 13 June 2006
Versioned dependency on Wiki::Toolkit to avoid development
- versions
+ versions
Support generating feeds of a node's version listing, in addition
- to feeds of the recent changes. For more information on OpenGuides
- feeds, see http://dev.openguides.org/wiki/FeedsIntro
+ to feeds of the recent changes. For more information on OpenGuides
+ feeds, see http://dev.openguides.org/wiki/FeedsIntro
0.54_02 8 June 2006
Pass the feed_listing (currently just recent_changes) through all
- the feed related code, rather than assuming it'll only ever be
- recent changes. Will allow other listings of nodes to be handled
- in the future.
+ the feed related code, rather than assuming it'll only ever be
+ recent changes. Will allow other listings of nodes to be handled
+ in the future.
0.54_01 16 May 2006
Support for Atom feeds for RecentChanges.
#118 Use Wiki::Toolkit. NOTE this is a development snapshot and is
- not suitable for production use. It may eat your data! Tests on
- development mirrors of live data are highly welcomed; the underlying
- database schema provided by Wiki::Toolkit has changed and the upgrade
- process needs some rigorous testing.
+ not suitable for production use. It may eat your data! Tests on
+ development mirrors of live data are highly welcomed; the underlying
+ database schema provided by Wiki::Toolkit has changed and the upgrade
+ process needs some rigorous testing.
0.54 21 April 2006
#112 Fixed website display bug introduced in 0.53.
Author: earle
Date: 2006-08-30 22:37:58 +0100 (Wed, 30 Aug 2006)
New Revision: 845
Modified:
trunk/INSTALL
Log:
fix non-existent URL for Open Guide to London
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2006-08-24 16:43:30 UTC (rev 844)
+++ trunk/INSTALL 2006-08-30 21:37:58 UTC (rev 845)
@@ -87,7 +87,7 @@
"What URL does the install directory map to?"
Give the full address needed to access the installation directory with
-a web browser - for example http://london.openguides.org/cgi-bin/
+a web browser - for example http://london.openguides.org/
"Do you want me to munge a custom lib path into the scripts?"
Author: nick
Date: 2006-08-24 17:43:30 +0100 (Thu, 24 Aug 2006)
New Revision: 844
Added:
trunk/templates/common_categories.tt
trunk/templates/common_locales.tt
Modified:
trunk/MANIFEST
trunk/README.CSS
trunk/lib/OpenGuides.pm
trunk/templates/node.tt
Log:
Support the optional common categories and locales. Closes #134
Modified: trunk/MANIFEST
===================================================================
--- trunk/MANIFEST 2006-08-24 16:08:03 UTC (rev 843)
+++ trunk/MANIFEST 2006-08-24 16:43:30 UTC (rev 844)
@@ -30,6 +30,8 @@
templates/admin_home.tt
templates/backlink_results.tt
templates/banner.tt
+templates/common_categories.tt
+templates/common_locales.tt
templates/delete_confirm.tt
templates/delete_done.tt
templates/delete_password_wrong.tt
Modified: trunk/README.CSS
===================================================================
--- trunk/README.CSS 2006-08-24 16:08:03 UTC (rev 843)
+++ trunk/README.CSS 2006-08-24 16:43:30 UTC (rev 844)
@@ -157,6 +157,42 @@
Used in: display_metadata.tt
Purpose: To display the image for a node
+div#common_navigation
+ Used in: node.tt
+ Purpose: Hold the common locales and categories, if enabled
+
+div#common_categories
+ Used in: common_categories.tt
+ Purpose: Hold the common categories, if enabled
+h3#common_categories_title
+ Used in: common_categories.tt
+ Purpose: Title for the common categories
+ul#common_categories_list
+ Used in: common_categories.tt
+ Purpose: Parent list for the common categories
+li.common_category
+ Used in: common_categories.tt
+ Purpose: A common category
+a.common_category_link
+ Used in: common_categories.tt
+ Purpose: A link to a common category
+
+div#common_locales
+ Used in: common_locales.tt
+ Purpose: Hold the common locales, if enabled
+h3#common_locales_title
+ Used in: common_locales.tt
+ Purpose: Title for the common locales
+ul#common_locales_list
+ Used in: common_locales.tt
+ Purpose: Parent list for the common locales
+li.common_locale
+ Used in: common_locales.tt
+ Purpose: A common locale
+a.common_locale_link
+ Used in: common_locales.tt
+ Purpose: A link to a common locale
+
input#address
Used in: edit_conflict.tt, edit_form.tt
Purpose: An input field for the address of the node
Modified: trunk/lib/OpenGuides.pm
===================================================================
--- trunk/lib/OpenGuides.pm 2006-08-24 16:08:03 UTC (rev 843)
+++ trunk/lib/OpenGuides.pm 2006-08-24 16:43:30 UTC (rev 844)
@@ -208,6 +208,14 @@
wgs84_lat => $wgs84_lat
);
+ # Should we include a standard list of categories or locales?
+ if ($config->enable_common_categories || $config->enable_common_locales) {
+ $tt_vars{common_catloc} = 1;
+ $tt_vars{common_categories} = $config->enable_common_categories;
+ $tt_vars{common_locales} = $config->enable_common_locales;
+ $tt_vars{catloc_link} = $config->script_url . "?id=";
+ }
+
if ( $raw =~ /^#REDIRECT\s+(.+?)\s*$/ ) {
my $redirect = $1;
# Strip off enclosing [[ ]] in case this is an extended link.
Added: trunk/templates/common_categories.tt
===================================================================
--- trunk/templates/common_categories.tt 2006-08-24 16:08:03 UTC (rev 843)
+++ trunk/templates/common_categories.tt 2006-08-24 16:43:30 UTC (rev 844)
@@ -0,0 +1,8 @@
+<div id="common_categories">
+ <h3 id="common_categories_title">Categories</h3>
+ <ul id="common_categories_list">
+ [% FOREACH cat = [ 'Cafes', 'Coffee Shops', 'Pubs', 'Restaurants', 'Supermarkets', 'Cinemas', 'Theatres' ] %]
+ <li class="common_category"><a class="common_category_link" href="[% catloc_link %][% cat %]">[% cat %]</a></li>
+ [% END %]
+ </ul>
+</div>
Added: trunk/templates/common_locales.tt
===================================================================
--- trunk/templates/common_locales.tt 2006-08-24 16:08:03 UTC (rev 843)
+++ trunk/templates/common_locales.tt 2006-08-24 16:43:30 UTC (rev 844)
@@ -0,0 +1,8 @@
+<div id="common_locales">
+ <h3 id="common_locales_title">Locales</h3>
+ <ul id="common_locales_list">
+ [% FOREACH loc = [ 'North', 'South', 'East', 'West', 'Central' ] %]
+ <li class="common_locale"><a class="common_locale_link" href="[% catloc_link %][% loc %]">[% loc %]</a></li>
+ [% END %]
+ </ul>
+</div>
Modified: trunk/templates/node.tt
===================================================================
--- trunk/templates/node.tt 2006-08-24 16:08:03 UTC (rev 843)
+++ trunk/templates/node.tt 2006-08-24 16:43:30 UTC (rev 844)
@@ -142,4 +142,16 @@
</div>
[% END %]
</div>
+
+[% IF common_catloc %]
+<div id="common_navigation">
+ [% IF common_categories %]
+ [% INCLUDE common_categories.tt %]
+ [% END %]
+ [% IF common_locales %]
+ [% INCLUDE common_locales.tt %]
+ [% END %]
+</div>
+[% END %]
+
[% INCLUDE footer.tt %]
Author: nick
Date: 2006-08-24 17:08:03 +0100 (Thu, 24 Aug 2006)
New Revision: 843
Modified:
trunk/README.CSS
trunk/templates/display_metadata.tt
Log:
Display the node image if there is one, or an empty span if not. (there can't be a node image if node images are disabled). closes #135
Modified: trunk/README.CSS
===================================================================
--- trunk/README.CSS 2006-08-24 15:51:17 UTC (rev 842)
+++ trunk/README.CSS 2006-08-24 16:08:03 UTC (rev 843)
@@ -143,9 +143,20 @@
Purpose: The search form at the bottom of the page
div#version
- Used it: node.tt
+ Used in: node.tt
Purpose: Text describing the version of the node being displayed
+div#node_image_box
+ Used in: display_metadata.tt
+ Purpose: Hold the image for a node.
+ Note: If there is no node image, span#node_no_image will exist instead
+span#node_no_image
+ Used in: display_metadata.tt
+ Purpose: To indicate that there is no image for the node
+img#node_image
+ Used in: display_metadata.tt
+ Purpose: To display the image for a node
+
input#address
Used in: edit_conflict.tt, edit_form.tt
Purpose: An input field for the address of the node
@@ -256,7 +267,6 @@
Used in: edit_conflict.tt, edit_form.tt
Purpose: An box to enter the categories of the node
-textarea.content
textarea#content_textarea
Used in: edit_conflict.tt, edit_form.tt
Purpose: A box to enter the main conent of the node
Modified: trunk/templates/display_metadata.tt
===================================================================
--- trunk/templates/display_metadata.tt 2006-08-24 15:51:17 UTC (rev 842)
+++ trunk/templates/display_metadata.tt 2006-08-24 16:08:03 UTC (rev 843)
@@ -2,6 +2,14 @@
<!-- METADATA STARTS -->
<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 %]
+
<!--- For the vcard --->
<span class="fn" style="display:none">[% node_name %]</span>
[% IF phone OR fax OR address OR postcode OR formatted_website_text
Author: nick
Date: 2006-08-24 16:01:04 +0100 (Thu, 24 Aug 2006)
New Revision: 840
Modified:
trunk/Changes
trunk/lib/OpenGuides/Config.pm
Log:
New configuration options to support moderation, and tickets 134+135
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2006-08-24 14:35:30 UTC (rev 839)
+++ trunk/Changes 2006-08-24 15:01:04 UTC (rev 840)
@@ -4,6 +4,8 @@
Admin interface
Nodes missing metadata interface
Moderation support (based on Wiki::Toolkit moderation)
+ Four new config file options: moderation_requires_password,
+ enabled_node_image, enable_common_categories, enable_common_locales
Search::InvertedIndex support is deprecated as of this release.
Please upgrade to Plucene if you are still using it.
Modified: trunk/lib/OpenGuides/Config.pm
===================================================================
--- trunk/lib/OpenGuides/Config.pm 2006-08-24 14:35:30 UTC (rev 839)
+++ trunk/lib/OpenGuides/Config.pm 2006-08-24 15:01:04 UTC (rev 840)
@@ -13,6 +13,7 @@
custom_template_path geo_handler ellipsoid gmaps_api_key centre_long
centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84
licence_name licence_url licence_info_url moderation_requires_password
+ enabled_node_image enable_common_categories enable_common_locales
);
my @questions = map { $_ . "__qu" } @variables;
OpenGuides::Config->mk_accessors( @variables );
@@ -66,7 +67,11 @@
use_plucene => 1,
indexing_directory => "/usr/lib/cgi-bin/openguides/indexes/",
enable_page_deletion => 0,
+ moderation_requires_password => 1,
admin_pass => "Change This!",
+ enabled_node_image => 1,
+ enable_common_categories => 1,
+ enable_common_locales => 1,
site_name => "Unconfigured OpenGuides site",
navbar_on_home_page => 1,
home_name => "Home",
@@ -130,8 +135,12 @@
use_plucene => "Do you want to use Plucene for searching? (recommended, but see Changes file before saying yes to this if you are upgrading)",
indexing_directory => "What directory can I use to store indexes in for searching? ***NOTE*** This directory must exist and be writeable by the user that your script will run as. See README for more on this.",
enable_page_deletion => "Do you want to enable page deletion?",
+ moderation_requires_password => "Is the admin password required for moderating pages?",
admin_pass => "Please specify a password for the site admin.",
stylesheet_url => "What's the URL of the site's stylesheet?",
+ enabled_node_image => "Should nodes be allowed to have an externally hosted image?",
+ enable_common_categories => "Do you want a common list of categories shown on all node pages?",
+ enable_common_locales => "Do you want a common list of locales shown on all node pages?",
site_name => "What's the site called? (should be unique)",
navbar_on_home_page => "Do you want the navigation bar included on the home page?",
home_name => "What should the home page of the wiki be called?",
Author: nick
Date: 2006-08-24 15:35:30 +0100 (Thu, 24 Aug 2006)
New Revision: 839
Modified:
trunk/README.CSS
Log:
Update for change in content id
Modified: trunk/README.CSS
===================================================================
--- trunk/README.CSS 2006-08-24 14:17:59 UTC (rev 838)
+++ trunk/README.CSS 2006-08-24 14:35:30 UTC (rev 839)
@@ -256,9 +256,12 @@
Used in: edit_conflict.tt, edit_form.tt
Purpose: An box to enter the categories of the node
-textarea#content
+textarea.content
+textarea#content_textarea
Used in: edit_conflict.tt, edit_form.tt
Purpose: A box to enter the main conent of the node
+ Note: ID doesn't match class, as IDs have to be globally unique, and we
+ already have a div with ID content
textarea#locales
Used in: edit_conflict.tt, edit_form.tt
Author: nick
Date: 2006-08-24 15:17:59 +0100 (Thu, 24 Aug 2006)
New Revision: 838
Modified:
trunk/templates/edit_form.tt
Log:
Don't duplicate the id 'content' for the main area of the page, and the content entry box. (Haven't changed the form name, just the id)
Modified: trunk/templates/edit_form.tt
===================================================================
--- trunk/templates/edit_form.tt 2006-08-22 21:22:16 UTC (rev 837)
+++ trunk/templates/edit_form.tt 2006-08-24 14:17:59 UTC (rev 838)
@@ -37,7 +37,7 @@
<table summary="Fields containing the node's main content and its category and locale listings">
<tr>
<td class="label"><label for="content">Content:</label></td>
- <td><textarea name="content" id="content" rows="21" cols="70" wrap="virtual">[% content %]</textarea></td>
+ <td><textarea name="content" id="content_textarea" rows="21" cols="70" wrap="virtual">[% content %]</textarea></td>
</tr>
<tr>
<td class="label"><label for="locales">Locales:<br />(one per line)</label></td>
Author: dom
Date: 2006-08-22 22:22:16 +0100 (Tue, 22 Aug 2006)
New Revision: 837
Modified:
trunk/Build.PL
trunk/Changes
trunk/INSTALL
trunk/PREREQUISITES
Log:
Deprecate Search::InvertedIndex
Modified: trunk/Build.PL
===================================================================
--- trunk/Build.PL 2006-08-10 17:05:11 UTC (rev 836)
+++ trunk/Build.PL 2006-08-22 21:22:16 UTC (rev 837)
@@ -101,6 +101,16 @@
next;
}
+ # We don't ask this for new installs as Search::InvertedIndex is
+ # deprecated
+ if ( $var eq "use_plucene" and $existing_config->$var == 1) {
+ print "Skipping question about plucene\n";
+ push @answers, { question => $qu,
+ variable => $var,
+ value => 1 };
+ next;
+ }
+
# Make sensible suggestions for template paths if we don't already
# have them stored. Not really a default, but a useful hint/shortcut.
if ( $var eq "template_path" && !defined $existing_config->$var ) {
@@ -206,6 +216,8 @@
##### When updating the prereqs PLEASE REMEMBER to update PREREQUISITES.
#####
+# We currently only support Plucene for new installs, but may support
+# others in future
my $search_module = $use_plucene ? "Plucene" : "Search::InvertedIndex";
# Create the build object.
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2006-08-10 17:05:11 UTC (rev 836)
+++ trunk/Changes 2006-08-22 21:22:16 UTC (rev 837)
@@ -4,6 +4,8 @@
Admin interface
Nodes missing metadata interface
Moderation support (based on Wiki::Toolkit moderation)
+ Search::InvertedIndex support is deprecated as of this release.
+ Please upgrade to Plucene if you are still using it.
0.56 14 June 2006
Fix bug introduced in feed formatting where Atom feeds would be
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2006-08-10 17:05:11 UTC (rev 836)
+++ trunk/INSTALL 2006-08-22 21:22:16 UTC (rev 837)
@@ -101,10 +101,8 @@
"Do you want to use Plucene for searching?"
-From version 0.39 of OpenGuides, you have the option of using Plucene
-to index your wiki instead of Search::InvertedIndex. If you answer
-yes to this question, you will need to make sure you have installed
-both Plucene, and Wiki::Toolkit version 0.56 or later.
+This question is no longer asked, but documentation here is retained for
+the benefit of people upgrading.
If you are changing to Plucene from Search::InvertedIndex, you will
need to do two things:
Modified: trunk/PREREQUISITES
===================================================================
--- trunk/PREREQUISITES 2006-08-10 17:05:11 UTC (rev 836)
+++ trunk/PREREQUISITES 2006-08-22 21:22:16 UTC (rev 837)
@@ -36,11 +36,7 @@
LWP::Simple
Module::Build (version 0.18 or later)
Parse::RecDescent
-(
- Plucene
- -- or --
- Search::InvertedIndex
-)
+Plucene
POSIX
Template
Test::MockObject (version 0.07 or later)