From e4c4ef14ef0b1225c93cbdcea67ba8053d5faa86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Dec 2021 23:52:01 +0100
Subject: [PATCH] Fix td balance

---
 htdocs/projet/tasks/time.php     | 21 ++++++++++++++++++++-
 htdocs/theme/eldy/global.inc.php |  4 ++--
 2 files changed, 22 insertions(+), 3 deletions(-)

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 '<td>';
+				print '<td class="nowraponall">';
 				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 '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Task ref
@@ -1849,6 +1852,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 					print '</td>';
 				}
 
+				// Project ref
+				if (!empty($allprojectforuser)) {
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
+						print '<td class="nowrap">';
+						print '</td>';
+					}
+				}
+
 				// 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 '</td>';
 				}
 
+				// Project ref
+				if (!empty($allprojectforuser)) {
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
+						print '<td class="nowrap">';
+						print '</td>';
+					}
+				}
+
 				// 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-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '34' : '6')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '40' : '6')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '36' : '6')); ?>px;
 	<?php if (!empty($dol_hide_leftmenu)) {
 		print 'margin-bottom: 12px;'."\n";
 	} ?>