summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-03-07 19:22:27 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-03-07 19:23:38 -0500
commit9a82ef32b96b07278b90a1219fa555fa2a970912 (patch)
tree079b002266e80b1a5f2a5c5ccc0ed0ba7120eda0
parent4e11380c75ae66230139641b215d8ffbb0a74d5e (diff)
look for wmd/wmd.js
This means that the underlay needs to have a wmd/wmd/wmd.js, which is a trifle weird, but it isolates all the wmd stuff in a single wmd subdirectory of the built wiki. The wmd/images creating a toplevel images directory was particularly bad.
-rw-r--r--IkiWiki/Plugin/wmd.pm2
-rw-r--r--doc/plugins/wmd.mdwn9
2 files changed, 6 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 9e9f17f7f..bdbcecc06 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -38,7 +38,7 @@ sub include_javascript ($;$) {
my $page=shift;
my $absolute=shift;
- return '<script src="'.urlto("wmd.js", $page, $absolute).
+ return '<script src="'.urlto("wmd/wmd.js", $page, $absolute).
'" type="text/javascript"></script>'."\n";
}
diff --git a/doc/plugins/wmd.mdwn b/doc/plugins/wmd.mdwn
index 31a508cdb..dc9a30703 100644
--- a/doc/plugins/wmd.mdwn
+++ b/doc/plugins/wmd.mdwn
@@ -6,10 +6,11 @@
To use the plugin, you will need to install WMD. Download the [WMD
source](http://wmd-editor.com/downloads/wmd-1.0.1.zip). In that zip file
-you'll find a few example html files, a readme and `wmd` directory. Move the
-`wmd` directory into the ikiwiki `underlaydir` directory (ie
-`/usr/share/ikiwiki/`). You should now have a `wmd/wmd.js` file as well as
-some other javascript files and an images directory in the same place.
+you'll find a few example html files, a readme and `wmd` directory. Create
+a 'wmd' subdirectory in the ikiwiki `underlaydir` directory (ie `sudo mkdir
+/usr/share/ikiwiki/wmd`). Move the `wmd` directory into the directory you
+made. You should now have a `wmd/wmd/wmd.js` file as well as some other
+javascript files and an images directory in the same place.
Note that the WMD plugin does **not** handle ikiwiki directives. For this
reason the normal `preview` button remains.