From 2819aa13fbf4a52ba5abb9ebbfb2f17ac48d49f7 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 23 Jul 2010 22:20:34 +0200 Subject: Drop nonedit branches: Disable plugin editpage instead. --- .gitmodules | 6 ------ basewiki_nonedit | 1 - ikiwiki.setup | 8 +++++--- templates_nonedit | 1 - 4 files changed, 5 insertions(+), 11 deletions(-) delete mode 160000 basewiki_nonedit delete mode 160000 templates_nonedit diff --git a/.gitmodules b/.gitmodules index 3b9000a..464012b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,12 +10,6 @@ [submodule "templates"] path = templates url = git://source.jones.dk/ikiwiki/templates -[submodule "basewiki_nonedit"] - path = basewiki_nonedit - url = git://source.jones.dk/ikiwiki/basewiki -[submodule "templates_nonedit"] - path = templates_nonedit - url = git://source.jones.dk/ikiwiki/templates [submodule "javascript"] path = javascript url = git://source.jones.dk/ikiwiki/javascript diff --git a/basewiki_nonedit b/basewiki_nonedit deleted file mode 160000 index fe0ab01..0000000 --- a/basewiki_nonedit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fe0ab0103ba4810ab9a4c63391107e415e2cae54 diff --git a/ikiwiki.setup b/ikiwiki.setup index 460f109..1b51089 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -31,14 +31,16 @@ use IkiWiki::Setup::Standard { # plugins to add to the default configuration add_plugins => [], # plugins to disable - disable_plugins => [], + disable_plugins => [qw{ + editpage + }], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', # base wiki source location underlaydirs => [ $ENV{'HOME'} . "/private_webdata/samplewiki/content", ], - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit', + underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki', # display verbose messages when building? #verbose => 1, # log to syslog? diff --git a/templates_nonedit b/templates_nonedit deleted file mode 160000 index 0afeb58..0000000 --- a/templates_nonedit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0afeb58d9cf13d7313607a268a2b9d1ffa7f158f -- cgit v1.2.3