diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 8aff9c066ae..86ccb548efa 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -834,28 +834,12 @@ while ($currentdaytoshow < $lastdaytoshow) { echo ''; if ($canedit && $mode == 'show_peruser') { - // Filter on hours - print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"'); - print ''.$langs->trans("Hours").''; - print "\n".'
'; - print ''; - if (empty($conf->dol_use_jmobile)) { - print ' - '; - } else { - print '
'; - } - print ''; - if (empty($conf->dol_use_jmobile)) { - print ' '.$langs->trans("H"); - } - print '
'; - - print '
'; - // Filter on days - print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"'); - print ''.$langs->trans("DaysOfWeek").''; - print "\n".'
'; + print ''; + print img_picto('', 'clock', 'class="fawidth30 inline-block marginleftonly"'); + print $langs->trans("DaysOfWeek").''; + print "\n"; + print '
'; print ''; if (empty($conf->dol_use_jmobile)) { print ' - '; @@ -887,7 +871,27 @@ while ($currentdaytoshow < $lastdaytoshow) { echo "\n"; echo ''; - echo ''; + echo ''; + + // Filter on hours + print ''; + print img_picto('', 'clock', 'class="fawidth30 inline-block marginleftonly"'); + print $langs->trans("Hours").''; + print "\n"; + print '
'; + print ''; + if (empty($conf->dol_use_jmobile)) { + print ' - '; + } else { + print '
'; + } + print ''; + if (empty($conf->dol_use_jmobile)) { + print ' '.$langs->trans("H"); + } + print '
'; + + echo ''; $i = 0; while ($i < 7) { if (($i + 1) < $begin_d || ($i + 1) > $end_d) { @@ -997,9 +1001,12 @@ while ($currentdaytoshow < $lastdaytoshow) { //if ($username->login != 'admin') continue; $var = !$var; + echo ""; echo ''; + print ''; print $username->getNomUrl(-1, '', 0, 0, 20, 1, '', 'paddingleft'); + print ''; print ''; $tmpday = $sav; diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index 5810cbd3d2c..1649b5e3682 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -156,7 +156,7 @@ function print_actions_filter( if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"])) { // Status print '
'; - print img_picto($langs->trans("Status"), 'setup', 'class="pictofixedwidth inline-block"'); + print img_picto($langs->trans("Status"), 'status', 'class="pictofixedwidth inline-block"'); $formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100'); print '
'; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index fb1fb168f81..914ab1a879c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4890,7 +4890,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco 'technic', 'ticket', 'error', 'warning', 'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'replacement', 'resource', 'recurring','rss', - 'shapes', 'skill', 'square', 'sort-numeric-down', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice', + 'shapes', 'skill', 'square', 'sort-numeric-down', 'status', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice', 'terminal', 'tick', 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda', 'trip', 'uncheck', 'url', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private', 'conferenceorbooth', 'eventorganization', @@ -4943,8 +4943,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco 'resize' => 'crop', 'supplier_order' => 'dol-order_supplier', 'supplier_proposal' => 'file-signature', 'refresh' => 'redo', 'region' => 'map-marked', 'replacement' => 'exchange-alt', 'resource' => 'laptop-house', 'recurring' => 'history', 'service' => 'concierge-bell', - 'skill' => 'shapes', 'state' => 'map-marked-alt', 'security' => 'key', 'salary' => 'wallet', 'shipment' => 'dolly', 'stock' => 'box-open', 'stats' => 'chart-bar', 'split' => 'code-branch', 'stripe' => 'stripe-s', - 'supplier' => 'building', + 'skill' => 'shapes', 'state' => 'map-marked-alt', 'security' => 'key', 'salary' => 'wallet', 'shipment' => 'dolly', 'stock' => 'box-open', 'stats' => 'chart-bar', 'split' => 'code-branch', + 'status' => 'stop-circle', + 'stripe' => 'stripe-s', 'supplier' => 'building', 'technic' => 'cogs', 'tick' => 'check', 'timespent' => 'clock', 'title_setup' => 'tools', 'title_accountancy' => 'money-check-alt', 'title_bank' => 'university', 'title_hrm' => 'umbrella-beach', 'title_agenda' => 'calendar-alt', 'uncheck' => 'times', 'uparrow' => 'share', 'url' => 'external-link-alt', 'vat' => 'money-check-alt', 'vcard' => 'arrow-alt-circle-down', diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php index 28b73a5a2e0..4b7c6838845 100644 --- a/htdocs/takepos/css/pos.css.php +++ b/htdocs/takepos/css/pos.css.php @@ -450,10 +450,8 @@ div.paymentbordline padding-right: 8px; } - tr.selected, tr.selected td { - /* font-weight: bold; */ - background-color: rgb(240,230,210) !important; + background-color: var(--colorbacklinepairchecked) !important; } .order td { color: green; @@ -597,6 +595,12 @@ div.description_content { border-radius: 5px; } + +.login_block_other.takepos { + margin-top: 5px; +} + + div#moreinfo, div#infowarehouse { color: #aaa; padding: 0 8px 0 8px; diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index 808937797a4..4a939a058f5 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -1175,7 +1175,7 @@ if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) { $reshook = $hookmanager->executeHooks('takepos_login_block_other'); if ($reshook == 0) { //Search method ?> -