diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 99df1e73053623ce8a10bee8700ded2e34798909..8992af9a78b2a7da9f1a8965f50b6ecbe336b462 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -491,7 +491,7 @@ function dol_strtoupper($utf8_string) * On Windows LOG_ERR=4, LOG_WARNING=5, LOG_NOTICE=LOG_INFO=6, LOG_DEBUG=6 si define_syslog_variables ou PHP 5.3+, 7 si dolibarr * On Linux LOG_ERR=3, LOG_WARNING=4, LOG_INFO=6, LOG_DEBUG=7 * @param int $ident 1=Increase ident of 1, -1=Decrease ident of 1 - * @param string $suffixinfilename When output is a file, append this suffix into default log filename. + * @param string $suffixinfilename When output is a file, append this suffix into default log filename. * @return void */ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='') @@ -706,7 +706,7 @@ function dol_format_address($object) $ret.="\n".$object->state; } } - + else // Other: title firstname name \n address lines \n zip town \n country { $ret .= ($ret ? "\n" : '' ).$object->zip; @@ -1646,32 +1646,33 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false) global $conf; // Define fullpathpicto to use into src - if ($pictoisfullpath) { + if ($pictoisfullpath) + { // Clean parameters - if (! preg_match('/(\.png|\.gif)$/i',$picto)) - $picto .= '.png'; + if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png'; $fullpathpicto = $picto; } else { - // By default, we search into theme directory + // By default, we search $url/theme/$theme/img/$picto $url = DOL_URL_ROOT; - $path = 'theme/'.$conf->theme; - if (! empty($conf->global->MAIN_FORCETHEMEDIR)) - $path = preg_replace('/^\//', '', $conf->global->MAIN_FORCETHEMEDIR).'/'.$path; - // If we ask an image into module/img (not into a theme path) + $theme = $conf->theme; + + $path = 'theme/'.$theme; + if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; + if (! empty($conf->global->MAIN_FORCETHEMEDIR)) $path = preg_replace('/^\//', '', $conf->global->MAIN_FORCETHEMEDIR).'/'.$path; // TODO What if there is both FORCETHEMDIR and OVERWRITE_THEM_RES + // If we ask an image into $url/$mymodule/img (instead of default path) if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs)) { $picto = $regs[1]; - $path = $regs[2]; + $path = $regs[2]; // $path is $mymodule } // Clean parameters - if (! preg_match('/(\.png|\.gif)$/i',$picto)) - $picto .= '.png'; - // If img file not into standard path, we use alternate path - if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/'.$picto)) - $url = DOL_URL_ROOT_ALT; + if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png'; + // If img file is not into standard path, we use alternate path (Avoid using DOL_URL_ROOT_ALT for performane) + if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/'.$picto)) $url = DOL_URL_ROOT_ALT; + // $url is '' or '/custom', $path is current theme or $fullpathpicto = $url.'/'.$path.'/img/'.$picto; } diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 110c372cb3aeb75231e624ec571acc8a73d3dde4..8f2dd6529225b7f236c3a216737aced59eaf7538 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -1,8 +1,9 @@ <?php -/* Copyright (C) 2012 Nicolas Péré <nicolas@amarok2.net> - * Copyright (C) 2012 Xavier Peyronnet <xavier.peyronnet@free.fr> - * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com> - * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> +/* Copyright (C) 2012 Nicolas Péré <nicolas@amarok2.net> + * Copyright (C) 2012 Xavier Peyronnet <xavier.peyronnet@free.fr> + * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com> + * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,14 +59,16 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); $fontsize=empty($conf->browser->phone)?'12':'12'; $fontsizesmaller=empty($conf->browser->phone)?'11':'11'; -$path=''; // This value may be used in future for external module to overwrite theme +$path=''; // This value may be used in future for external module to overwrite theme +$theme='amarok'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } // Define image path files $fontlist='helvetica,arial,tahoma,verdana'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; //'/theme/auguria/img/menus/trtitle.png'; -$img_liste_titre=dol_buildpath($path.'/theme/amarok/img/menus/trtitle.png',1); -$img_head=dol_buildpath($path.'/theme/amarok/img/headbg2.jpg',1); -$img_button=dol_buildpath($path.'/theme/amarok/img/button_bg.png',1); +$img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1); +$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); +$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?> @@ -84,12 +87,12 @@ body { background-color:#f5f5f5; <?php if ($_SESSION['dol_login'] != '') {?> <?php if (GETPOST("optioncss") != 'print') {?> - background-image:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/vmenu.png' ?>); + background-image:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/vmenu.png',1); ?>); background-repeat:repeat-y; margin:0px; <?php } ?> <?php } else {?> - background-image:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/background_login.png' ?>); + background-image:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/background_login.png',1); ?>); margin:100px; <?php } ?> color:#232323; @@ -1133,21 +1136,21 @@ tr.fiche { .ok { color:#159e26; - background:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/ok.png' ?>) left center no-repeat; + background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) left center no-repeat; padding-left:20px; font-weight:bold; } .warning { color:#bca936; - background:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/warning.png' ?>) left center no-repeat; + background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) left center no-repeat; padding-left:20px; font-weight:bold; } .error { color:#a61111; - background:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/error.png' ?>) left center no-repeat; + background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) left center no-repeat; padding-left:20px; font-weight:bold; } @@ -1155,7 +1158,7 @@ tr.fiche { td.highlights {background:#f9c5c6;} div.ok { - background:#61e372 url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/ok.png' ?>) 3px center no-repeat; + background:#61e372 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) 3px center no-repeat; color:#ffffff; padding:2px 4px 2px 24px; margin:0.5em 0em; @@ -1164,7 +1167,7 @@ div.ok { } div.warning, div.info { - background:#fcf5b8 url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/warning.png' ?>) 3px center no-repeat; + background:#fcf5b8 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) 3px center no-repeat; color:#232323; padding:2px 4px 2px 24px; margin:0.5em 0em; @@ -1173,7 +1176,7 @@ div.warning, div.info { } div.error { - background:#f58080 url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/error.png' ?>) 3px center no-repeat; + background:#f58080 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) 3px center no-repeat; color:#ffffff; padding:2px 4px 2px 24px; margin:0.5em 0em; @@ -1562,7 +1565,7 @@ li.cal_event { border: none; list-style-type: none; } /* ============================================================================== */ .ui-widget {font-family:Verdana,Arial,sans-serif; font-size:0.9em;} -.ui-autocomplete-loading {background:#ffffff url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/working.gif' ?>) right center no-repeat;} +.ui-autocomplete-loading {background:#ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1); ?>) right center no-repeat;} /* ============================================================================== */ diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 2b61bd0fb70f4f88533a1fea9d3b08f36e2097a2..ce2852df89a82ffff6544ea2ff34c1e88595f44b 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1,5 +1,5 @@ <?php -/* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> +/* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2007-2011 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> @@ -56,14 +56,16 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); $fontsize=empty($conf->browser->phone)?'12':'12'; $fontsizesmaller=empty($conf->browser->phone)?'11':'11'; -$path=''; // This value may be used in future for external module to overwrite theme +$path=''; // This value may be used in future for external module to overwrite theme +$theme='auguria'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } // Define image path files $fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; //'/theme/auguria/img/menus/trtitle.png'; -$img_liste_titre=dol_buildpath($path.'/theme/auguria/img/menus/trtitle.png',1); -$img_head=dol_buildpath($path.'/theme/auguria/img/headbg2.jpg',1); -$img_button=dol_buildpath($path.'/theme/auguria/img/button_bg.png',1); +$img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1); +$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); +$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); $colorbacklineimpairhover='210,214,217'; $colorbacklinepairhover='210,214,217'; @@ -272,7 +274,7 @@ div.tmenu { font-weight: normal; height: <?php print $heightmenu; ?>px; background: #7FAEC6; - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/table_bg.gif',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/table_bg.gif',1); ?>); /* background-position: center bottom; */ color: #000000; text-decoration: none; @@ -296,52 +298,52 @@ div.mainmenu { /* div.mainmenu.home{ - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/home.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1); ?>); } div.mainmenu.companies { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/company.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1); ?>); } div.mainmenu.products { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/products.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1); ?>); margin-left: 10px; } div.mainmenu.commercial { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/commercial.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1); ?>); } div.mainmenu.accountancy { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/money.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1); ?>); } div.mainmenu.project { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/project.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1); ?>); } div.mainmenu.tools { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/tools.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>); } div.mainmenu.members { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/members.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1); ?>); } div.mainmenu.shop { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/shop.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1); ?>); } div.mainmenu.agenda { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/agenda.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1); ?>); } div.mainmenu.ecm { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/ecm.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1); ?>); } div.mainmenu.cashdesk { - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/pointofsale.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1); ?>); } */ <?php @@ -385,7 +387,7 @@ foreach($mainmenuusedarray as $val) // Img file not found if (! $found && $generic <= 4) { - $url=dol_buildpath($path.'/theme/auguria/img/menus/generic'.$generic.".png",1); + $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1); $found=1; $generic++; } @@ -410,7 +412,7 @@ foreach($mainmenuusedarray as $val) font-size: 10px; /* To reduce to have more entries */ font-family:Tahoma,sans-serif; text-transform:uppercase; - background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/topmenu_bg.png',1) ?>) repeat-x bottom left; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/topmenu_bg.png',1) ?>) repeat-x bottom left; } .tmenu ul{ @@ -445,7 +447,7 @@ foreach($mainmenuusedarray as $val) .tmenu ul li a:hover{ color:#fff; - background:transparent url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/topmenu_bg_over.gif',1); ?>) repeat-x bottom left; + background:transparent url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/topmenu_bg_over.gif',1); ?>) repeat-x bottom left; } .tmenu ul li a:hover span{ @@ -456,7 +458,7 @@ foreach($mainmenuusedarray as $val) .tmenu ul li a.tmenusel{ color:#fff; - background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/topmenu_left.gif',1); ?>) no-repeat top left; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/topmenu_left.gif',1); ?>) no-repeat top left; line-height:305%; } @@ -464,7 +466,7 @@ foreach($mainmenuusedarray as $val) display:block; padding:4px 8px 0 0; width:auto; - background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/topmenu_right.png',1); ?>) no-repeat top right; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/topmenu_right.png',1); ?>) no-repeat top right; height:33px; } @@ -630,7 +632,7 @@ div.blockvmenuimpair form a.vmenu, div.blockvmenupair form a.vmenu div.menu_titre { - background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/bg-titre-rubrique.png',1); ?>); + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg-titre-rubrique.png',1); ?>); padding: 0px; padding-top:5px; padding-left:0px; @@ -690,7 +692,7 @@ div.blockvmenuhelp } div.menu_contenu { - background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/bg-rubrique.png',1); ?>); + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg-rubrique.png',1); ?>); padding: 8px 0px 0px 0px; margin: 0px; padding: 1px; @@ -703,7 +705,7 @@ div.menu_contenu { } div.menu_end { - background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/bg-bas-rubrique.png',1); ?>); + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg-bas-rubrique.png',1); ?>); /* border-top: 1px solid #436981; */ margin: 0px; padding: 0px; @@ -985,7 +987,7 @@ div.tabBar { border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; border-top: 1px solid #D8D8D8; - background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/auguria/img/tab_background.png',1) ?>) repeat-x; + background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1) ?>) repeat-x; } div.tabsAction { @@ -1161,7 +1163,7 @@ span.butAction, span.butActionDelete { } /* #undertopmenu { -background-image: url("<?php echo dol_buildpath($path.'/theme/auguria/img/gradient.gif',1); ?>"); +background-image: url("<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/gradient.gif',1); ?>"); background-repeat: repeat-x; } */ @@ -1725,7 +1727,7 @@ li.cal_event { border: none; list-style-type: none; } /* ============================================================================== */ .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 0.9em; } -.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/auguria/img/working.gif',1) ?>) right center no-repeat; } +.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1) ?>) right center no-repeat; } /* ============================================================================== */ @@ -1733,12 +1735,12 @@ li.cal_event { border: none; list-style-type: none; } /* ============================================================================== */ .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete { - background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/edit.png',1) ?>) right top no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat; cursor: pointer; } .editkey_datepicker { - background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/calendar.png',1) ?>) right center no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat; cursor: pointer; } @@ -2001,7 +2003,7 @@ div.tablelines { div.thead { height: 24px; background: #7699A9; - background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/trtitle.png',1); ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1); ?>); background-repeat: repeat-x; color: #FFFFFF; font-family: <?php print $fontlist ?>; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index eeb7eada5aad4a4f6f0fdb725cc9ecaa326fb8a3..389abfe46b482cd07f6089595dc88ea9bd6b1b72 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -1,5 +1,5 @@ <?php -/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> +/* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2007-2010 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com> @@ -60,6 +60,10 @@ $fontsizesmaller=empty($conf->browser->phone)?'11':'11'; $fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; +$path=''; // This value may be used in future for external module to overwrite theme +$theme='bureau2crea'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } + ?> /* ============================================================================== */ @@ -140,7 +144,7 @@ textarea:disabled { } input.button[type=submit] { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnGreen.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnGreen.jpg',1); ?>); display: block; height: 18px; line-height: 16px; @@ -159,7 +163,7 @@ input[type=checkbox] { background-color: transparent; border: none; box-shadow: .button { font-family: <?php print $fontlist ?>; border: 0px; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/button_bg.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>); background-position: bottom; padding: 0px 2px 0px 2px; margin: 0px 0px 0px 0px; @@ -168,7 +172,7 @@ input[type=checkbox] { background-color: transparent; border: none; box-shadow: font-family: <?php print $fontlist ?>; color: #222244; border: 0px; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/button_bg.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>); background-position: bottom; padding: 0px 2px 0px 2px; margin: 0px 0px 0px 0px; @@ -176,7 +180,7 @@ input[type=checkbox] { background-color: transparent; border: none; box-shadow: .buttonajax { font-family: <?php print $fontlist ?>; border: 0px; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/button_bg.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>); background-position: bottom; padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; @@ -315,7 +319,7 @@ div.tmenu { padding: 0px; margin: 5px 0px 10px 0px; font-size: 13px; - background-image : url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_mainNav.jpg' ?>); + background-image : url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_mainNav.jpg',1); ?>); background-repeat: no-repeat; background-color: #996644; height: 22px; @@ -340,56 +344,56 @@ div.mainmenu { /* div.mainmenu.home{ - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/home.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1); ?>); } div.mainmenu.companies { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/company.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1); ?>); } div.mainmenu.products { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/products.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1); ?>); margin-left: 10px; } div.mainmenu.commercial { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/commercial.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1); ?>); } div.mainmenu.accountancy { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/money.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1); ?>); } div.mainmenu.bank { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/bank.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1); ?>); } div.mainmenu.project { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/project.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1); ?>); } div.mainmenu.tools { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/tools.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>); } div.mainmenu.members { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/members.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1); ?>); } div.mainmenu.shop { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/shop.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1); ?>); } div.mainmenu.agenda { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/agenda.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1); ?>); } div.mainmenu.ecm { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/ecm.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1); ?>); } div.mainmenu.cashdesk { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/pointofsale.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1); ?>); } */ <?php @@ -425,7 +429,7 @@ foreach($mainmenuusedarray as $val) { if (file_exists($dirroot."/".$val."/img/".$val.".png")) { - $url=DOL_URL_ROOT.'/'.$val.'/img/'.$val.'.png'; + $url=dol_buildpath($path.'/'.$val.'/img/'.$val.'.png',1); $found=1; break; } @@ -433,7 +437,7 @@ foreach($mainmenuusedarray as $val) // Img file not found if (! $found && $generic <= 4) { - $url=DOL_URL_ROOT."/theme/bureau2crea/img/menus/generic".$generic.".png"; + $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.'.png',1); $found=1; $generic++; } @@ -508,7 +512,7 @@ li.tmenu .tmenusel, li.tmenusel .tmenusel { } li.tmenusel { - background-image : url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_tmenusel_btnD.jpg' ?>); + background-image : url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_tmenusel_btnD.jpg',1); ?>); background-position: right; } @@ -654,7 +658,7 @@ div.blockvmenupair border-spacing: 0px; padding: 0px; width: 100%; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_leftCategorie.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie.jpg',1); ?>); background-position: top right; background-repeat: no-repeat; @@ -665,7 +669,7 @@ div.blockvmenuimpair border-spacing: 0px; padding: 0px; width: 100%; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_leftCategorie.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie.jpg',1); ?>); background-position: top right; background-repeat: no-repeat; @@ -710,7 +714,7 @@ div.blockvmenusearch margin: 3px 0px 15px 0px; padding: 25px 0px 2px 2px; width: 180px; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_leftMenu.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftMenu.jpg',1); ?>); background-position: top right; background-repeat: no-repeat; } @@ -745,7 +749,7 @@ div.blockvmenubookmarks border-spacing: 0px; padding: 0px; width: 100%; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_leftCategorie.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie.jpg',1); ?>); background-position: top right; background-repeat: no-repeat; margin-bottom: 15px; @@ -843,7 +847,7 @@ td.photo { /* ============================================================================== */ .toolbar { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important; + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$conf->theme.'/img/tmenu2.png',1); ?>) !important; background-repeat: repeat-x !important; border: 1px solid #BBB !important; } @@ -1046,7 +1050,7 @@ div.tabs { margin: 0px 0px 10px 0px; text-align: left; width: 100%; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_navHorizontal.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_navHorizontal.jpg',1); ?>); height: 25px; background-repeat: repeat-x; background-position: left; @@ -1095,7 +1099,7 @@ div.tabs a.tab#active { div.tabs a.tab span { padding: 0px 10px 0px 10px; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_ssmenu_btnG.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_ssmenu_btnG.jpg',1); ?>); background-position: left; background-repeat: no-repeat; display: block; @@ -1104,7 +1108,7 @@ div.tabs a.tab span { } div.tabs a.tab#active span { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_ssmenusel_btnG.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_ssmenusel_btnG.jpg',1); ?>); } div.tabs a.tab:hover { @@ -1122,7 +1126,7 @@ div.tabs a.tab:hover { div.tabBar { color: #234046; margin: 0px 0px 10px 0px; - background: #dee7ec url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/tab_background.png' ?>) repeat-x; + background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x; } div.tabsAction { @@ -1243,7 +1247,7 @@ span.tabspan { .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { font-family:"Trebuchet MS",Arial,Helvetica,sans-serif; font-weight: bold; - background: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnBlue.jpg' ?>) repeat-x; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnBlue.jpg',1); ?>) repeat-x; color: #FFF !important; padding: 0px 10px 0px 10px; margin: 0px 10px 0px 10px; @@ -1261,7 +1265,7 @@ span.tabspan { } .butActionDelete { - background: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnRed.jpg' ?>) repeat-x !important; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnRed.jpg',1); ?>) repeat-x !important; color: #FFF; } @@ -1274,7 +1278,7 @@ span.tabspan { .butActionRefused { font-family:"Trebuchet MS",Arial,Helvetica,sans-serif; font-weight: bold; - background: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnBlue.jpg' ?>) repeat-x; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnBlue.jpg',1); ?>) repeat-x; color: #AAA !important; padding: 0px 10px 0px 10px; margin: 0px 10px 0px 10px; @@ -1309,7 +1313,7 @@ span.butAction, span.butActionDelete { /* #undertopmenu { -background-image: url("<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/gradient.gif' ?>"); +background-image: url("<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/gradient.gif',1); ?>"); background-repeat: repeat-x; } */ @@ -1416,7 +1420,7 @@ table.nobordernopadding td { /* For lists */ table.liste { - /*background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_centerBlock-title.jpg' ?>);*/ + /*background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title.jpg',1); ?>);*/ background-repeat: no-repeat; background-position: top right; vertical-align: text-top; @@ -1427,7 +1431,7 @@ padding: 0px 5px; } table.noborder { - /*background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_centerBlock-title.jpg' ?>);*/ + /*background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title.jpg',1); ?>);*/ background-repeat: no-repeat; background-position: top right; vertical-align: text-top; @@ -1446,7 +1450,7 @@ tr.liste_titre { } tr.liste_titre { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_centerBlock-title.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title.jpg',1); ?>); background-position: top right; } @@ -1455,7 +1459,7 @@ th.liste_titre_sel, td.liste_titre_sel, th.liste_titre { } tr.liste_titre { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_centerBlock-title2.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title2.jpg',1); ?>); } tr.liste_total { @@ -1519,7 +1523,7 @@ input.liste_titre { tr.liste_total td { border-top: 1px solid #DDDDDD; background: #F0F0F0; -/* background-image: url(<?php echo DOL_URL_ROOT.'/theme/login_background.png' ?>); */ +/* background-image: url(<?php echo dol_buildpath($path.'/theme/login_background.png',1); ?>); */ background-repeat: repeat-x; color: #332266; font-weight: normal; @@ -1582,7 +1586,7 @@ tr.pair td.nohover { tr.box_titre { height: 24px; background: #7699A9; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/trtitle.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1); ?>); background-repeat: repeat-x; color: #FFFFFF; font-family: <?php print $fontlist ?>, sans-serif; @@ -1894,7 +1898,7 @@ li.cal_event { border: none; list-style-type: none; } /* ============================================================================== */ .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 0.9em; } -.ui-autocomplete-loading { background: white url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/working.gif' ?>) right center no-repeat; } +.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1); ?>) right center no-repeat; } /* ============================================================================== */ @@ -1902,12 +1906,12 @@ li.cal_event { border: none; list-style-type: none; } /* ============================================================================== */ .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete { - background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/edit.png',1) ?>) right top no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat; cursor: pointer; } .editkey_datepicker { - background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/calendar.png',1) ?>) right center no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat; cursor: pointer; } @@ -2103,7 +2107,7 @@ span.cke_skin_kama { padding: 0 !important; } a.cke_dialog_ui_button { font-family: <?php print $fontlist ?> !important; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/button_bg.png' ?>) !important; + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>) !important; background-position: bottom !important; border: 1px solid #ACBCBB !important; padding: 0.1em 0.7em !important; @@ -2191,7 +2195,7 @@ div#parameterBox { height: auto; border: 1px solid #666; border-top: 2px solid #842F00; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_connectionBox.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_connectionBox.jpg',1); ?>); background-repeat: no-repeat; background-position: top center; } diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index b669506b4e8e23e2bb4482c33ad78207e19a671c..f5927bf401b3122f5342e83cf85b29b8fece7881 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -1,5 +1,5 @@ <?php -/* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> +/* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2007-2011 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2010-2011 Herve Prot <herve.prot@symeos.com> @@ -60,6 +60,9 @@ $fontsizesmaller=empty($conf->browser->phone)?'11':'11'; $fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; +$path=''; // This value may be used in future for external module to overwrite theme +$theme='cameleo'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } ?> @@ -71,7 +74,7 @@ body { <?php if (GETPOST("optioncss") == 'print') { ?> background-color: #FFFFFF; <?php } else { ?> - /*background: #ffffff url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/headbg2.jpg' ?>) 0 0 no-repeat;*/ + /*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/ <?php } ?> color: #101010; font-size: <?php print $fontsize ?>px; @@ -135,7 +138,7 @@ input.button[type=submit] { .button { font-family: <?php print $fontlist ?>; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/button_bg.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>); background-position: bottom; border: 1px solid #ACBCBB; padding: 0px 2px 0px 2px; @@ -144,7 +147,7 @@ input.button[type=submit] { .button:focus { font-family: <?php print $fontlist ?>; color: #222244; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/button_bg.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>); background-position: bottom; border: 1px solid #ACBCBB; padding: 0px 2px 0px 2px; @@ -153,7 +156,7 @@ input.button[type=submit] { .buttonajax { font-family: <?php print $fontlist ?>; border: 0px; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/button_bg.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>); background-position: bottom; padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; @@ -280,7 +283,7 @@ div.tmenu { font-weight: normal; height: 47px; background: #FFF; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_tmenu.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_tmenu.jpg',1); ?>); background-position: center bottom; border-bottom: 2px solid #A51B00; color: #000; @@ -403,43 +406,43 @@ div.mainmenu { <?php if (empty($conf->browser->phone)) { ?> div.mainmenu.agenda { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/agenda.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1); ?>); } div.mainmenu.cashdesk { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/pointofsale.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1); ?>); } div.mainmenu.accountancy { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/money.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1); ?>); } div.mainmenu.bank { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/bank.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1); ?>); } div.mainmenu.companies { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/company.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1); ?>); } div.mainmenu.commercial { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/commercial.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1); ?>); } div.mainmenu.externalsite { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/externalsite.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/externalsite.png',1); ?>); } div.mainmenu.ftp { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/tools.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>); } div.mainmenu.ecm { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/ecm.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1); ?>); } div.mainmenu.home{ - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/home.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1); ?>); } div.mainmenu.gravatar { @@ -449,28 +452,28 @@ div.mainmenu.geopipmaxmind { } div.mainmenu.members { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/members.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1); ?>); } div.mainmenu.products { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/products.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1); ?>); margin-left: 10px; } div.mainmenu.project { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/project.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1); ?>); } div.mainmenu.tools { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/tools.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>); } div.mainmenu.shop { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/shop.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1); ?>); } div.mainmenu.google { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/globe.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/globe.png',1); ?>); } <?php @@ -511,7 +514,7 @@ foreach($mainmenuusedarray as $val) // Img file not found if (! $url && $generic <= 4) { - $url=DOL_URL_ROOT."/theme/cameleo/img/menus/generic".$generic.".png"; + $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.'.png',1); $generic++; } if ($url) @@ -667,7 +670,7 @@ div.blockvmenupair border-spacing: 0px; padding: 0px; width: 100%; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_leftCategorie2.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie2.jpg',1); ?>); background-position: top right; background-repeat: no-repeat; @@ -679,7 +682,7 @@ div.blockvmenuimpair border-spacing: 0px; padding: 0px; width: 100%; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_leftCategorie2.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie2.jpg',1); ?>); background-position: top right; background-repeat: no-repeat; @@ -732,7 +735,7 @@ div.blockvmenusearch margin: 3px 0px 15px 0px; padding: 25px 0px 2px 2px; width: 200px; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_leftMenu.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftMenu.jpg',1); ?>); background-position: top right; background-repeat: no-repeat; } @@ -768,7 +771,7 @@ div.blockvmenubookmarks border-spacing: 0px; padding: 0px; width: 100%; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_leftCategorie.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie.jpg',1); ?>); background-position: top left; background-repeat: no-repeat; margin-bottom: 15px; @@ -874,7 +877,7 @@ td.photo { /* ============================================================================== */ .toolbar { - background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important; + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$conf->theme.'/img/tmenu2.png',1); ?>) !important; background-repeat: repeat-x !important; border: 1px solid #BBB !important; } @@ -1077,7 +1080,7 @@ div.tabs { text-align: left; vertical-align: bottom; width: 100%; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_tmenu.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_tmenu.jpg',1); ?>); height: 24px; border-bottom: 2px solid #A51B00; background-repeat: repeat-x; @@ -1172,7 +1175,7 @@ div.tabBar { border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; border-top: 1px solid #D8D8D8; - /*background: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/tab_background.png' ?>) repeat-x;*/ + /*background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;*/ background: #FEF4AE; /* old browsers */ } @@ -1213,7 +1216,7 @@ span.tabspan { .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionRefused, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { font-family:"Trebuchet MS",Arial,Helvetica,sans-serif; font-weight: bold; - /*background: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnBlue.jpg' ?>) repeat-x;*/ + /*background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/bg_btnBlue.jpg',1); ?>) repeat-x;*/ background: #A81E00; -moz-border-radius:8px; border-radius:8px; @@ -1277,7 +1280,7 @@ span.butAction, span.butActionDelete { /* #undertopmenu { -background-image: url("<?php echo DOL_URL_ROOT.'/theme/cameleo/img/gradient.gif' ?>"); +background-image: url("<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/gradient.gif',1); ?>"); background-repeat: repeat-x; } */ @@ -1331,7 +1334,7 @@ border-left: 1px solid #000000; /* Main boxes */ table.noborder { - background: #FFF url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_liste_titremenu.jpg' ?>); + background: #FFF url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_liste_titremenu.jpg',1); ?>); background-repeat: repeat-x; background-position: top right; vertical-align: text-top; @@ -1374,7 +1377,7 @@ padding: 0px 0px !important; /* For lists */ table.liste { -background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_liste_titremenu.jpg' ?>); +background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_liste_titremenu.jpg',1); ?>); background-repeat: repeat-x; background-position: top right; vertical-align: text-top; @@ -1424,7 +1427,7 @@ th.liste_titre_sel, td.liste_titre_sel input.liste_titre { background: #FFF; -/*background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_centerBlock-title.jpg' ?>); +/*background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title.jpg',1); ?>); background-repeat: no-repeat; background-position: top right;*/ border: 0px; @@ -1433,7 +1436,7 @@ border: 0px; tr.liste_total td { border-top: 1px solid #DDDDDD; background: #F0F0F0; -/* background-image: url(<?php echo DOL_URL_ROOT.'/theme/login_background.png' ?>); */ +/* background-image: url(<?php echo dol_buildpath($path.'/theme/login_background.png',1); ?>); */ background-repeat: repeat-x; color: #332266; font-weight: normal; @@ -1823,7 +1826,7 @@ li.cal_event { border: none; list-style-type: none; } /* Ajax - Liste deroulante de l'autocompletion */ /* ============================================================================== */ -.ui-autocomplete-loading { background: white url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/working.gif' ?>) right center no-repeat; } +.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1); ?>) right center no-repeat; } .ui-autocomplete { position:absolute; width:auto; @@ -1853,12 +1856,12 @@ li.cal_event { border: none; list-style-type: none; } /* ============================================================================== */ .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete { - background: url(<?php echo dol_buildpath($path.'/theme/cameleo/img/edit.png',1) ?>) right top no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat; cursor: pointer; } .editkey_datepicker { - background: url(<?php echo dol_buildpath($path.'/theme/cameleo/img/calendar.png',1) ?>) right center no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat; cursor: pointer; } @@ -2052,7 +2055,7 @@ span.cke_skin_kama { padding: 0 !important; } a.cke_dialog_ui_button { font-family: <?php print $fontlist ?> !important; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/button_bg.png' ?>) !important; + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>) !important; background-position: bottom !important; border: 1px solid #ACBCBB !important; padding: 0.1em 0.7em !important; @@ -2204,7 +2207,7 @@ div.ecmjqft { /* Core Styles */ .ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png',1); ?>) left top no-repeat; } .ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png',1); ?>) left top no-repeat; } -.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/cameleo/img/working.gif',1); ?>) left top no-repeat; } +.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif',1); ?>) left top no-repeat; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index e42077100c50855039fe68fb6a13246afa2ca52d..784df5bef90f76203781f6b0e57e38d6c0989851 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1,5 +1,5 @@ <?php -/* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> +/* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2007-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com> @@ -59,12 +59,14 @@ $langs->load("main",0,1); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); -$path=''; // This value may be used in future for external module to overwrite theme +$path=''; // This value may be used in future for external module to overwrite theme +$theme='eldy'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } // Define image path files $fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; -$img_head=dol_buildpath($path.'/theme/eldy/img/headbg2.jpg',1); -$img_button=dol_buildpath($path.'/theme/eldy/img/button_bg.png',1); +$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); +$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); // Define reference colors // Example: Light grey: $colred=235;$colgreen=235;$colblue=235; @@ -439,12 +441,12 @@ div.tmenudiv { /* background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%);*/ /* background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/ /* background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */ - background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 50% 0% repeat-x; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0% repeat-x; border-bottom: 1px solid rgb(<?php echo $colorback2; ?>); box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; <?php } else { ?> border-bottom: 1px solid #DDDDDD; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tmenu2.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tmenu2.jpg',1); ?>); background-position:top; background-repeat:repeat-x; <?php } ?> @@ -504,7 +506,7 @@ ul.tmenu { /* t r b l */ margin: 0px 0px 0px 0px; list-style: none; height: <?php print $heightmenu; ?>px; - background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 0 0 repeat-x !important; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 0 0 repeat-x !important; } li.tmenu, li.tmenusel { <?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?> @@ -525,7 +527,7 @@ li.tmenu:hover, li.tmenusel { /* background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%); */ /* background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/ /* background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */ - background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 50% 0 repeat-x; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x; <?php } ?> } div.tmenuleft @@ -533,7 +535,7 @@ div.tmenuleft width: 5px; float: <?php print $left; ?>; height: <?php print $heightmenu+4; ?>px; - background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menutab-r.png' ?>) 0 0 no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 0 no-repeat; margin-top: -4px; } div.tmenucenter @@ -563,54 +565,54 @@ div.mainmenu { <?php if (empty($conf->browser->phone)) { ?> div.mainmenu.home{ - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/home.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1) ?>); background-position-x: middle; } div.mainmenu.accountancy { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/money.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>); } div.mainmenu.agenda { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/agenda.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1) ?>); } div.mainmenu.bank { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/bank.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1) ?>); } div.mainmenu.bookmark { } div.mainmenu.cashdesk { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/pointofsale.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1) ?>); } div.mainmenu.click2dial { } div.mainmenu.companies { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/members.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>); } div.mainmenu.contacts { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/stethoscope.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/stethoscope.png',1) ?>); } div.mainmenu.commercial { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/commercial.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1) ?>); } div.mainmenu.ecm { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/ecm.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1) ?>); } div.mainmenu.externalsite { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/externalsite.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png',1) ?>); } div.mainmenu.ftp { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/tools.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>); } div.mainmenu.gravatar { @@ -620,38 +622,38 @@ div.mainmenu.geopipmaxmind { } div.mainmenu.holiday { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/holiday.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png',1) ?>); } div.mainmenu.members { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/members.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>); } div.mainmenu.paypal { } div.mainmenu.products { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/products.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1) ?>); margin-left: 10px; } div.mainmenu.project { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/project.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1) ?>); } div.mainmenu.tools { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/tools.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>); } div.mainmenu.shop { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/shop.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1) ?>); } div.mainmenu.webservices { } div.mainmenu.google { - background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/globe.png',1) ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/globe.png',1) ?>); } @@ -694,7 +696,7 @@ foreach($mainmenuusedarray as $val) // Img file not found if (! $found) { - $url=dol_buildpath($path.'/theme/eldy/img/menus/generic'.$generic.".png",1); + $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1); $found=1; if ($generic < 4) $generic++; print "/* A mainmenu entry but img file ".$val.".png not found, so we use a generic one */\n"; @@ -868,7 +870,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px); <?php } else { ?> - background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tmenu.jpg' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tmenu.jpg',1); ?>); background-position:top; background-repeat:repeat-x; <?php } ?> @@ -1021,7 +1023,7 @@ td.photo { background-image: -ms-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important; background-image: linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important; <?php } else { ?> - background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.jpg' ?>) !important; + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$conf->theme.'/img/tmenu2.jpg',1); ?>) !important; background-repeat: repeat-x !important; <?php } ?> border: 1px solid #CCC !important; @@ -1276,7 +1278,7 @@ div.tabBar { background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); <?php } else { ?> - background: #dee7ec url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tab_background.png' ?>) repeat-x; + background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x; <?php } ?> -moz-box-shadow: 4px 4px 4px #CCC; -webkit-box-shadow: 4px 4px 4px #CCC; @@ -1441,7 +1443,7 @@ span.butAction, span.butActionDelete { } #undertopmenu { - /* background-image: url("<?php echo dol_buildpath($path.'/theme/eldy/img/gradient.gif',1) ?>"); */ + /* background-image: url("<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/gradient.gif',1) ?>"); */ background-repeat: repeat-x; margin-top: 0px; } @@ -1604,7 +1606,7 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); <?php } else { ?> background: #7699A9; - background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre2.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/liste_titre2.png',1); ?>); <?php } ?> color: #<?php echo $colortextmain; ?>; font-family: <?php print $fontlist ?>; @@ -1741,7 +1743,7 @@ tr.box_titre { background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); <?php } else { ?> - background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre2.png' ?>); + background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/liste_titre2.png',1); ?>); <?php } ?> background-repeat: repeat-x; color: #<?php echo $colortextmain; ?>; @@ -1867,7 +1869,7 @@ border: 0px; .logo_setup { - content:url(<?php echo dol_buildpath($path.'/theme/eldy/img/logo_setup.svg',1) ?>); + content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/logo_setup.svg',1) ?>); } div.titre { @@ -2104,7 +2106,7 @@ li.cal_event { border: none; list-style-type: none; } /* Ajax - Liste deroulante de l'autocompletion */ /* ============================================================================== */ -.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/eldy/img/working.gif',1) ?>) right center no-repeat; } +.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1) ?>) right center no-repeat; } .ui-autocomplete { position:absolute; width:auto; @@ -2134,12 +2136,12 @@ li.cal_event { border: none; list-style-type: none; } /* ============================================================================== */ .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete { - background: url(<?php echo dol_buildpath($path.'/theme/eldy/img/edit.png',1) ?>) right top no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat; cursor: pointer; } .editkey_datepicker { - background: url(<?php echo dol_buildpath($path.'/theme/eldy/img/calendar.png',1) ?>) right center no-repeat; + background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat; cursor: pointer; } @@ -2459,7 +2461,7 @@ div.ecmjqft { /* Core Styles */ .ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png',1); ?>) left top no-repeat; } .ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png',1); ?>) left top no-repeat; } -.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/eldy/img/working.gif',1); ?>) left top no-repeat; } +.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif',1); ?>) left top no-repeat; } /* ============================================================================== */