From 7d447588cceeb2da4185d47a0a5402c10ee75e40 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@users.sourceforge.net> Date: Fri, 25 Jun 2010 19:52:11 +0000 Subject: [PATCH] Reorganise how theme works. Style sheet must be named style.css.php. --- htdocs/core/class/conf.class.php | 2 +- htdocs/includes/modules/modWorkflow.class.php | 20 +++++++++--------- htdocs/lib/security.lib.php | 2 +- htdocs/main.inc.php | 6 +++--- htdocs/public/demo/index.php | 2 +- .../{auguria.css.php => style.css.php} | 2 +- .../{bluelagoon.css.php => style.css.php} | 2 +- htdocs/theme/eldy/img/menus/money.png | Bin 1845 -> 1751 bytes .../eldy/{eldy.css.php => style.css.php} | 4 +--- .../{freelug.css.php => style.css.php} | 2 +- .../{rodolphe.css.php => style.css.php} | 2 +- .../yellow/{yellow.css.php => style.css.php} | 2 +- htdocs/user/passwordforgotten.php | 2 +- 13 files changed, 23 insertions(+), 25 deletions(-) rename htdocs/theme/auguria/{auguria.css.php => style.css.php} (99%) rename htdocs/theme/bluelagoon/{bluelagoon.css.php => style.css.php} (99%) rename htdocs/theme/eldy/{eldy.css.php => style.css.php} (99%) rename htdocs/theme/freelug/{freelug.css.php => style.css.php} (99%) rename htdocs/theme/rodolphe/{rodolphe.css.php => style.css.php} (99%) rename htdocs/theme/yellow/{yellow.css.php => style.css.php} (99%) 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 '<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 0c32b854cd9..3bfcd0fb199 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 347cfdf3d73..7345b494ac6 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 GIT binary patch delta 1748 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 delta 1822 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 M07*qoM6N<$f^^h(aR2}S 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 fa65963ee6a..d257199d4af 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 94b0a35f3e2..094ce7214cd 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 5e1d8178f72..a2338411f14 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 fe92305348a..bb023cbab21 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 185e70037c8..af48edd5641 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')) -- GitLab