From 378b6fd3a0124514934b7bce88fac3635159fffc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 Oct 2005 19:32:45 +0000
Subject: [PATCH] Look: Correction du bug IE qui positionne mal les onglets
 dans certains cas.

---
 htdocs/comm/propal/apercu.php   |   6 ++
 htdocs/comm/propal/document.php |   2 +-
 htdocs/comm/propal/info.php     | 101 +++++++++++++++++---------------
 htdocs/commande/info.php        |   5 ++
 htdocs/contrat/contact.php      |   2 +-
 htdocs/contrat/info.php         |   4 ++
 6 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index b08ed5b4875..f28afc399b9 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -299,6 +299,12 @@ elseif (file_exists($fileimagebis))
 
 print '</div>';
 
+
+// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
+print '<div class="tabsAction">';
+print '</div>';
+
+
 $db->close();
 
 llxFooter('$Date$ - $Revision$');
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 66f9f2e934f..8697d5c8c84 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -135,7 +135,7 @@ if ($propalid > 0)
 		print '<form name="userfile" action="document.php?propalid='.$propal->id.'" enctype="multipart/form-data" method="POST">';
 		print '<input type="hidden" name="max_file_size" value="2000000">';
 		print '<input type="file"   name="userfile" size="40" maxlength="80" class="flat"><br>';
-		print '<input type="submit" value="'.$langs->trans('Upload').'" name="sendit" class="button">';
+		print '<input type="submit" value="'.$langs->trans('Upload').'" name="sendit" class="button"> &nbsp; ';
 		print '<input type="submit" value="'.$langs->trans('Cancel').'" name="cancelit" class="button"><br>';
 		print '</form><br>';
 
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index f651f7e00ee..8f58e971c8c 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -30,15 +30,19 @@
 */
 
 require('./pre.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
 
 $langs->load('propal');
 $langs->load('compta');
 
 $user->getrights('propale');
-if (!$user->rights->propale->lire)
+if (! $user->rights->propale->lire)
 	accessforbidden();
 
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if (! $_GET['propalid'])
+{
+	accessforbidden();
+}
 
 
 /*
@@ -48,55 +52,56 @@ require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
 
 llxHeader();
 
-if ($_GET['propalid'])
+$propal = new Propal($db);
+$propal->fetch($_GET['propalid']);
+
+$societe = new Societe($db);
+$societe->fetch($propal->soc_id);
+$h=0;
+
+$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
+$head[$h][1] = $langs->trans('CommercialCard');
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
+$head[$h][1] = $langs->trans('AccountancyCard');
+$h++;
+
+if ($conf->use_preview_tabs)
 {
-	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
-
-	$societe = new Societe($db);
-	$societe->fetch($propal->soc_id);
-	$h=0;
-
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
-	$head[$h][1] = $langs->trans('CommercialCard');
+	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?propalid='.$propal->id;
+	$head[$h][1] = $langs->trans("Preview");
 	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
-	$head[$h][1] = $langs->trans('AccountancyCard');
-	$h++;
-
-	if ($conf->use_preview_tabs)
-	{
-    	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?propalid='.$propal->id;
-    	$head[$h][1] = $langs->trans("Preview");
-    	$h++;
-    }
-    
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
-	$head[$h][1] = $langs->trans('Note');
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
-	$head[$h][1] = $langs->trans('Info');
-	$hselected=$h;
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
-	$head[$h][1] = $langs->trans('Documents');
-	$h++;
-
-	dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
-
-	$propal->info($propal->id);
-
-	print '<table width="100%"><tr><td>';
-	dolibarr_print_object_info($propal);
-	print '</td></tr></table>';
-
-	print '</div>';
- 
-	$db->close();
 }
 
+$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
+$head[$h][1] = $langs->trans('Note');
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
+$head[$h][1] = $langs->trans('Info');
+$hselected=$h;
+$h++;
+
+$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
+$head[$h][1] = $langs->trans('Documents');
+$h++;
+
+dolibarr_fiche_head($head, $hselected, $langs->trans('Proposal').': '.$propal->ref);
+
+$propal->info($propal->id);
+
+print '<table width="100%"><tr><td>';
+dolibarr_print_object_info($propal);
+print '</td></tr></table>';
+
+print '</div>';
+ 
+// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
+print '<div class="tabsAction">';
+print '</div>';
+
+$db->close();
+
 llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index d23533441fc..bc0f492f5ee 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -84,6 +84,11 @@ print '</td></tr></table>';
 
 print '</div>';
 
+// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
+print '<div class="tabsAction">';
+print '</div>';
+
+
 $db->close();
 
 llxFooter('$Date$ - $Revision$');
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 0f0abbfa69a..11e2fce2d1b 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -272,7 +272,7 @@ if ($id > 0)
 			print '<td>'.$langs->trans("Company").'</td>';
 			print '<td>'.$langs->trans("Contacts").'</td>';
 			print '<td>'.$langs->trans("ContactType").'</td>';
-			print '<td colspan="2">&nbsp;</td>';
+			print '<td colspan="3">&nbsp;</td>';
 			print "</tr>\n";
 
 			$var = false;
diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php
index 3540298cc90..8e492a51d03 100644
--- a/htdocs/contrat/info.php
+++ b/htdocs/contrat/info.php
@@ -68,6 +68,10 @@ print '</td></tr></table>';
 
 print '</div>';
 
+// Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent
+print '<div class="tabsAction">';
+print '</div>';
+
 $db->close();
 
 llxFooter('$Date$ - $Revision$');