From f88e5df23f633535bb399d7bd6a2d7fbae7a6cbc Mon Sep 17 00:00:00 2001
From: vKham <vKham@prestashop.com>
Date: Thu, 8 Dec 2011 16:50:34 +0000
Subject: [PATCH] // fix bug page commande facture

---
 admin-dev/themes/template/invoices/form.tpl   |   2 +-
 controllers/admin/AdminInvoicesController.php |   3 +-
 controllers/admin/AdminShippingController.php |   6 ++--
 css/admin.css                                 |  27 +++++++++++++-----
 img/admin/close.png                           | Bin 612 -> 520 bytes
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/admin-dev/themes/template/invoices/form.tpl b/admin-dev/themes/template/invoices/form.tpl
index 73f2d5942..e50da7b13 100644
--- a/admin-dev/themes/template/invoices/form.tpl
+++ b/admin-dev/themes/template/invoices/form.tpl
@@ -81,5 +81,5 @@
 		{/if}
 {/block}
 
-{block name="other_fieldsets"}<div class="clear">&nbsp;</div>{/block}
+{block name="after"}<div style="clear:both">&nbsp;</div>{/block}
 
diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php
index 8206448b0..5321e9cde 100644
--- a/controllers/admin/AdminInvoicesController.php
+++ b/controllers/admin/AdminInvoicesController.php
@@ -110,7 +110,6 @@ class AdminInvoicesControllerCore extends AdminController
 			'date_to' => date('Y-m-d')
 		);
 
-		$this->tpl_form_vars = array('style' => 'float:left;');
 		$this->table = 'invoice_date';
 		$this->toolbar_title = $this->l('Print PDF invoices');
 		return parent::renderForm();
@@ -163,7 +162,7 @@ class AdminInvoicesControllerCore extends AdminController
 
 		$this->tpl_form_vars = array(
 			'statusStats' => $status_stats,
-			'style' => 'margin-left:400px'
+			'style' => ''
 		);
 
 		$this->table = 'invoice_status';
diff --git a/controllers/admin/AdminShippingController.php b/controllers/admin/AdminShippingController.php
index 892af710b..8ee4193f8 100644
--- a/controllers/admin/AdminShippingController.php
+++ b/controllers/admin/AdminShippingController.php
@@ -64,9 +64,9 @@ class AdminShippingControllerCore extends AdminController
 						'validation' => 'isUnsignedFloat'),
 				),
 				'description' =>
-					'<ul style="font-size:11px;color:#7F7F7F;line-height:20px;margin-left:20px;">
-						<li style="list-style-type: disc;">'.$this->l('If you set these parameters to 0, they will be disabled').'</li>
-						<li style="list-style-type: disc;">'.$this->l('Coupons are not taken into account when calculating free shipping').'</li>
+					'<ul>
+						<li>'.$this->l('If you set these parameters to 0, they will be disabled').'</li>
+						<li>'.$this->l('Coupons are not taken into account when calculating free shipping').'</li>
 					</ul>',
 				'submit' => array()
 			),
diff --git a/css/admin.css b/css/admin.css
index 66537f957..8badab8f4 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -127,6 +127,7 @@ form .simulate-disable-input{
 	color:#666666;
 	font-size:12px;
 }
+
 .block-mail {
 	margin:0 0 20px 0;
 }
@@ -465,7 +466,7 @@ select optgroup option {
 	min-height:32px;
 }
 #content .conf img, #content .warn img, #content .error img {
-	margin:-4px 5px 0 0;
+	margin:0 5px 0 0;
 }
 
 #content .error  {
@@ -504,7 +505,7 @@ select optgroup option {
 	background: #FEEFB3 url(../img/admin/icon-attention.png) no-repeat scroll 6px 6px;
 	border: 1px solid #9e6014;
 	color:#9e6014;
-	padding: 5px 5px 5px 40px;
+	padding: 10px 5px 5px 40px;
 	border-radius:3px;
 	min-height:32px;
 }
@@ -805,17 +806,24 @@ tr.deleted td {
 	margin-top: 4px;
 	margin-bottom: 2px;
 	border: 1px solid #00529B;
-	padding: 5px 5px 5px 40px;
+	padding:15px 5px 15px 40px;
 	color: #00529B;
 	background: #BDE5F8 url(../img/admin/icon-info.png) no-repeat 6px 5px;
 	border-radius:3px;
 	min-height:32px;
 }
