diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-13 16:01:21 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-13 16:01:21 +0200 |
| commit | 51c5d6d64b30fc0b73ce29370cb4aa2aaf00def6 (patch) | |
| tree | b80e4f9a88fea9685d3893519cb4c774a312ff86 | |
| parent | 9ff361f722618db362a6c999cfb8a20be65bb8cf (diff) | |
| parent | d635c285853be61aefa5445d3688c061ada4138a (diff) | |
Merge branch 'allinone-da' into allinone-multilang
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | basewiki_nonedit | 0 | ||||
| -rw-r--r-- | ikiwiki_da.setup | 4 | ||||
| -rw-r--r-- | ikiwiki_da_admin.setup | 7 | ||||
| m--------- | templates_nonedit | 0 |
6 files changed, 8 insertions, 11 deletions
@@ -1,5 +1,4 @@ /basewiki_l10n -/basewiki_nonedit /basewiki_nonedit_l10n /content /content_l10n @@ -9,5 +8,4 @@ /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 +Subproject 240f2f0aeec158e94b54ca23a2cf3e19b95e5ea diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 346ad59..6ee211a 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -33,12 +33,10 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_l10n/da', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit', # base wiki source location underlaydirs => [ $ENV{'HOME'} . '/private_webdata/samplewiki/content', - #$ENV{'HOME'} . '/private_webdata/samplewiki/smiley_l10n/da', - $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit_l10n/da', ], # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit', diff --git a/ikiwiki_da_admin.setup b/ikiwiki_da_admin.setup index 01ea4e3..92bbde3 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, diff --git a/templates_nonedit b/templates_nonedit new file mode 160000 +Subproject 8c0c142ad073666eaa626ea6bebcc76138e351f |