diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 697ae2f46fa6941e2eba4d0fee2f2e0697e2d9ed..71f83a11d3eb6c4ad433dca162fc7efd32db7172 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 6e81334ccf45311ec9b97233c7d7256b20b92bac..0bfbfe8147cf9ae8fa130603448dfebbe1590687 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 541306c1e78e401e293ea62f3637019aaa2d3194..f57fb524a01e09e89a9c30ac4e8fe416694461ff 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 1d85bcde1f1488ab7e62a0165b964303b83adb0a..e7529cf3d8604acf3ff0978d864047cd2cb01161 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 c5bacccf4c18ad0e1122c2eaac48b210191a8f3c..e2f97530158145361c817a83645547bac57862c7 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -76,7 +76,7 @@ function llxHeaderVierge($title, $head = "")
print '<meta name="keywords" content="dolibarr,demo,online,demonstration,example,test,web,erp,crm,demos,online">'."\n";
print '<meta name="description" content="Dolibarr simple ERP/CRM demo. You can test here several profiles of Dolibarr ERP/CRM demos.">'."\n";
print "<title>".$title."</title>\n";
- print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/eldy.css.php?lang='.$langs->defaultlang.'">'."\n";
+ print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php?lang='.$langs->defaultlang.'">'."\n";
if ($head) print $head."\n";
print '<style type="text/css">';
print '.CTableRow1 { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/style.css.php
similarity index 99%
rename from htdocs/theme/auguria/auguria.css.php
rename to htdocs/theme/auguria/style.css.php
index 0c32b854cd9743c8da0c689d06e895335f389575..3bfcd0fb1991410ead8763442509c5bbbb301676 100644
--- a/htdocs/theme/auguria/auguria.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/theme/auguria/auguria.css.php
+ * \file htdocs/theme/auguria/style.css.php
* \brief Fichier de style CSS du theme Auguria
* \version $Id$
*/
diff --git a/htdocs/theme/bluelagoon/bluelagoon.css.php b/htdocs/theme/bluelagoon/style.css.php
similarity index 99%
rename from htdocs/theme/bluelagoon/bluelagoon.css.php
rename to htdocs/theme/bluelagoon/style.css.php
index 347cfdf3d73f9609e13f3de3e5e8782d5119abf1..7345b494ac67cce48e0fb554b532e316f15e8849 100644
--- a/htdocs/theme/bluelagoon/bluelagoon.css.php
+++ b/htdocs/theme/bluelagoon/style.css.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/theme/bluelagoon/bluelagoon.css.php
+ * \file htdocs/theme/bluelagoon/style.css.php
* \brief Fichier de style CSS du theme Blue lagoon
* \version $Id$
*/
diff --git a/htdocs/theme/eldy/img/menus/money.png b/htdocs/theme/eldy/img/menus/money.png
index 7a0303b54397e6a9e39a216bb1876d4f20ed3b65..50166e0f74b71cc183956f4c0bd6d31a090f9614 100644
Binary files a/htdocs/theme/eldy/img/menus/money.png and b/htdocs/theme/eldy/img/menus/money.png differ
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/style.css.php
similarity index 99%
rename from htdocs/theme/eldy/eldy.css.php
rename to htdocs/theme/eldy/style.css.php
index fa65963ee6adc5fa6db07026f3c327d7a2661880..d257199d4af1c2839186aad781ee0edc5c7df31f 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/theme/eldy/eldy.css.php
+ * \file htdocs/theme/eldy/style.css.php
* \brief Fichier de style CSS du theme Eldy
* \version $Id$
*/
@@ -316,12 +316,10 @@ div.mainmenu.commercial {
div.mainmenu.accountancy {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/money.png' ?>);
- height:24px;
}
div.mainmenu.project {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/project.png' ?>);
- height:27px;
}
div.mainmenu.tools {
diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/style.css.php
similarity index 99%
rename from htdocs/theme/freelug/freelug.css.php
rename to htdocs/theme/freelug/style.css.php
index 94b0a35f3e238a6ae9b10711b44871fa1d7896b1..094ce7214cdb7be1b65ef7c9d1160cf7f766bf9b 100644
--- a/htdocs/theme/freelug/freelug.css.php
+++ b/htdocs/theme/freelug/style.css.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/theme/freelug/freelug.css.php
+ * \file htdocs/theme/freelug/style.css.php
* \brief Fichier de style CSS du theme Freelug
* \version $Id$
*/
diff --git a/htdocs/theme/rodolphe/rodolphe.css.php b/htdocs/theme/rodolphe/style.css.php
similarity index 99%
rename from htdocs/theme/rodolphe/rodolphe.css.php
rename to htdocs/theme/rodolphe/style.css.php
index 5e1d8178f72a532b2a633953faf84ab7b2d17e9d..a2338411f146e870a2b5942a0cf809d39537225b 100644
--- a/htdocs/theme/rodolphe/rodolphe.css.php
+++ b/htdocs/theme/rodolphe/style.css.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/theme/rodolphe/rodoplhe.css.php
+ * \file htdocs/theme/rodolphe/style.css.php
* \brief Fichier de style CSS du theme Rodolphe
* \version $Id$
*/
diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/style.css.php
similarity index 99%
rename from htdocs/theme/yellow/yellow.css.php
rename to htdocs/theme/yellow/style.css.php
index fe92305348af7de4a3ff8996c1ee775f001dae72..bb023cbab21a3d6b24062083ef19c919da49341e 100644
--- a/htdocs/theme/yellow/yellow.css.php
+++ b/htdocs/theme/yellow/style.css.php
@@ -18,7 +18,7 @@
*/
/**
- * \file htdocs/theme/yellow/yellow.css
+ * \file htdocs/theme/yellow/style.css
* \brief Fichier de style CSS du theme Yellow
* \version $Id$
*/
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 185e70037c8046f09414d765da39cf2c10a8e64a..af48edd5641e35ee308548898bdb9858b9455b1d 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -167,7 +167,7 @@ else
}
}
-$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;
if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))