diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-23 22:22:52 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-23 22:22:52 +0200 |
| commit | b8559ab24fb1eec1c679bd17fd9ca4963c070b23 (patch) | |
| tree | 7a702a7b5e4caf4e2bc9a0a1097bcecd2d37a949 | |
| parent | a0079288d298d2416313c0b3c5fc96453c1024db (diff) | |
Drop nonedit branches: Disable plugin editpage instead.
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | basewiki_nonedit | 0 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 8 | ||||
| m--------- | templates_nonedit | 0 |
4 files changed, 5 insertions, 9 deletions
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 -Subproject 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 12e2db6..f9b90cc 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -31,15 +31,17 @@ 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", ], # Some plugins (smiley in particular) need non-localized master underlay - 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 -Subproject 9d0065e2bdf1d26afb37647686ebeae076f8529 |