From cca94fbcfc035dabe5597e8565671c84862268e9 Mon Sep 17 00:00:00 2001 From: Roland Hager Date: Sun, 6 Feb 2011 19:57:16 +0000 Subject: made config cascade more flexible --- inc/config_cascade.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'inc/config_cascade.php') diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 3ae68a000..32001be81 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -5,7 +5,8 @@ * This array configures the default locations of various files in the * DokuWiki directory hierarchy. It can be overriden in inc/preload.php */ -$config_cascade = array( +$config_cascade = array_merge( + array( 'main' => array( 'default' => array(DOKU_CONF.'dokuwiki.php'), 'local' => array(DOKU_CONF.'local.php'), @@ -62,5 +63,7 @@ $config_cascade = array( 'plainauth.users' => array( 'default' => DOKU_CONF.'users.auth.php', ), + ), + $config_cascade ); -- cgit v1.2.3 From aeb1fea310b2067fbd3e259b9a2822783a2b7221 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 26 Feb 2011 14:48:33 +0000 Subject: added missing user rtlstyle.css to config_cascade --- inc/config_cascade.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/config_cascade.php') diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 32001be81..b016de8a0 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -50,6 +50,7 @@ $config_cascade = array_merge( ), 'userstyle' => array( 'default' => DOKU_CONF.'userstyle.css', + 'rtl' => DOKU_CONF.'rtlstyle.css', 'print' => DOKU_CONF.'printstyle.css', 'feed' => DOKU_CONF.'feedstyle.css', 'all' => DOKU_CONF.'allstyle.css', -- cgit v1.2.3 From 318cd03ee91d3a5344bab636a77c3cb19c32c5b7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 26 Feb 2011 21:22:14 +0000 Subject: improved css.php and core styles * code cleanup in lib/exe/css.php * renamed 'default' userstyle to 'screen' in config_cascade * splitted core lib/styles/style.css up into all.css, print.css and screen.css --- inc/config_cascade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/config_cascade.php') diff --git a/inc/config_cascade.php b/inc/config_cascade.php index b016de8a0..96cd5d4b5 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -49,7 +49,7 @@ $config_cascade = array_merge( 'local' => array(DOKU_CONF.'wordblock.local.conf'), ), 'userstyle' => array( - 'default' => DOKU_CONF.'userstyle.css', + 'screen' => DOKU_CONF.'userstyle.css', 'rtl' => DOKU_CONF.'rtlstyle.css', 'print' => DOKU_CONF.'printstyle.css', 'feed' => DOKU_CONF.'feedstyle.css', -- cgit v1.2.3 From 4e098b31e03d71843366023ea526608ff2377a80 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 26 Feb 2011 21:37:21 +0000 Subject: renamed userstyles In 09edb7113c19b07ca11a79c2b0571f45ed2cc2eb most of the old userstyles were wrongly named. This renames them back to what they were before that change. See also http://www.dokuwiki.org/devel:css#user_styles --- inc/config_cascade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'inc/config_cascade.php') diff --git a/inc/config_cascade.php b/inc/config_cascade.php index 96cd5d4b5..48ed5a000 100644 --- a/inc/config_cascade.php +++ b/inc/config_cascade.php @@ -50,10 +50,10 @@ $config_cascade = array_merge( ), 'userstyle' => array( 'screen' => DOKU_CONF.'userstyle.css', - 'rtl' => DOKU_CONF.'rtlstyle.css', - 'print' => DOKU_CONF.'printstyle.css', - 'feed' => DOKU_CONF.'feedstyle.css', - 'all' => DOKU_CONF.'allstyle.css', + 'rtl' => DOKU_CONF.'userrtl.css', + 'print' => DOKU_CONF.'userprint.css', + 'feed' => DOKU_CONF.'userfeed.css', + 'all' => DOKU_CONF.'userall.css', ), 'userscript' => array( 'default' => DOKU_CONF.'userscript.js' -- cgit v1.2.3