From 5f897eb7ee6d45dea72766091faa00ca1a59541d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Oct 2018 00:40:02 +0200 Subject: [PATCH] Clean code --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/takepos/takepos.php | 5 +---- htdocs/theme/eldy/style.css.php | 6 +++--- htdocs/theme/md/style.css.php | 14 +++++++++----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1561f4d5782..b2b8aee122c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4265,7 +4265,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so // Left //if ($picto && $titre) print ''.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).''; print ''; - if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh widthpictotitle" id="pictotitle"', $pictoisfullpath); + if ($picto && $titre) print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath); print '
'.$titre; if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print ' ('.$totalnboflines.')'; print '
'; diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index 098ba39b603..ebd3b6bcd3e 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -36,10 +36,7 @@ $place = GETPOST('place'); if ($place=="") $place="0"; $action = GETPOST('action'); -$langs->load("main"); -$langs->load("bills"); -$langs->load("orders"); -$langs->load("commercial"); +$langs->loadLangs(array("bills","orders","commercial","cashdesk")); /* diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index ec714c4ca8d..1b5508987e5 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -264,7 +264,7 @@ body { trans("DIRECTION").";\n"; ?> } -.thumbstat, a.tab { font-weight: bold !important; } +.thumbstat { font-weight: bold !important; } th a { font-weight: !important; } a.tab { font-weight: bold !important; } @@ -5060,7 +5060,7 @@ dl.dropdown { .dropdown dd ul li { white-space: nowrap; font-weight: normal; - padding: 4px 8px 4px 8px; + padding: 7px 8px 7px 8px; /* color: rgb(); */ color: #000; } @@ -5078,7 +5078,7 @@ dl.dropdown { color: #888; } .dropdown dd ul li a:hover { - background-color:#fff; + background-color:#eee; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index a0714d502fd..1adf763017b 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -100,7 +100,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover; //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0; //var_dump($user->conf->THEME_ELDY_RGB); -$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1); +$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:0); $borderwidth=2; // Case of option always editable @@ -257,7 +257,8 @@ body { trans("DIRECTION").";\n"; ?> } -th a, .thumbstat, a.tab { font-weight: bold !important; } +.thumbstat { font-weight: bold !important; } +th a { font-weight: !important; } a.tab { font-weight: bold !important; } a:link, a:visited, a:hover, a:active { font-family: ; font-weight: normal; color: rgb(); text-decoration: none; } @@ -4895,7 +4896,7 @@ dl.dropdown { box-shadow: 1px 1px 10px #aaa; display:none; right:0px; /* pop is align on right */ - padding: 2px 15px 2px 5px; + padding: 0 0 0 0; position:absolute; top:2px; list-style:none; @@ -4905,9 +4906,12 @@ dl.dropdown { .dropdown dd ul li { white-space: nowrap; font-weight: normal; - padding: 4px; + padding: 7px 8px 7px 8px; color: #000; } +.dropdown dd ul li:hover { + background: #eee; +} .dropdown dd ul li input[type="checkbox"] { margin-right: 3px; } @@ -4919,7 +4923,7 @@ dl.dropdown { color: #888; } .dropdown dd ul li a:hover { - background-color:#fff; + background-color: #eee; }