From c1c933ca658d3babc50da4ade20eb083f1a9c122 Mon Sep 17 00:00:00 2001
From: WikiJeanHawkins <WikiJeanHawkins@web>
Date: Tue, 8 Sep 2009 14:21:49 -0400
Subject:
---
doc/plugins/openid.mdwn | 2 ++
1 file changed, 2 insertions(+)
(limited to 'doc/plugins')
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 91fc7cddc..02b611eb0 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -25,3 +25,5 @@ url.
This plugin is enabled by default, but can be turned off if you want to
only use some other form of authentication, such as [[passwordauth]].
+
+For plugin dissertation or any other related [dissertation](http://www.bestdissertation.com), you may visit this page.
--
cgit v1.2.3
From 6d170066e987137e5f6ff49849c452822df86cf4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 14:27:51 -0400
Subject: Revert spam
This reverts commit c1c933ca658d3babc50da4ade20eb083f1a9c122.
---
doc/plugins/openid.mdwn | 2 --
1 file changed, 2 deletions(-)
(limited to 'doc/plugins')
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 02b611eb0..91fc7cddc 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -25,5 +25,3 @@ url.
This plugin is enabled by default, but can be turned off if you want to
only use some other form of authentication, such as [[passwordauth]].
-
-For plugin dissertation or any other related [dissertation](http://www.bestdissertation.com), you may visit this page.
--
cgit v1.2.3
From 1f828d280a5085f2d9b0c69cbc0d6b4b1a40a105 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 14:38:57 -0400
Subject: update
---
doc/plugins/po.mdwn | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
(limited to 'doc/plugins')
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 38b6b12cd..f3b70b5f7 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -317,27 +317,8 @@ text, or text in whatever single language ikiwiki is configured to "speak".
Maybe there could be a way to switch ikiwiki to speaking another language
when building a non-english page? Then the directives would get translated.
-2 test suite failures
---------------------
-
-t/po is currently failing tests 57 and 59 (and I would like to release
-soon..) --[[Joey]]
-
-> They are failing because of commit cdc3576c8d1e (po: do not inject
-> custom bestlink function when `po_link_to` eq `default`). The test
-> suite changes `$config{po_link_to}`, but the `checkconfig` hook is
-> not re-run. I could manually run it when needed in the test-suite,
-> but this would lead to this function being injected several times,
-> and then `$origsubs{'bestlink'}` to be sometimes set to a wrong
-> value, which would break other parts of the test-suite. The best
-> solution I can think of (apart of reverting this commit or disabling
-> these two tests) is to split the test-suite into 3 parts, depending
-> on the `$config{po_link_to}` setting, either in 3 different `.t`
-> files, or inside the existing one and completely reset the IkiWiki
-> environment at the start of these parts... which I did not manage to
-> achieve in the last 2 hours :/ --[[intrigeri]]
-
->> I've reverted it. --[[Joey]]
+(We also will need this in order to use translated templates, when they are
+available.)
Documentation
-------------
--
cgit v1.2.3
From 2a99ebf2766a08f8d68a82255d1518ecac73ec84 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 17:27:37 -0400
Subject: underlay: Also allow configuring additional directories to search
for template files in.
---
IkiWiki.pm | 10 +++++++++-
IkiWiki/Plugin/underlay.pm | 11 +++++++++--
debian/changelog | 2 ++
doc/plugins/underlay.mdwn | 8 +++++++-
4 files changed, 27 insertions(+), 4 deletions(-)
(limited to 'doc/plugins')
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 01898936f..2f11069c6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -150,6 +150,13 @@ sub getsetup () {
safe => 0, # path
rebuild => 1,
},
+ templatedirs => {
+ type => "internal",
+ default => [],
+ description => "additional directories containing template files",
+ safe => 0,
+ rebuild => 0,
+ },
underlaydir => {
type => "string",
default => "$installdir/share/ikiwiki/basewiki",
@@ -1610,7 +1617,8 @@ sub saveindex () {
sub template_file ($) {
my $template=shift;
- foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
+ foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
+ "$installdir/share/ikiwiki/templates") {
return "$dir/$template" if -e "$dir/$template";
}
return;
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 380d418fb..c59935672 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -27,14 +27,21 @@ sub getsetup () {
safe => 0,
rebuild => 1,
},
+ add_templates => {
+ type => "string",
+ default => [],
+ description => "extra template directories to add",
+ advanced => 1,
+ safe => 0,
+ rebuild => 1,
+ },
}
sub checkconfig () {
- return unless exists $config{add_underlays};
-
foreach my $dir (@{$config{add_underlays}}) {
add_underlay($dir);
}
+ push @{$config{templatedirs}}, @{$config{add_templates}};
}
1;
diff --git a/debian/changelog b/debian/changelog
index 86e8513f7..de165e4ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
* Expand banned_users; it can now include PageSpecs, which
allows banning by IP address.
+ * underlay: Also allow configuring additional directories to search
+ for template files in.
-- Joey Hess <joeyh@debian.org> Wed, 02 Sep 2009 15:01:27 -0400
diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn
index 09d096a6e..f7eafee7c 100644
--- a/doc/plugins/underlay.mdwn
+++ b/doc/plugins/underlay.mdwn
@@ -1,7 +1,7 @@
[[!template id=plugin name=underlay author="[[Simon_McVittie|smcv]]"]]
[[!tag type/useful]]
-This plugin adds an `add_underlays` option to the `.setup` file.
+This plugin adds an `add_underlays` option to the setup file.
Its value is a list of underlay directories whose content is added to the wiki.
Multiple underlays are normally set up automatically by other plugins (for
@@ -12,3 +12,9 @@ like photos or software releases.
Directories in `add_underlays` should usually be absolute. If relative, they're
interpreted as relative to the parent directory of the basewiki underlay, which
is probably not particularly useful in this context.
+
+--
+
+This plugin also adds an `add_templates` option to the setup file.
+Its value is a list of template directories to look for template files in,
+if they are not present in the `templatedir`.
--
cgit v1.2.3