-
+.hint p {
+	color: #00529B;
+}
 div.hint {
 	position: relative;
 }
 
+div.hint ul li {
+	color: #00529B;
+	padding-left: 5px;
+}
+
 table tr th .hint {
 	display: none;
 	position: absolute;
@@ -1714,12 +1722,17 @@ fieldset .optionsDescription{
     border: 1px solid #00529B;
     color: #00529B;
     font-family: Arial,Verdana,Helvetica,sans-serif;
-    font-size: 0.85em;
+    font-size: 12px;
     margin-bottom: 15px;
-    padding: 5px 5px 5px 40px;
+    padding: 10px 5px 5px 40px;
 	border-radius:3px;
 	min-height:32px;
-	line-height:32px;
+}
+
+fieldset .optionsDescription ul li {
+    color: #00529B;
+    margin:0;
+    padding:0;
 }
 
 p.preference_description{
diff --git a/img/admin/close.png b/img/admin/close.png
index 2ceb6133f61afa62b09de84c81560079c8c27fbe..2862d09e0dcd9e4dbd81b7bbaee4ef5f642eb69c 100644
GIT binary patch
literal 520
zcmV+j0{8uiP)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUznn^@KRCwBi
zQcX(&Q53!Nq2NMyK{6mBh#~}SgF<klg8qSiKoR6J7zjkAU^cC#`3r)s#I+Q(O#~4{
zcR?b!5D^`}I``s)i=YdK^X|Ln+<9-_RrdQmDT+cItyb#{R0J*n1NZ_yfJ!!-?b0C>
zHZ_|~FV+uO7XdFfVQ}rx)B!5cSh-wotFv>n*}R~5?>G*v*K5*sU4VUo7vb@Eo?twM
zyr9%-wM#7CcDo%d77GdngESlt2_k6_i9~2T9+S`KBUM%T8&@g{cU<I-;c%GJ=`^KM
zDVk2F!kJ8lLZOh<S;u;PwOS?J3ywx3G7N*_@wl+x@2A0FAp4r8xw52+dz|oHV5a$e
zPW5`7X0w?Xm^tTTbDedpXVb(rG4lC51p)zSz|8q_xjZ&aR3vS8Baui5`u#rHwk^zg
zG#aI&#%&!*73aL>!*)6y;=kDI^@JOZ2E}4AF}nkRsLJD(%jH)jH}rqlrBdlu9v8o{
z0Ga?Mp#34<@-*-`{f?0vrfHso9sz!Ee*JIY9eB1Z>(kZ!2rvN6@ARS5=WONx0000<
KMNUMnLSTaA+~WlR

literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006jNkl<ZILl-B
z|NlP&3^z11FolMOG9!y2V~`xWJc7Z%z=#lJU_{|V*o@c=MbWIHBB!OHqhW=lkqOx#
z1yvbyX+<%86azrchANgXE-SoQU03<v+t;%i*;^pm-pMw#tfJ&!NonC*X$4UOn3s?Z
zP$?+Ndp%>;)c;jA75_cG-5X(sI5;_El#~_yojH5j|I+f}AKU^A2m_F9v9LA`%FECG
zHepiV|LR(hA#T++Hdbjs&HpD&nee};q~NcElWhvrU`CWcgb7&Lnup}%W&P^vY5!kb
zTKK=9F!z6VZ^!?_;{5+W%^B!{juA~D+Qi(zKQkxeM|E8V&?S}sbMvzP+t^#B!CZ?P
zV_2ff$<-+(BQy0+Sw#`h&qe>Ub2EY7aj8a*9jws^!p?4vS!wCX|0}9W|EHuS{Ygqm
z_*qd^_CG5p<G;J7Ya=c%fH`iSE@^RzG5-on^8Y6$C;WGIc1Sk2GWSnNjQdeiRtPjO
z@xO<cTMdc<uo%$S*HDXzjry1m47BLD$iFsrHswG?+(67>W@eHc86Ex&7|s6^lH&hc
z*;(1aqY>sGHGMVdh{({B;gMnAEv?OKf#RyXLPAyo0s?kGwz{FAUS3#4=xd;wyXNNR
zTJQixc8;Q=qP(iAf;o^c&dbZI#>&cS0Aw2q2?=QfX-O$5DI+B%8C9&&h#Zg(4h}3p
yK0C<yP|Rj*Y|M&1;~{4Zpm$(lf;H!1kp}=0MEP%a7Qzew0000<MNUMnLSTXiU>lME