From 29332bed2801dec491752b5c96baa02db7f78899 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 Oct 2005 20:38:46 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Possibilit=E9=20d'utiliser=20une=20feui?=
 =?UTF-8?q?lle=20de=20style=20css.php=20afin=20de=20pouvoir=20y=20inclure?=
 =?UTF-8?q?=20des=20images=20dont=20chemin=20d=E9pend=20du=20theme.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/menus/barre_top/eldy_frontoffice.php | 1 -
 htdocs/main.inc.php                                  | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
index 183b69d31bb..d9fd9b2f503 100644
--- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
@@ -17,7 +17,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4bf9754869f..95ae0ad1a00 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -129,13 +129,16 @@ if (isset($user->conf->MAIN_LANG_DEFAULT) && $user->conf->MAIN_LANG_DEFAULT)
         $langs = new Translate(DOL_DOCUMENT_ROOT ."/langs", $conf->langage);
     }
 }
+
+// Remplace conf->css par valeur personnalisée
 if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME)
 {
     $conf->theme=$user->conf->MAIN_THEME;
     $conf->css  = "theme/".$conf->theme."/".$conf->theme.".css";
-    // Si feuille de style en php existe
-    if (file_exists(DOL_DOCUMENT_ROOT.'/'.$conf->css.".php")) $conf->css.=".php";
 }
+// Si feuille de style en php existe
+if (file_exists(DOL_DOCUMENT_ROOT.'/'.$conf->css.".php")) $conf->css.=".php";
+
 if (isset($user->conf->MAIN_DISABLE_JAVASCRIPT) && $user->conf->MAIN_DISABLE_JAVASCRIPT)
 {
     $conf->use_javascript=! $user->conf->MAIN_DISABLE_JAVASCRIPT;