summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-08 21:00:18 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-08 21:00:18 +0000
commit3f3f3e46ad7890ba8ee7d1aeb51757424b534175 (patch)
treeca84fb32f61ee958d04331d17f7527cf7f01674e
parentac08c5d4e02ebdb7135511cb45196b7118c4ab7b (diff)
* Add a rawhtml plugin that allows copying raw html files from the srcdir.
-rw-r--r--IkiWiki/Plugin/rawhtml.pm13
-rw-r--r--debian/changelog6
-rw-r--r--doc/plugins/html.mdwn2
-rw-r--r--doc/plugins/rawhtml.mdwn13
4 files changed, 33 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/rawhtml.pm b/IkiWiki/Plugin/rawhtml.pm
new file mode 100644
index 000000000..30e971514
--- /dev/null
+++ b/IkiWiki/Plugin/rawhtml.pm
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+# Copy html files raw.
+package IkiWiki::Plugin::rawhtml;
+
+use warnings;
+use strict;
+use IkiWiki;
+
+sub import { #{{{
+ $config{wiki_file_prune_regexps} = [ grep { !m/\\\.x\?html\?\$/ } @{$config{wiki_file_prune_regexps}} ];
+} # }}}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 0b51d12f0..5e75dcbbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.39) UNRELEASED; urgency=low
+
+ * Add a rawhtml plugin that allows copying raw html files from the srcdir.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 8 Jan 2007 15:53:25 -0500
+
ikiwiki (1.38) unstable; urgency=low
* Corrected a bum regexp in openid munging.
diff --git a/doc/plugins/html.mdwn b/doc/plugins/html.mdwn
index 4351ecdb5..d19c99af8 100644
--- a/doc/plugins/html.mdwn
+++ b/doc/plugins/html.mdwn
@@ -1,7 +1,7 @@
[[template id=plugin name=html included=1 author="[[Joey]]"]]
[[tag type/html type/format]]
-This plugin lets raw html pages be used as source pages for the wiki. The
+This plugin lets html pages be used as source pages for the wiki. The
html pages will still be wrapped in the same html template as any other
page, so for best results you should include only the page body in the html
file. Also, if the htmlscrubber plugin is enabled, the html pages will be
diff --git a/doc/plugins/rawhtml.mdwn b/doc/plugins/rawhtml.mdwn
new file mode 100644
index 000000000..41f4a7056
--- /dev/null
+++ b/doc/plugins/rawhtml.mdwn
@@ -0,0 +1,13 @@
+[[template id=plugin name=rawhtml included=1 author="[[Joey]]"]]
+[[tag type/html type/format]]
+
+This plugin changes how ikiwiki handles html files, making it treat html
+or xhtml files not as source files but as data files that are copied
+unchanged when the wiki is built. Compared with the [[html]] plugin, which
+treats html files as source files for the wiki, this plugin allows complete
+control over html pages. Note that this means that the html will not be
+sanitised of problimatic content such as javascript, so it can be insecure
+to enable this plugin if untrusted users have write access to your wiki's
+repository.
+
+This plugin is included in ikiwiki, but is not enabled by default.