aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-12 20:48:19 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-12 20:48:19 +0000
commit8c8ce06a1b267a5c5d0b1a4f2b229b6d15e63b71 (patch)
treed829bc29734f5ae0abbe64728a1a5050cdc28347 /doc
parentb26b1d51ab4e71fb04674815c6b08f401ec22993 (diff)
downloadikiwiki-8c8ce06a1b267a5c5d0b1a4f2b229b6d15e63b71.tar
ikiwiki-8c8ce06a1b267a5c5d0b1a4f2b229b6d15e63b71.tar.gz
* Search in default location for templates as a fallback when templatedir is
pointed elsewhere, so that only modified templates need to be copied into a templatedir. Based on work by JeremyReed.
Diffstat (limited to 'doc')
-rw-r--r--doc/patchqueue/fallback_for_templates.mdwn38
-rw-r--r--doc/usage.mdwn7
2 files changed, 4 insertions, 41 deletions
diff --git a/doc/patchqueue/fallback_for_templates.mdwn b/doc/patchqueue/fallback_for_templates.mdwn
deleted file mode 100644
index 999299624..000000000
--- a/doc/patchqueue/fallback_for_templates.mdwn
+++ /dev/null
@@ -1,38 +0,0 @@
-It would be nice if you didn't have to copy all templates to your custom templatedir so you only have your customizations there. And then have it fall back to the location as configured at build time (like /usr/share/ikiwiki/templates/). This would be similar to underlaydir. I don't think any extra configuration directive is needed. As it is now, RecentChanges will have Perl CGI error and Preferences will be an empty page, if you don't have corresponding templates.
-
-I have been testing the following. Sorry if the don't match up as I may have other changes (unrelated) also.
-
-(no markdown for patch, so open in editor to real)
-
---- IkiWiki.pm.save 2007-01-12 09:05:48.000000000 +0900
-+++ IkiWiki.pm 2007-01-12 09:08:24.000000000 +0900
-@@ -638,7 +638,9 @@
- my $text_ref = shift;
- $$text_ref=&Encode::decode_utf8($$text_ref);
- },
-- filename => "$config{templatedir}/$filename",
-+ filename => (-e "$config{templatedir}/$filename" ?
-+ "$config{templatedir}/$filename" :
-+ "$installdir/share/ikiwiki/templates/$filename"),
- loop_context_vars => 1,
- die_on_bad_params => 0,
- @_;
-
---- IkiWiki/CGI.pm.orig 2007-01-01 07:18:26.000000000 +0900
-+++ IkiWiki/CGI.pm 2007-01-12 10:29:14.000000000 +0900
-@@ -291,8 +294,7 @@
- params => $q,
- action => $config{cgiurl},
- table => 0,
-- template => (-e "$config{templatedir}/editpage.tmpl" ?
-- {template_params("editpage.tmpl")} : ""),
-+ template => {template_params("editpage.tmpl")},
- );
-
- run_hooks(formbuilder_setup => sub {
-
-
-Note I don't do prefs nor signin because they are not real users of templates.
-Also, the above is a little redundant as by default it will use same path for both.
-
-Once something like this is in source then usage can be updated \ No newline at end of file
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 47716696f..29ec09670 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -101,9 +101,10 @@ configuration options of their own.
* --templatedir
- Specify the directory that the page [[templates]] are stored in.
- Default is `/usr/share/ikiwiki/templates`, or another location as
- configured at build time.
+ Specify the directory that the page [[templates]] are stored in. Default
+ is `/usr/share/ikiwiki/templates`, or another location as configured at
+ build time. If the templatedir is changed, missing templates will still
+ be searched for in the default location as a fallback.
* --underlaydir