dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix bug page commande facture

Browse Source
This commit is contained in:
vKham
2011-12-08 16:50:34 +00:00
parent 8cb26f81e6
commit f88e5df23f
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/invoices/form.tpl
+1 -1
View File
@@ -81,5 +81,5 @@
{/if} {/if}
{/block} {/block}
{block name="other_fieldsets"}<div class="clear">&nbsp;</div>{/block} {block name="after"}<div style="clear:both">&nbsp;</div>{/block}
controllers/admin/AdminInvoicesController.php
+1 -2
View File
@@ -110,7 +110,6 @@ class AdminInvoicesControllerCore extends AdminController
'date_to' => date('Y-m-d') 'date_to' => date('Y-m-d')
); );
$this->tpl_form_vars = array('style' => 'float:left;');
$this->table = 'invoice_date'; $this->table = 'invoice_date';
$this->toolbar_title = $this->l('Print PDF invoices'); $this->toolbar_title = $this->l('Print PDF invoices');
return parent::renderForm(); return parent::renderForm();
@@ -163,7 +162,7 @@ class AdminInvoicesControllerCore extends AdminController
$this->tpl_form_vars = array( $this->tpl_form_vars = array(
'statusStats' => $status_stats, 'statusStats' => $status_stats,
'style' => 'margin-left:400px' 'style' => ''
); );
$this->table = 'invoice_status'; $this->table = 'invoice_status';
controllers/admin/AdminShippingController.php
+3 -3
View File
@@ -64,9 +64,9 @@ class AdminShippingControllerCore extends AdminController
'validation' => 'isUnsignedFloat'), 'validation' => 'isUnsignedFloat'),
), ),
'description' => 'description' =>
'<ul style="font-size:11px;color:#7F7F7F;line-height:20px;margin-left:20px;"> '<ul>
<li style="list-style-type: disc;">'.$this->l('If you set these parameters to 0, they will be disabled').'</li> <li>'.$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> <li>'.$this->l('Coupons are not taken into account when calculating free shipping').'</li>
</ul>', </ul>',
'submit' => array() 'submit' => array()
), ),
css/admin.css
+20 -7
View File
@@ -127,6 +127,7 @@ form .simulate-disable-input{
color:#666666; color:#666666;
font-size:12px; font-size:12px;
} }
.block-mail { .block-mail {
margin:0 0 20px 0; margin:0 0 20px 0;
} }
@@ -465,7 +466,7 @@ select optgroup option {
min-height:32px; min-height:32px;
} }
#content .conf img, #content .warn img, #content .error img { #content .conf img, #content .warn img, #content .error img {
margin:-4px 5px 0 0; margin:0 5px 0 0;
} }
#content .error { #content .error {
@@ -504,7 +505,7 @@ select optgroup option {
background: #FEEFB3 url(../img/admin/icon-attention.png) no-repeat scroll 6px 6px; background: #FEEFB3 url(../img/admin/icon-attention.png) no-repeat scroll 6px 6px;
border: 1px solid #9e6014; border: 1px solid #9e6014;
color:#9e6014; color:#9e6014;
padding: 5px 5px 5px 40px; padding: 10px 5px 5px 40px;
border-radius:3px; border-radius:3px;
min-height:32px; min-height:32px;
} }
@@ -805,17 +806,24 @@ tr.deleted td {
margin-top: 4px; margin-top: 4px;
margin-bottom: 2px; margin-bottom: 2px;
border: 1px solid #00529B; border: 1px solid #00529B;
padding: 5px 5px 5px 40px; padding:15px 5px 15px 40px;
color: #00529B; color: #00529B;
background: #BDE5F8 url(../img/admin/icon-info.png) no-repeat 6px 5px; background: #BDE5F8 url(../img/admin/icon-info.png) no-repeat 6px 5px;
border-radius:3px; border-radius:3px;
min-height:32px; min-height:32px;
} }
.hint p {
color: #00529B;
}
div.hint { div.hint {
position: relative; position: relative;
} }
div.hint ul li {
color: #00529B;
padding-left: 5px;
}
table tr th .hint { table tr th .hint {
display: none; display: none;
position: absolute; position: absolute;
@@ -1714,12 +1722,17 @@ fieldset .optionsDescription{
border: 1px solid #00529B; border: 1px solid #00529B;
color: #00529B; color: #00529B;
font-family: Arial,Verdana,Helvetica,sans-serif; font-family: Arial,Verdana,Helvetica,sans-serif;
font-size: 0.85em; font-size: 12px;
margin-bottom: 15px; margin-bottom: 15px;
padding: 5px 5px 5px 40px; padding: 10px 5px 5px 40px;
border-radius:3px; border-radius:3px;
min-height:32px; min-height:32px;
line-height:32px; }
fieldset .optionsDescription ul li {
color: #00529B;
margin:0;
padding:0;
} }
p.preference_description{ p.preference_description{
img/admin/close.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 612 B

After

Width:  |  Height:  |  Size: 520 B