diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e3059ade21e..d08522bfaa4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3262,24 +3262,24 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ // Add CSS $arrayconvpictotomorcess = array( - 'action'=>'bg-infobox-action', 'account'=>'bg-infobox-bank_account', 'accountancy'=>'bg-infobox-bank_account', + 'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account', 'bank_account'=>'bg-infobox-bank_account', - 'bill'=>'bg-infobox-commande', 'billa'=>'bg-infobox-commande', 'billd'=>'bg-infobox-commande', - 'cash-register'=>'bg-infobox-bank_account', 'contract'=>'bg-infobox-contrat', 'check'=>'font-status4', 'conversation'=>'bg-infobox-contrat', - 'donation'=>'bg-infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'bg-infobox-action', - 'hrm'=>'bg-infobox-adherent', 'group'=>'bg-infobox-adherent', 'intervention'=>'bg-infobox-contrat', - 'multicurrency'=>'bg-infobox-bank_account', - 'members'=>'bg-infobox-adherent', 'member'=>'bg-infobox-adherent', 'money-bill-alt'=>'bg-infobox-bank_account', - 'order'=>'bg-infobox-commande', - 'user'=>'bg-infobox-adherent', 'users'=>'bg-infobox-adherent', + 'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billd'=>'infobox-commande', + 'cash-register'=>'infobox-bank_account', 'contract'=>'infobox-contrat', 'check'=>'font-status4', 'conversation'=>'infobox-contrat', + 'donation'=>'infobox-commande', 'dollyrevert'=>'flip', 'ecm'=>'infobox-action', + 'hrm'=>'infobox-adherent', 'group'=>'infobox-adherent', 'intervention'=>'infobox-contrat', + 'multicurrency'=>'infobox-bank_account', + 'members'=>'infobox-adherent', 'member'=>'infobox-adherent', 'money-bill-alt'=>'infobox-bank_account', + 'order'=>'infobox-commande', + 'user'=>'infobox-adherent', 'users'=>'infobox-adherent', 'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4', - 'holiday'=>'bg-infobox-holiday', 'invoice'=>'bg-infobox-commande', - 'payment'=>'bg-infobox-bank_account', 'poll'=>'bg-infobox-adherent', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal', - 'resource'=>'bg-infobox-action', - 'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_invoicea'=>'bg-infobox-order_supplier', 'supplier_invoiced'=>'bg-infobox-order_supplier', - 'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal', - 'ticket'=>'bg-infobox-contrat', 'title_accountancy'=>'bg-infobox-bank_account', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action', - //'title_setup'=>'bg-infobox-action', 'tools'=>'bg-infobox-action', + 'holiday'=>'infobox-holiday', 'invoice'=>'infobox-commande', + 'payment'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal', + 'resource'=>'infobox-action', + 'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier', + 'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal', + 'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action', + //'title_setup'=>'infobox-action', 'tools'=>'infobox-action', 'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode' ); if (!empty($arrayconvpictotomorcess[$pictowithouttext])) { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 98d00a98404..490641ca9fa 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1262,7 +1262,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr if (GETPOSTISSET('dol_optimize_smallscreen')) { $themeparam .= '&dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); } if (GETPOSTISSET('dol_no_mouse_hover')) { $themeparam .= '&dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); } if (GETPOSTISSET('dol_use_jmobile')) { $themeparam .= '&dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); } - if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) { $themeparam .= '&THEME_AGRESSIVENESS_RATIO='.GETPOST('THEME_AGRESSIVENESS_RATIO', 'int'); } + if (GETPOSTISSET('THEME_SATURATE_RATIO')) { $themeparam .= '&THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); } if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) { diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index 2b734f037b3..a0f54591534 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -198,12 +198,10 @@ a.info-box-text{ text-decoration: none;} include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $prefix = ''; -//$prefix = 'background-'; if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-'; -if (!isset($conf->global->THEME_AGRESSIVENESS_RATIO) && $prefix) $conf->global->THEME_AGRESSIVENESS_RATIO = -50; -if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENESS_RATIO = GETPOST('THEME_AGRESSIVENESS_RATIO', 'int'); -//var_dump($conf->global->THEME_AGRESSIVENESS_RATIO); +if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7; +if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); ?> .info-box-icon { @@ -211,38 +209,76 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES color: #fff !important; opacity: 0.95; + global->THEME_SATURATE_RATIO)) { ?> + filter: saturate(global->THEME_SATURATE_RATIO; ?>); + } .bg-infobox-project{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #6c6aa8 !important; } .bg-infobox-action{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #a47080 !important; } .bg-infobox-propal, .bg-infobox-facture, .bg-infobox-commande{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #99a17d !important; } .bg-infobox-supplier_proposal, .bg-infobox-invoice_supplier, .bg-infobox-order_supplier{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #599caf !important; } .bg-infobox-contrat, .bg-infobox-ticket{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #46a676 !important; } .bg-infobox-bank_account{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #b0a53e !important; } .bg-infobox-adherent, .bg-infobox-member { - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #79633f !important; } .bg-infobox-expensereport{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #79633f !important; } .bg-infobox-holiday{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #755114 !important; +} + +.infobox-adherent, .infobox-member { + color: #79633f !important; +} +.infobox-project{ + color: #6c6aa8 !important; +} +.infobox-action{ + color: #a47080 !important; +} +.infobox-propal, +.infobox-facture, +.infobox-commande{ + color: #99a17d !important; +} +.infobox-supplier_proposal, +.infobox-invoice_supplier, +.infobox-order_supplier{ + color: #599caf !important; +} +.infobox-contrat, .infobox-ticket{ + color: #46a676 !important; +} +.infobox-bank_account{ + color: #b0a53e !important; +} +.infobox-adherent, .infobox-member { + color: #79633f !important; +} +.infobox-expensereport{ + color: #79633f !important; +} +.infobox-holiday{ + color: #755114 !important; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 927d29e1919..526846f8a19 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -237,7 +237,7 @@ print 'fontsizesmaller='.$fontsizesmaller."\n"; print 'topMenuFontSize='.$topMenuFontSize."\n"; print 'toolTipBgColor='.$toolTipBgColor."\n"; print 'toolTipFontColor='.$toolTipFontColor."\n"; -print 'conf->global->THEME_AGRESSIVENESS_RATIO='.$conf->global->THEME_AGRESSIVENESS_RATIO." (must be between -100 and +100)\n"; +print 'conf->global->THEME_SATURATE_RATIO='.$conf->global->THEME_SATURATE_RATIO." (must be between 0 and 1)\n"; print '*/'."\n"; diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php index f2a2a8b810d..6a313ace567 100644 --- a/htdocs/theme/md/info-box.inc.php +++ b/htdocs/theme/md/info-box.inc.php @@ -8,42 +8,85 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $prefix = ''; -//$prefix = 'background-'; if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-'; + +$prefix = ''; +if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-'; + +if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.5; +if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); + ?> .bg-infobox-project{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #6c6aa8 !important; } .bg-infobox-action{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #a47080 !important; } .bg-infobox-propal, .bg-infobox-facture, .bg-infobox-commande{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #99a17d !important; } .bg-infobox-supplier_proposal, .bg-infobox-invoice_supplier, .bg-infobox-order_supplier{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #599caf !important; } .bg-infobox-contrat, .bg-infobox-ticket{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #46a676 !important; } .bg-infobox-bank_account{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #b0a53e !important; } .bg-infobox-adherent, .bg-infobox-member{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #79633f !important; } .bg-infobox-expensereport{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #79633f !important; } .bg-infobox-holiday{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #755114 !important; } + +.infobox-adherent, .infobox-member { + color: #79633f !important; +} +.infobox-project{ + color: #6c6aa8 !important; +} +.infobox-action{ + color: #a47080 !important; +} +.infobox-propal, +.infobox-facture, +.infobox-commande{ + color: #99a17d !important; +} +.infobox-supplier_proposal, +.infobox-invoice_supplier, +.infobox-order_supplier{ + color: #599caf !important; +} +.infobox-contrat, .infobox-ticket{ + color: #46a676 !important; +} +.infobox-bank_account{ + color: #b0a53e !important; +} +.infobox-adherent, .infobox-member { + color: #79633f !important; +} +.infobox-expensereport{ + color: #79633f !important; +} +.infobox-holiday{ + color: #755114 !important; +} + + .info-box-module-external span.info-box-icon-version { background: #bbb; } @@ -102,6 +145,9 @@ if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'backgro font-size: 45px; line-height: 90px; background: #eee; + global->THEME_SATURATE_RATIO)) { ?> + filter: saturate(global->THEME_SATURATE_RATIO; ?>); + } .info-box-sm .info-box-icon { width: 80px; @@ -233,39 +279,39 @@ a.info-box-text{ text-decoration: none;} } global->THEME_AGRESSIVENESS_RATIO)) $conf->global->THEME_AGRESSIVENESS_RATIO = -100; -if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENESS_RATIO = GETPOST('THEME_AGRESSIVENESS_RATIO', 'int'); +if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7; +if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); ?> .bg-infobox-project i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #605ca8 !important; } .bg-infobox-action i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #d84b80 !important; } .bg-infobox-propal i.fa, .bg-infobox-facture i.fa, .bg-infobox-commande i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #abb87b !important; } .bg-infobox-supplier_proposal i.fa, .bg-infobox-invoice_supplier i.fa, .bg-infobox-order_supplier i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #40b0cf !important; } .bg-infobox-contrat i.fa, .bg-infobox-ticket i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #20a68a !important; } .bg-infobox-bank_account i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #b0a53e !important; } .bg-infobox-adherent i.fa, .bg-infobox-member i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #755114 !important; } .bg-infobox-expensereport i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #755114 !important; } .bg-infobox-holiday i.fa{ - color: global->THEME_AGRESSIVENESS_RATIO); ?> !important; + color: #755114 !important; }