From 2e377112b52ec1961298c30820809c46f21e6b23 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 24 Feb 2020 19:24:38 +0100 Subject: [PATCH] Enhanc top bar of TakePOS (more similar than backoffice) --- htdocs/main.inc.php | 22 +++++++----- htdocs/takepos/css/pos.css.php | 58 ++++++++++++++++++++++++++---- htdocs/takepos/takepos.php | 15 +++++--- htdocs/theme/eldy/dropdown.inc.php | 11 +++--- 4 files changed, 84 insertions(+), 22 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 8c1cdd829de..8765b73a53a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1757,9 +1757,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead /** * Build the tooltip on user login * - * @return string HTML content + * @param int $hideloginname Hide login name. Show only the image. + * @param string $urllogout URL for logout + * @return string HTML content */ -function top_menu_user() +function top_menu_user($hideloginname = 0, $urllogout = '') { global $langs, $conf, $db, $hookmanager, $user; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -1830,9 +1832,10 @@ function top_menu_user() } } - - - $logoutLink = ' '.$langs->trans("Logout").''; + if (empty($urllogout)) { + $urllogout = DOL_URL_ROOT.'/user/logout.php'; + } + $logoutLink = ' '.$langs->trans("Logout").''; $profilLink = ' '.$langs->trans("Card").''; @@ -1857,9 +1860,12 @@ function top_menu_user() $btnUser = '
-
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php index a847b5e6e47..3716c38f16e 100644 --- a/htdocs/takepos/css/pos.css.php +++ b/htdocs/takepos/css/pos.css.php @@ -233,8 +233,10 @@ table.postablelines tr td { padding-top: 3px; padding-bottom: 3px; } + .posinvoiceline td { height: 40px !important; + background-color: var(--colorbacklineimpair1); } div.paymentbordline @@ -268,7 +270,7 @@ div.paymentbordline .row1withhead{ margin: 0 auto; width: 100%; - height: calc(50% - 35px); + height: calc(40% - 50px); padding-top: 5px; } @@ -281,7 +283,7 @@ div.paymentbordline .row2withhead{ margin: 0 auto; width: 100%; - height: 50%; + height: 60%; } .div1{ @@ -401,26 +403,51 @@ div.description_content { .header{ margin: 0 auto; width: 100%; - height: 35px; + height: 50px; background: rgb(60,70,100); } +.topnav-left { + float: left; +} +.topnav-right { + +} + +.topnav div.login_block_other, .topnav div.login_block_user { + max-width: unset; + width: unset; +} .topnav{ background: rgb(); background-image: linear-gradient(-45deg, , rgb()); overflow: hidden; height: 100%; } +.topnav .tmenu { + display: block; +} .topnav a{ float: left; color: #f2f2f2; - padding: 6px 16px; text-decoration: none; +} +.topnav .login_block_other a { + padding: 5px 10px; + margin-left: 4px; + font-size: 1.3em; +} +.topnav-right > a { font-size: 17px; } -.topnav a:hover{ +.topnav-left a { + padding: 7px 4px 7px 4px; + margin: 8px; + margin-left: 4px; +} +.topnav-left a:hover, .topnav .login_block_other a:hover { background-color: #ddd; color: black; } @@ -434,8 +461,9 @@ div.description_content { color: #000; float: left; border-bottom: none !important; - margin-top: 4px; margin-left: 6px; + font-size: 1.3em; + max-width: 250px; } @media screen and (min-width: 892px) { @@ -494,7 +522,19 @@ div.description_content { /* For small screens */ +@media screen and (max-width: 1024px) { + .topnav input[type="text"] { + max-width: 150px; + } +} + @media screen and (max-width: 767px) { + .header { + position: sticky; + top: 0; + z-index: 10; + } + .topnav-right { float: unset; } @@ -511,6 +551,11 @@ div.description_content { width: 25%; } + .row1withhead{ + height: calc(40% - 100px); + } + + div.div1 { padding-bottom: 0; margin-bottom: 10px; @@ -528,6 +573,7 @@ div.description_content { } div.div3 { + margin-top: 8px; height: unset; } diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index bd559c043b4..1cf8e22f1cc 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -660,18 +660,25 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
trans("Terminal")." "; - if ($_SESSION["takeposterminal"] == "") echo "1"; else echo $_SESSION["takeposterminal"]; - echo " - ".dol_print_date(dol_now(), "dayhour"); + if ($_SESSION["takeposterminal"] == "") echo "1"; + else echo $_SESSION["takeposterminal"]; + echo ' - '.dol_print_date(dol_now(), "dayhour").''; ?> trans("Customer"); ?>
+ +
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index 69716ce5be3..d451308884f 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -122,7 +122,7 @@ button.dropdown-item.global-search-item { .tmenu .open.dropdown, .tmenu .open.dropdown { background: rgba(0, 0, 0, 0.1); } -.tmenu .dropdown-menu, .login_block .dropdown-menu { +.tmenu .dropdown-menu, .login_block .dropdown-menu, .topnav .dropdown-menu { position: absolute; right: 2px; : auto; @@ -135,20 +135,23 @@ button.dropdown-item.global-search-item { .user-body { color: #333; } -.side-nav-vert .user-menu .dropdown-menu { +.side-nav-vert .user-menu .dropdown-menu, .topnav .user-menu .dropdown-menu { border-top-right-radius: 0; border-top-left-radius: 0; padding: 1px 0 0 0; border-top-width: 0; width: 300px; } -.side-nav-vert .user-menu .dropdown-menu { +.topnav .user-menu .dropdown-menu { + top: 50px; +} +.side-nav-vert .user-menu .dropdown-menu, .topnav .user-menu .dropdown-menu { margin-top: 0; border-top-left-radius: 0; border-top-right-radius: 0; } -.side-nav-vert .user-menu .dropdown-menu > .user-header { +.side-nav-vert .user-menu .dropdown-menu > .user-header, .topnav .user-menu .dropdown-menu > .user-header { min-height: 100px; padding: 10px; text-align: center;