diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 697ae2f46fa..71f83a11d3e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -348,7 +348,7 @@ class Conf
// $this->theme et $this->css
if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME="eldy";
$this->theme=$this->global->MAIN_THEME;
- $this->css = "/theme/".$this->theme."/".$this->theme.".css.php";
+ $this->css = "/theme/".$this->theme."/style.css.php";
// $this->email_from = email pour envoi par dolibarr des mails automatiques
$this->email_from = "dolibarr-robot@domain.com";
diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php
index 6e81334ccf4..0bfbfe8147c 100644
--- a/htdocs/includes/modules/modWorkflow.class.php
+++ b/htdocs/includes/modules/modWorkflow.class.php
@@ -43,9 +43,9 @@ class modWorkflow extends DolibarrModules
* \param DB handler d'acces base
*/
function modWorkflow($DB)
- {
+ {
$this->db = $DB ;
-
+
// Id for module (must be unique).
// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
$this->numero = 6000 ;
@@ -67,16 +67,16 @@ class modWorkflow extends DolibarrModules
// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='workflow@workflow';
-
+
// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
$this->triggers = 1;
// Data directories to create when module is enabled
$this->dirs = array("/workflow/temp");
-
+
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
- //$this->style_sheet = '/workflow/css/workflow.css.php';
-
+ $this->style_sheet = '';
+
// Config pages. Put here list of php page names stored in admmin directory used to setup module.
$this->config_page_url = 'workflow.php@workflow';
@@ -109,7 +109,7 @@ class modWorkflow extends DolibarrModules
$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
$this->rights[$r][4] = 'read';
*/
-
+
// Main menu entries
$this->menus = array(); // List of menus to add
$r=0;
@@ -127,7 +127,7 @@ class modWorkflow extends DolibarrModules
'target'=>'',
'user'=>0);
$r++;
-
+
$this->menu[$r]=array( 'fk_menu'=>'r=0',
'type'=>'left',
'titre'=>'Workflow',
@@ -149,7 +149,7 @@ class modWorkflow extends DolibarrModules
* Definit egalement les repertoires de donnees a creer pour ce module.
*/
function init()
- {
+ {
//$result=$this->load_tables();
return $this->_init($sql);
@@ -165,7 +165,7 @@ class modWorkflow extends DolibarrModules
return $this->_remove($sql);
}
-
+
/**
* \brief Create tables and keys required by module
* This function is called by this->init.
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 541306c1e78..f57fb524a01 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -76,7 +76,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
}
}
- $conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang;
+ $conf->css = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang;
$conf_css = DOL_URL_ROOT.$conf->css;
// Set cookie for timeout management
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1d85bcde1f1..e7529cf3d86 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -583,7 +583,7 @@ if (! defined('NOLOGIN'))
if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME)
{
$conf->theme=$user->conf->MAIN_THEME;
- $conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php";
+ $conf->css = "/theme/".$conf->theme."/style.css.php";
}
// Set javascript option
if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
@@ -618,7 +618,7 @@ if (! defined('NOREQUIRETRAN'))
if (! empty($_GET["theme"]))
{
$conf->theme=$_GET["theme"];
- $conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php";
+ $conf->css = "/theme/".$conf->theme."/style.css.php";
}
// Define menu manager to use
@@ -745,7 +745,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{
global $user, $conf, $langs, $db;
- if (empty($conf->css)) $conf->css = '/theme/eldy/eldy.css.php';
+ if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default
//header("Content-type: text/html; charset=UTF-8");
header("Content-type: text/html; charset=".$conf->file->character_set_client);
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index c5bacccf4c1..e2f97530158 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -76,7 +76,7 @@ function llxHeaderVierge($title, $head = "")
print ''."\n";
print ''."\n";
print "".$title."\n";
- print ''."\n";
+ print ''."\n";
if ($head) print $head."\n";
print '