diff options
| -rw-r--r-- | .gitmodules | 18 | ||||
| m--------- | basewiki_nonedit | 0 | ||||
| m--------- | basewiki_nonedit_da | 0 | ||||
| m--------- | basewiki_nonedit_nb | 0 | ||||
| -rw-r--r-- | ikiwiki.setup | 8 | ||||
| -rw-r--r-- | ikiwiki_da.setup | 8 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 8 | ||||
| m--------- | templates_nonedit | 0 | ||||
| m--------- | templates_nonedit_da | 0 | ||||
| m--------- | templates_nonedit_nb | 0 |
10 files changed, 15 insertions, 27 deletions
diff --git a/.gitmodules b/.gitmodules index b0f2fe4..876514e 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 "basewiki_da"] path = basewiki_da url = git://source.jones.dk/ikiwiki/basewiki @@ -28,18 +22,6 @@ [submodule "templates_nb"] path = templates_nb url = git://source.jones.dk/ikiwiki/templates -[submodule "basewiki_nonedit_da"] - path = basewiki_nonedit_da - url = git://source.jones.dk/ikiwiki/basewiki -[submodule "templates_nonedit_da"] - path = templates_nonedit_da - url = git://source.jones.dk/ikiwiki/templates -[submodule "basewiki_nonedit_nb"] - path = basewiki_nonedit_nb - url = git://source.jones.dk/ikiwiki/basewiki -[submodule "templates_nonedit_nb"] - path = templates_nonedit_nb - url = git://source.jones.dk/ikiwiki/templates [submodule "directives_da"] path = directives_da url = git://source.jones.dk/ikiwiki/directives diff --git a/basewiki_nonedit b/basewiki_nonedit deleted file mode 160000 -Subproject fe0ab0103ba4810ab9a4c63391107e415e2cae5 diff --git a/basewiki_nonedit_da b/basewiki_nonedit_da deleted file mode 160000 -Subproject 8321feea467909190764dde311e1918adb729b3 diff --git a/basewiki_nonedit_nb b/basewiki_nonedit_nb deleted file mode 160000 -Subproject 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea diff --git a/ikiwiki.setup b/ikiwiki.setup index 33a0a88..9329ad2 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/ikiwiki_da.setup b/ikiwiki_da.setup index 5d231d3..b505517 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.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_da', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_da', # base wiki source location underlaydirs => [ $ENV{'HOME'} . '/private_webdata/samplewiki/content_da', ], - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit_da', + underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_da', # display verbose messages when building? #verbose => 1, # log to syslog? diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 925c4ff..3e16252 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.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_nb', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nb', # base wiki source location underlaydirs => [ $ENV{'HOME'} . '/private_webdata/samplewiki/content_nb', ], - underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit_nb', + underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nb', # display verbose messages when building? #verbose => 1, # log to syslog? diff --git a/templates_nonedit b/templates_nonedit deleted file mode 160000 -Subproject 0afeb58d9cf13d7313607a268a2b9d1ffa7f158 diff --git a/templates_nonedit_da b/templates_nonedit_da deleted file mode 160000 -Subproject 9d0065e2bdf1d26afb37647686ebeae076f8529 diff --git a/templates_nonedit_nb b/templates_nonedit_nb deleted file mode 160000 -Subproject 9d0065e2bdf1d26afb37647686ebeae076f8529 |