From d35e374584e5380af6fa58d609e5dee9a3750f21 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Aug 2020 19:32:52 +0200 Subject: [PATCH] css --- SECURITY.md | 2 +- htdocs/projet/tasks/time.php | 6 +++--- htdocs/theme/eldy/global.inc.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 122843f64fe..1189b6abe06 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -32,7 +32,7 @@ If you try to find bug on Dolibarr, we recommend to append to your user-agent he ### Account access -You can install the web application yourself on your on platform so you get full access. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download +You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download ## Eligibility and Responsible Disclosure diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 8c0c38cc0d9..26927e8977d 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1203,7 +1203,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) if (!empty($arrayfields['t.task_label']['checked'])) print ''; } // Author - if (!empty($arrayfields['author']['checked'])) print ''.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200').''; + if (!empty($arrayfields['author']['checked'])) print ''.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth150').''; // Note if (!empty($arrayfields['t.note']['checked'])) print ''; // Duration @@ -1390,7 +1390,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) if (!empty($arrayfields['value']['checked'])) { print ''; - $value = price2num($task_time->thm * $task_time->task_duration / 3600); + $value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT'); print price($value, 1, $langs, 1, -1, -1, $conf->currency); print ''; if (!$i) $totalarray['nbfield']++; @@ -1524,7 +1524,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) { if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) // Not a dedicated task { - print ''; + print ''; print $task_time->label; print ''; } diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index db5add4f9c8..6230408b1b9 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -2719,7 +2719,7 @@ li.expanded > a.fmdirlia.jqft.ecmjqft { /* ============================================================================== */ div.tabs { text-align: ; - padding-top: 10px; + margin-top: 10px; padding-left: 6px; padding-right: 6px; clear:both; @@ -4074,7 +4074,7 @@ div.titre { text-decoration: none; padding-top: 5px; padding-bottom: 5px; - text-transform: capitalize; + /* text-transform: capitalize; */ } div.fiche > table.table-fiche-title:first-of-type div { color: var(--colortexttitlenotab);