lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganise how theme works. Style sheet must be named style.css.php.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-25 19:52:11 +00:00
parent 2c0e55e701
commit 7d447588cc
13 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/conf.class.php
View File

@ -348,7 +348,7 @@ class Conf
// $this->theme et $this->css // $this->theme et $this->css
if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME="eldy"; if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME="eldy";
$this->theme=$this->global->MAIN_THEME; $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 = email pour envoi par dolibarr des mails automatiques
$this->email_from = "dolibarr-robot@domain.com"; $this->email_from = "dolibarr-robot@domain.com";

2
htdocs/includes/modules/modWorkflow.class.php
View File

@ -75,7 +75,7 @@ class modWorkflow extends DolibarrModules
$this->dirs = array("/workflow/temp"); $this->dirs = array("/workflow/temp");
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'. // 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. // Config pages. Put here list of php page names stored in admmin directory used to setup module.
$this->config_page_url = 'workflow.php@workflow'; $this->config_page_url = 'workflow.php@workflow';

2
htdocs/lib/security.lib.php
View File

@ -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; $conf_css = DOL_URL_ROOT.$conf->css;
// Set cookie for timeout management // Set cookie for timeout management

6
htdocs/main.inc.php
View File

@ -583,7 +583,7 @@ if (! defined('NOLOGIN'))
if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME) if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME)
{ {
$conf->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 // Set javascript option
if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT)) if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
@ -618,7 +618,7 @@ if (! defined('NOREQUIRETRAN'))
if (! empty($_GET["theme"])) if (! empty($_GET["theme"]))
{ {
$conf->theme=$_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 // Define menu manager to use
@ -745,7 +745,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{ {
global $user, $conf, $langs, $db; 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=UTF-8");
header("Content-type: text/html; charset=".$conf->file->character_set_client); header("Content-type: text/html; charset=".$conf->file->character_set_client);

2
htdocs/public/demo/index.php
View File

@ -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="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 '<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 "<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"; if ($head) print $head."\n";
print '<style type="text/css">'; 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;}'; 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;}';

2
htdocs/theme/auguria/auguria.css.php → htdocs/theme/auguria/style.css.php
View File

@ -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 * \brief Fichier de style CSS du theme Auguria
* \version $Id$ * \version $Id$
*/ */

2
htdocs/theme/bluelagoon/bluelagoon.css.php → htdocs/theme/bluelagoon/style.css.php
View File

@ -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 * \brief Fichier de style CSS du theme Blue lagoon
* \version $Id$ * \version $Id$
*/ */

BIN
htdocs/theme/eldy/img/menus/money.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

4
htdocs/theme/eldy/eldy.css.php → htdocs/theme/eldy/style.css.php
View File

@ -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 * \brief Fichier de style CSS du theme Eldy
* \version $Id$ * \version $Id$
*/ */
@ -316,12 +316,10 @@ div.mainmenu.commercial {
div.mainmenu.accountancy { div.mainmenu.accountancy {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/money.png' ?>); background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/money.png' ?>);
height:24px;
} }
div.mainmenu.project { div.mainmenu.project {
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/project.png' ?>); background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/project.png' ?>);
height:27px;
} }
div.mainmenu.tools { div.mainmenu.tools {

2
htdocs/theme/freelug/freelug.css.php → htdocs/theme/freelug/style.css.php
View File

@ -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 * \brief Fichier de style CSS du theme Freelug
* \version $Id$ * \version $Id$
*/ */

2
htdocs/theme/rodolphe/rodolphe.css.php → htdocs/theme/rodolphe/style.css.php
View File

@ -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 * \brief Fichier de style CSS du theme Rodolphe
* \version $Id$ * \version $Id$
*/ */

2
htdocs/theme/yellow/yellow.css.php → htdocs/theme/yellow/style.css.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/theme/yellow/yellow.css * \file htdocs/theme/yellow/style.css
* \brief Fichier de style CSS du theme Yellow * \brief Fichier de style CSS du theme Yellow
* \version $Id$ * \version $Id$
*/ */

2
htdocs/user/passwordforgotten.php
View File

@ -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; $conf_css = DOL_URL_ROOT.$conf->css;
if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png')) if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'))