From cc88cfb65e60fade8751378dafa02898a24a9cb8 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Jul 2010 20:03:51 +0200 Subject: Sync with clean branch of basewiki, smiley and templates. --- basewiki | 2 +- smiley | 2 +- templates | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basewiki b/basewiki index b1fadc6..ef6324a 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit b1fadc6eacaacb4d892b495e15ff82e9ba36c638 +Subproject commit ef6324a81724619a7811a964200208f5c808ac10 diff --git a/smiley b/smiley index 30dd469..0f24195 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 30dd469765c2396ded03355876af391e922e89b3 +Subproject commit 0f24195c7ac3858346dff976970b8b21e911242f diff --git a/templates b/templates index 03cdb15..7ece583 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 03cdb15da3f28c109a1a176d6c3f53cf5e1a18f3 +Subproject commit 7ece5830013f820325074b5982742aed0f220f48 -- cgit v1.2.3 From ab774567b9409b2054f308a908596ada6db54561 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Jul 2010 20:03:51 +0200 Subject: Sync with master-nb branch of basewiki, smiley and templates. --- basewiki | 2 +- smiley | 2 +- templates | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basewiki b/basewiki index b1fadc6..ef6324a 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit b1fadc6eacaacb4d892b495e15ff82e9ba36c638 +Subproject commit ef6324a81724619a7811a964200208f5c808ac10 diff --git a/smiley b/smiley index 30dd469..0f24195 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 30dd469765c2396ded03355876af391e922e89b3 +Subproject commit 0f24195c7ac3858346dff976970b8b21e911242f diff --git a/templates b/templates index 03cdb15..7ece583 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 03cdb15da3f28c109a1a176d6c3f53cf5e1a18f3 +Subproject commit 7ece5830013f820325074b5982742aed0f220f48 -- cgit v1.2.3 From 1e79fb9bbee7c035892759ca130ec6f37157fe3d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Jul 2010 23:26:52 +0200 Subject: Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_nb.config. --- ikiwiki_nb.setup | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 1b43923..12a5b94 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.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/nb', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', # base wiki source location - underlaydirs => [ - #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", - $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/nb", - ], - # 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 edd938f58f422dec0443a35daf8d4052d28851c0 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 13 Jul 2010 15:58:46 +0200 Subject: Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_nb_admin.config. --- ikiwiki_nb_admin.setup | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index 73704aa..0bd3e70 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_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/nb', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates', # base wiki source location - underlaydirs => [ - #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", - $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_l10n/nb", - ], - # 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