From 6abfd8b145483ac448fa84c55fbcd31d9da487dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 19 Aug 2019 10:01:42 +0200 Subject: [PATCH] Fix use short labels for workboard --- htdocs/compta/bank/class/account.class.php | 2 +- .../paiement/cheque/class/remisecheque.class.php | 1 + htdocs/index.php | 15 --------------- htdocs/langs/en_US/banks.lang | 2 ++ htdocs/theme/eldy/info-box.inc.php | 8 ++++---- htdocs/theme/md/info-box.inc.php | 2 +- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index da136313393..282a296a5f1 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1224,6 +1224,7 @@ class Account extends CommonObject $response = new WorkboardResponse(); $response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24; $response->label=$langs->trans("TransactionsToConciliate"); + $response->labelShort = $langs->trans("TransactionsToConciliateShort"); $response->url=DOL_URL_ROOT.'/compta/bank/list.php?leftmenu=bank&mainmenu=bank'; $response->img=img_object('', "payment"); @@ -1275,7 +1276,6 @@ class Account extends CommonObject $this->nb["banklines"]=$obj->nb; } $this->db->free($resql); - return 1; } else { diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 26e3f2792d6..316215a5caf 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -527,6 +527,7 @@ class RemiseCheque extends CommonObject $response = new WorkboardResponse(); $response->warning_delay=$conf->bank->cheque->warning_delay/60/60/24; $response->label=$langs->trans("BankChecksToReceipt"); + $response->labelShort=$langs->trans("BankChecksToReceiptShort"); $response->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank'; $response->img=img_object('', "payment"); diff --git a/htdocs/index.php b/htdocs/index.php index 28c26965815..bf99db80d21 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -659,21 +659,6 @@ if ($showweather) $boxwork.=''; $boxwork.=''."\n"; -/*if ($showweather) -{ - $boxwork.=''; - $boxwork.=''; - $text=''; - if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')'; - else $text=$langs->transnoentitiesnoconv("NoItemLate"); - $text.='. '.$langs->transnoentitiesnoconv("LateDesc"); - //$text.=$form->textwithpicto('',$langs->trans("LateDesc")); - $options='height="64px"'; - $boxwork.=showWeather($totallate, $text, $options); - $boxwork.=''; - $boxwork.=''; -}*/ - // Show dashboard $nbworkboardempty=0; $isIntopOpenedDashBoard = array(); diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index c77158e07b7..47295ec7e31 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -73,6 +73,7 @@ BankTransaction=Bank entry ListTransactions=List entries ListTransactionsByCategory=List entries/category TransactionsToConciliate=Entries to reconcile +TransactionsToConciliateShort=To reconcile Conciliable=Can be reconciled Conciliate=Reconcile Conciliation=Reconciliation @@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt? ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt? BankChecks=Bank checks BankChecksToReceipt=Checks awaiting deposit +BankChecksToReceiptShort=Checks awaiting deposit ShowCheckReceipt=Show check deposit receipt NumberOfCheques=No. of check DeleteTransaction=Delete entry diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index 42a296e9a63..c5bd978144c 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -16,7 +16,7 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?> margin-bottom: 15px; } .info-box.info-box-sm{ - min-height: 70px; + min-height: 80px; margin-bottom: 10px; } @@ -63,8 +63,8 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?> background: rgba(0, 0, 0, 0.2); } .info-box-sm .info-box-icon{ - height: 70px; - width: 70px; + height: 80px; + width: 80px; font-size: 25px; line-height: 70px; } @@ -77,7 +77,7 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?> } .info-box-sm .info-box-content{ - margin-left: 70px; + margin-left: 80px; } .info-box-number { display: block; diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php index de431a06310..c58079b9b65 100644 --- a/htdocs/theme/md/info-box.inc.php +++ b/htdocs/theme/md/info-box.inc.php @@ -78,7 +78,7 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?> font-weight: bold; } .info-box-text{ - font-size: 0.92em; + font-size: 12px; } .info-box-text:first-letter{text-transform: uppercase} a.info-box-text{ text-decoration: none;}