From e2167037f69cd6339ee27901ab13073c08443027 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Jul 2010 23:24:41 +0200 Subject: Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_da.config. --- ikiwiki_da.setup | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 81f0e3c..99d131d 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -33,13 +33,8 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_l10n/da', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', # base wiki source location - underlaydirs => [ - #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/da", - $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/da", - ], - # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki', # display verbose messages when building? #verbose => 1, -- cgit v1.2.3 From a1aaa3a8fe5724019537460a3064211a86f7fbf5 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 13 Jul 2010 14:39:22 +0200 Subject: Add basewiki_nonedit and templates_nonedit as submodules, and no longer gitignore them. --- .gitignore | 2 -- .gitmodules | 6 ++++++ basewiki_nonedit | 1 + templates_nonedit | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) create mode 160000 basewiki_nonedit create mode 160000 templates_nonedit diff --git a/.gitignore b/.gitignore index 1cd49d1..1f46f44 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,8 @@ /basewiki_l10n -/basewiki_nonedit /basewiki_nonedit_l10n /content /content_dummy /directives_l10n /smiley_l10n /templates_l10n -/templates_nonedit /templates_nonedit_l10n diff --git a/.gitmodules b/.gitmodules index 4c34cde..3d4256b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,9 @@ [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 diff --git a/basewiki_nonedit b/basewiki_nonedit new file mode 160000 index 0000000..240f2f0 --- /dev/null +++ b/basewiki_nonedit @@ -0,0 +1 @@ +Subproject commit 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea1 diff --git a/templates_nonedit b/templates_nonedit new file mode 160000 index 0000000..8c0c142 --- /dev/null +++ b/templates_nonedit @@ -0,0 +1 @@ +Subproject commit 8c0c142ad073666eaa626ea6bebcc76138e351f6 -- cgit v1.2.3 From 9f88d15ac7caa5ca02da988aacfd1735329f2734 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 13 Jul 2010 16:01:15 +0200 Subject: Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_da_admin.setup. --- ikiwiki_da_admin.setup | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ikiwiki_da_admin.setup b/ikiwiki_da_admin.setup index 9ef6204..00a5c57 100644 --- a/ikiwiki_da_admin.setup +++ b/ikiwiki_da_admin.setup @@ -33,13 +33,8 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_l10n/da', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', # base wiki source location - underlaydirs => [ - #$ENV{'HOME'} . '/private_webdata/samplewiki/smiley_l10n/da', - $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_l10n/da', - ], - # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki', # display verbose messages when building? #verbose => 1, -- cgit v1.2.3