Fix: Better presentation for add form

Dolibarr · Aug 23, 2015 · 7d2eae2 · 7d2eae2
1 parent 67140dc
commit 7d2eae2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013-2014	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012-2013	Cédric Salvador			<csalvador@gpcsolutions.fr>
- * Copyright (C) 2011-2014	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2011-2015	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2014		Cédric Gross			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
@@ -1785,6 +1785,8 @@
     	print '<input type="hidden" name="action" value="addin">';
 
 	    print load_fiche_titre($langs->trans("Add"),'','');
+
+		dol_fiche_head('');
 
     	$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
     	$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td><td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
@@ -1794,6 +1796,8 @@
     	print '<table width="100%" class="border">';
         print $html;
         print '</table>';
+
+		dol_fiche_end();
 
         print '<div class="center">';
         print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
+ * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -320,6 +321,8 @@
 				print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" method="POST">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="updateprice">';
+
+				dol_fiche_head();
 
 				print '<table class="border" width="100%">';
 
@@ -487,9 +490,11 @@ function on_change() {
 
 				print '</table>';
 
-				print '<br><div class="center">';
+				dol_fiche_end();
+
+				print '<div class="center">';
 				print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-				print '&nbsp; &nbsp;';
+				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 				print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 				print '</div>';
 
@@ -536,6 +541,7 @@ function on_change() {
 				print_liste_field_titre($langs->trans("UnitPriceHT"),$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder);
 				print_liste_field_titre($langs->trans("DiscountQtyMin"));
 				print_liste_field_titre($langs->trans("NbDaysToDelivery"),$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder);
+
 				// Charges ????
 				if ($conf->global->PRODUCT_CHARGES)
 				{

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2014 	    Philippe Grand 		    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014		Ion agorria				<ion@agorria.com>
+ * Copyright (C) 2015		Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -690,7 +691,11 @@
 		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="update_price">';
 		print '<input type="hidden" name="id" value="' . $object->id . '">';
+
+		dol_fiche_head('');
+
 		print '<table class="border" width="100%">';
+		print '<tbody>';
 
 		// VAT
 		print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
@@ -706,7 +711,7 @@
 		print '</td>';
 		print '</tr>';
 
- 		//Only show price mode and expression selector if module is enabled
+ 		// Only show price mode and expression selector if module is enabled
 		if (! empty($conf->dynamicprices->enabled)) {
 			// Price mode selector
 			print '<tr><td>'.$langs->trans("PriceMode").'</td><td>';
@@ -769,9 +774,12 @@ function on_change() {
 		}
 		print '</td></tr>';
 
+		print '</tbody>';
 		print '</table>';
 
-		print '<br><div class="center">';
+		dol_fiche_end();
+
+		print '<div class="center">';
 		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
@@ -787,7 +795,11 @@ function on_change() {
 			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="update_price">';
 			print '<input type="hidden" name="id" value="' . $object->id . '">';
+
+			dol_fiche_head('');
+
 			print '<table class="border" width="100%">';
+			print '<tbody>';
 
 			// VAT
 			if ($i == 1) {
@@ -826,9 +838,14 @@ function on_change() {
 			}
 			print '</td></tr>';
 
-			print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="' . $langs->trans("Save") . '">&nbsp;';
+			print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="' . $langs->trans("Save") . '">&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></td></tr>';
+
+			print '</tbody>';
 			print '</table>';
+
+			dol_fiche_end();
+
 			print '</form>';
 		}
 	}