From 2854809ce50d6689968ba61046865b1a62543a75 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 11 Jun 2011 13:50:47 +0000
Subject: [PATCH] fix some display issues, and uniformize code

---
 htdocs/comm/index.php     |  8 ++++----
 htdocs/lib/agenda.lib.php | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 64bec3bfabc..5af7abf8cd7 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -298,12 +298,12 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 
 		$i = 0;
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="6">'.$langs->trans("LastModifiedProposals",$NBMAX).'</td></tr>';
+		print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("LastModifiedProposals",$NBMAX).'</td></tr>';
 		$var=False;
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
-			print "<tr $bc[$var]>";
+			print '<tr '.$bc[$var].'>';
 
 			// Ref
 			print '<td nowrap="nowrap" width="140">';
@@ -580,7 +580,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 			{
 				$obj = $db->fetch_object($result);
 				$var=!$var;
-				print "<tr $bc[$var]>";
+				print '<tr '.$bc[$var].'>';
 
 				// Ref
 				print '<td nowrap="nowrap" width="140">';
@@ -633,4 +633,4 @@ $db->close();
 
 
 llxFooter('$Date$ - $Revision$');
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index 21b7e04ac37..1446b9e138d 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -153,8 +153,8 @@ function show_array_actions_to_do($max=5)
 	    if ($num > 0)
 	    {
 	        print '<table class="noborder" width="100%">';
-	        print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastActionsToDo",$max).'</td>';
-			print '<td colspan="4" align="right"><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=todo">'.$langs->trans("FullList").'</a>';
+	        print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastActionsToDo",$max).'</td>';
+			print '<td colspan="2" align="right"><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=todo">'.$langs->trans("FullList").'</a>';
 			print '</tr>';
 	        $var = true;
 	        $i = 0;
@@ -167,7 +167,7 @@ function show_array_actions_to_do($max=5)
 	            $obj = $db->fetch_object($resql);
 	            $var=!$var;
 
-	            print "<tr $bc[$var]>";
+	            print '<tr '.$bc[$var].'>';
 
 	            $staticaction->type_code=$obj->code;
 	            $staticaction->libelle=$obj->label;
@@ -248,8 +248,8 @@ function show_array_last_actions_done($max=5)
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastDoneTasks",$max).'</td>';
-		print '<td colspan="4" align="right"><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=done">'.$langs->trans("FullList").'</a>';
+		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastDoneTasks",$max).'</td>';
+		print '<td colspan="2" align="right"><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=done">'.$langs->trans("FullList").'</a>';
 		print '</tr>';
 		$var = true;
 		$i = 0;
@@ -262,7 +262,7 @@ function show_array_last_actions_done($max=5)
 			$obj = $db->fetch_object($resql);
 			$var=!$var;
 
-			print "<tr $bc[$var]>";
+			print '<tr '.$bc[$var].'>';
 
 			$staticaction->type_code=$obj->code;
 			$staticaction->libelle=$obj->label;