Index: Build.PL
===================================================================
RCS file: /var/lib/cvs/grubclone/Build.PL,v
retrieving revision 1.70
diff -u -r1.70 Build.PL
--- Build.PL	20 Sep 2004 20:05:10 -0000	1.70
+++ Build.PL	2 Oct 2004 17:47:47 -0000
@@ -206,6 +206,10 @@
             question => "what directory should I install the templates in?",
             variable => "template_path",
             value    => $val . "/templates" };
+	push @answers, {
+	    question => "where should I look for custom templates?",
+	    variable => "custom_template_path",
+	    value    => $val . "/custom-templates" };
     }
 }
 
Index: CUSTOMISATION
===================================================================
RCS file: /var/lib/cvs/grubclone/CUSTOMISATION,v
retrieving revision 1.2
diff -u -r1.2 CUSTOMISATION
--- CUSTOMISATION	20 Sep 2004 15:54:41 -0000	1.2
+++ CUSTOMISATION	2 Oct 2004 17:48:51 -0000
@@ -3,16 +3,18 @@
 added in the future and so on.
 
 From OpenGuides 0.41, some of the supplied templates will optionally
-call out to other template fragments that you can put in
-templates/custom/.  If custom templates do not exist then sensible
-default wording will be used instead.
+call out to other template fragments that you can put in a custom template
+path (by default custom-templates/). If custom templates do not exist then
+sensible default wording will be used instead.
+
+The names of all custom templates will be prefixed with custom_.
 
 The custom templates currently supported are:
 
- - licence.tt
+ - custom_licence.tt
    Will be included at the top of the page editing form.
 
- - footer_credits.tt
+ - custom_footer_credits.tt
    Will be included in a <div id="footer"> at the base of every page.
    You may wish to take advantage of the supplied TT variables
      - [% delete_link %]
@@ -21,7 +23,7 @@
      - [% openguides_version %]
        Contains the version of OpenGuides that your site is running on.
 
- - banner.tt
+ - custom_banner.tt
    Will be included in a <div id="banner"> at the top of every page.
    You may wish to take advantage of the supplied TT variables
     - [% site_name %]
@@ -29,3 +31,6 @@
 
 Requests for further custom inserts are welcomed.
 
+You can also include your own versions of other templates in the
+custom-templates/ directory, and these will override the installed files,
+but this is not recommended for the reasons detailed above.
Index: Changes
===================================================================
RCS file: /var/lib/cvs/grubclone/Changes,v
retrieving revision 1.139
diff -u -r1.139 Changes
--- Changes	2 Oct 2004 06:47:44 -0000	1.139
+++ Changes	2 Oct 2004 17:47:03 -0000
@@ -1,6 +1,8 @@
 0.42    
         Handle distance searching with OpenGuides::Supersearch instead of
           find_within_distance action.
+        Custom templates are now stored in a user-definable path, and their
+	names are prefixed with custom_.
 
 0.41    21 September 2004
         Added backlinks link to navbar.
Index: lib/OpenGuides/Build.pm
===================================================================
RCS file: /var/lib/cvs/grubclone/lib/OpenGuides/Build.pm,v
retrieving revision 1.10
diff -u -r1.10 Build.pm
--- lib/OpenGuides/Build.pm	20 Sep 2004 14:59:43 -0000	1.10
+++ lib/OpenGuides/Build.pm	2 Oct 2004 17:36:55 -0000
@@ -53,12 +53,13 @@
     my $config = Config::Tiny->read("wiki.conf");
 
     # Install the scripts where we were told to.
-    my $install_directory = $config->{_}->{install_directory};
-    my $script_name       = $config->{_}->{script_name};
-    my $template_path     = $config->{_}->{template_path};
-    my $custom_lib_path   = $config->{_}->{custom_lib_path};
-    my @extra_scripts     = @{ $self->{config}{__extra_scripts} };
-    my @templates         = @{ $self->{config}{__templates} };
+    my $install_directory    = $config->{_}->{install_directory};
+    my $script_name          = $config->{_}->{script_name};
+    my $template_path        = $config->{_}->{template_path};
+    my $custom_template_path = $config->{_}->{custom_template_path};
+    my $custom_lib_path      = $config->{_}->{custom_lib_path};
+    my @extra_scripts        = @{ $self->{config}{__extra_scripts} };
+    my @templates            = @{ $self->{config}{__templates} };
 
     print "Installing scripts to $install_directory:\n";
     # Allow for blank script_name - assume "index.cgi".
