commit 18e2d95b14456f4a071eb1d4bae8911841660371
parent 8de9f0a21d943e48a9365138c5c0a385328f2006
Author: dankert <devnull@localhost>
Date: Sat, 21 Apr 2007 02:01:53 +0200
Unterscheiden zwischen Root-, Default- und Benutzer-Stylesheet.
Diffstat:
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/actionClasses/Action.class.php b/actionClasses/Action.class.php
@@ -20,6 +20,9 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ---------------------------------------------------------------------------
// $Log$
+// Revision 1.29 2007-04-21 00:01:53 dankert
+// Unterscheiden zwischen Root-, Default- und Benutzer-Stylesheet.
+//
// Revision 1.28 2007-04-11 21:43:01 dankert
// Erg?nzung von "Accesskeys".
//
@@ -264,10 +267,17 @@ class Action
$image_dir = OR_THEMES_DIR.$conf['interface']['theme'].'/images/';
$user = Session::getUser();
+ $style = $conf['interface']['style'];
+
+ if ( strpos($style['extend'],'/')===false )
+ $root_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$style['extend'].'.css';
+ else
+ $root_stylesheet = $style['extend'];
+
if ( !is_object($user) )
- $stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/default.css';
+ $user_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$style['default'].'.css';
else
- $stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$user->style.'.css';
+ $user_stylesheet = OR_THEMES_DIR.$conf['interface']['theme'].'/css/'.$user->style.'.css';
$self = $HTTP_SERVER_VARS['PHP_SELF'];