Merge branch 'themes'

2 files changed, 37 insertions, 1 deletions

diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm
new file mode 100644
index 000000000..ba6966381
--- /dev/null
+++ b/IkiWiki/Plugin/theme.pm
@@ -0,0 +1,37 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::theme;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "theme", call => \&getsetup);
+	hook(type => "checkconfig", id => "theme", call => \&checkconfig);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+			section => "web",
+		},
+		theme => {
+			type => "string",
+			example => "actiontabs",
+			description => "name of theme to enable",
+			safe => 1,
+			rebuild => 1,
+		},
+}
+
+my $added=0;
+sub checkconfig () {
+	if (! $added && exists $config{theme} && $config{theme} =~ /^\w+$/) {
+		add_underlay("themes/".$config{theme});
+		$added=1;
+	}
+}
+
+1
diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 99b136281..71d7c9d17 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -4,7 +4,6 @@ package IkiWiki::Plugin::wmd;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-use Encode;
 
 sub import {
 	add_underlay("wmd");