@@ -102,15 +103,17 @@
         }
     }
 
-    print "Installing templates to $install_directory/templates:\n";
+    print "Installing templates to $template_path:\n";
     foreach my $template ( @templates ) {
         if ( $FAKE ) {
-            print "templates/$template -> $install_directory/templates/$template (FAKE)\n";
+            print "templates/$template -> $template_path/$template (FAKE)\n";
 	} else {
-	    $self->copy_if_modified("templates/$template", $install_directory)
-                or print "Skipping $install_directory/templates/$template (unchanged)\n";
+	    $self->copy_if_modified(from => "templates/$template", to_dir => $template_path, flatten => 1)
+                or print "Skipping $template_path/$template (unchanged)\n";
         }
     }
+    print "Making sure that $custom_template_path exists.\n";
+    mkdir $custom_template_path or warn "Could not make $custom_template_path";
 }
 
 sub add_custom_lib_path {
Index: lib/OpenGuides/Template.pm
===================================================================
RCS file: /var/lib/cvs/grubclone/lib/OpenGuides/Template.pm,v
retrieving revision 1.25
diff -u -r1.25 Template.pm
--- lib/OpenGuides/Template.pm	17 Sep 2004 11:29:50 -0000	1.25
+++ lib/OpenGuides/Template.pm	2 Oct 2004 18:09:36 -0000
@@ -108,7 +108,8 @@
     croak "No template supplied" unless $args{template};
     my $config = $args{config} or croak "No config supplied";
     my $template_path = $config->{_}->{template_path};
-    my $tt = Template->new( { INCLUDE_PATH => $template_path } );
+    my $custom_template_path = $config->{_}->{custom_template_path} || "";
+    my $tt = Template->new( { INCLUDE_PATH => "$custom_template_path:$template_path" } );
 
     my $script_name = $config->{_}->{script_name};
     my $script_url  = $config->{_}->{script_url};
Index: templates/banner.tt
===================================================================
RCS file: /var/lib/cvs/grubclone/templates/banner.tt,v
retrieving revision 1.3
diff -u -r1.3 banner.tt
--- templates/banner.tt	20 Sep 2004 15:54:41 -0000	1.3
+++ templates/banner.tt	2 Oct 2004 17:07:48 -0000
@@ -1,6 +1,6 @@
 <div id="banner">
   [% TRY %]
-    [% INCLUDE custom/banner.tt %]
+    [% INCLUDE custom_banner.tt %]
   [% CATCH %]
     <h1><a href="[% home_link %]">[% site_name %]</a></h1>
   [% END %]
Index: templates/edit_form.tt
===================================================================
RCS file: /var/lib/cvs/grubclone/templates/edit_form.tt,v
retrieving revision 1.21
diff -u -r1.21 edit_form.tt
--- templates/edit_form.tt	20 Sep 2004 15:39:23 -0000	1.21
+++ templates/edit_form.tt	2 Oct 2004 17:08:10 -0000
@@ -19,7 +19,7 @@
   [% TRY %]
     <tr>
       <td colspan="2">
-        [% INCLUDE custom/licence.tt %]
+        [% INCLUDE custom_licence.tt %]
       </td>
     </tr>
   [% CATCH %]
Index: templates/footer.tt
===================================================================
RCS file: /var/lib/cvs/grubclone/templates/footer.tt,v
retrieving revision 1.11
diff -u -r1.11 footer.tt
--- templates/footer.tt	20 Sep 2004 15:39:23 -0000	1.11
+++ templates/footer.tt	2 Oct 2004 17:08:28 -0000
@@ -15,7 +15,7 @@
   [% END %]
 
   [% TRY %]
-    [% INCLUDE custom/footer_credits.tt %]
+    [% INCLUDE custom_footer_credits.tt %]
   [% CATCH %]
     <p>
       [% INCLUDE delete_link %]