From dfa2d60d96df516c2e934b804ae4b27062f4c96b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 29 Sep 2005 19:30:59 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Pb=20balises=20mal=20ferm=E9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/contrat/fiche.php | 14 ++++++++------
 htdocs/main.inc.php      | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 4a3bbb81f48..bcb01624007 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -808,14 +808,16 @@ else
 
             print "<tr $bc[$var]>";
             print '<td colspan="3">';
-            $html->select_produits('','p_idprod','',0).'<br>';
-            print '<textarea name="desc" cols="50" rows="1"></textarea>';
+            $html->select_produits('','p_idprod','',0);
+            print '<br>';
+            print '<textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea>';
             print '</td>';
 
             print '<td align="center"><input type="text" class="flat" size="2" name="pqty" value="1"></td>';
             print '<td align="right" nowrap><input type="text" class="flat" size="1" name="premise" value="0">%</td>';
-            print '<td align="center" colspan="3" rowspan="2"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-
+            print '<td align="center" colspan="2" rowspan="2"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+            print '</tr>'."\n";
+            
             print "<tr $bc[$var]>";
             print '<td colspan="8">';
             print $langs->trans("DateStartPlanned").' ';
@@ -836,7 +838,7 @@ else
             print '<input type="hidden" name="id" value="'.$id.'">';
 
             print "<tr $bc[$var]>";
-            print '<td><textarea name="desc" cols="50" rows="1"></textarea></td>';
+            print '<td><textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea></td>';
 
             print '<td>';
             $html->select_tva("tva_tx",$conf->defaulttx);
@@ -844,7 +846,7 @@ else
             print '<td align="right"><input type="text" class="flat" size="4" name="pu" value=""></td>';
             print '<td align="center"><input type="text" class="flat" size="2" name="pqty" value="1"></td>';
             print '<td align="right" nowrap><input type="text" class="flat" size="1" name="premise" value="0">%</td>';
-            print '<td align="center" colspan="2" rowspan="2"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+            print '<td align="center" rowspan="2" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
 
             print '</tr>'."\n";
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d4eb5cecc49..7215acba5e7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -31,6 +31,7 @@
 
 require("master.inc.php");
 
+
 // Verification du login.
 // Cette verification est faite pour chaque accès. Après l'authentification,
 // l'objet $user est initialisée. Notament $user->id, $user->login et $user->nom, $user->prenom
@@ -177,6 +178,20 @@ if (defined("MAIN_NOT_INSTALLED"))
   Header("Location: ".DOL_URL_ROOT."/install/index.php");
 }
 
+// Constantes utilisées pour définir le nombre de lignes des textarea
+if (! eregi("firefox",$_SERVER["HTTP_USER_AGENT"]))
+{
+    define('ROWS_1',1);
+    define('ROWS_2',2);
+    define('ROWS_3',3);
+}
+else
+{
+    define('ROWS_1',0);
+    define('ROWS_2',1);
+    define('ROWS_3',2);
+}
+
 
 
 /**