diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 71d62d20980..9a4fd0a9174 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1614,7 +1614,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser // Project ref if (!empty($allprojectforuser)) { - print ''; + print ''; if (empty($conf->cache['project'][$task_time->fk_projet])) { $tmpproject = new Project($db); $tmpproject->fetch($task_time->fk_projet); @@ -1624,6 +1624,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser } print $tmpproject->getNomUrl(1); print ''; + if (!$i) { + $totalarray['nbfield']++; + } } // Task ref @@ -1849,6 +1852,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser print ''; } + // Project ref + if (!empty($allprojectforuser)) { + if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task + print ''; + print ''; + } + } + // Task ref if (!empty($arrayfields['t.task_ref']['checked'])) { if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task @@ -1977,6 +1988,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser print ''; } + // Project ref + if (!empty($allprojectforuser)) { + if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task + print ''; + print ''; + } + } + // Task ref if (!empty($arrayfields['t.task_ref']['checked'])) { if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) { // Not a dedicated task diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index ce898003fb0..5033e90b858 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1971,8 +1971,8 @@ div.vmenu, td.vmenu { div.fiche { - margin-: dol_optimize_smallscreen) ? '34' : '6')); ?>px; - margin-: dol_optimize_smallscreen) ? '30' : '6')); ?>px; + margin-: dol_optimize_smallscreen) ? '40' : '6')); ?>px; + margin-: dol_optimize_smallscreen) ? '36' : '6')); ?>px;