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

[-] BO : #PSCFV-3086 - Improve visibility of some elements on return details

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16259 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-07-06 12:25:03 +00:00
parent 8e198c6e74
commit 0b6ce64392
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl
+2 -2
View File
@@ -28,12 +28,12 @@
{block name="input"} {block name="input"}
{if $input.type == 'text_customer'} {if $input.type == 'text_customer'}
{$customer->firstname} {$customer->lastname} <span class="normal-text">{$customer->firstname} {$customer->lastname}</span>
<p style="clear: both"> <p style="clear: both">
<a href="{$url_customer}">{l s='View details on customer page'}</a> <a href="{$url_customer}">{l s='View details on customer page'}</a>
</p> </p>
{elseif $input.type == 'text_order'} {elseif $input.type == 'text_order'}
{$text_order} <span class="normal-text">{$text_order}</span>
<p style="clear: both"> <p style="clear: both">
<a href="{$url_order}">{l s='View details on order page'}</a> <a href="{$url_order}">{l s='View details on order page'}</a>
</p> </p>
controllers/admin/AdminReturnController.php
+1 -1
View File
@@ -132,7 +132,7 @@ class AdminReturnControllerCore extends AdminController
$products = OrderReturn::getOrdersReturnProducts($this->object->id, $order); $products = OrderReturn::getOrdersReturnProducts($this->object->id, $order);
// Prepare customer explanation for display // Prepare customer explanation for display
$this->object->question = nl2br($this->object->question); $this->object->question = '<span class="normal-text">'.nl2br($this->object->question).'</span>';
$this->tpl_form_vars = array( $this->tpl_form_vars = array(
'customer' => new Customer($this->object->id_customer), 'customer' => new Customer($this->object->id_customer),
css/admin.css
+6
View File
@@ -199,6 +199,12 @@ background: -moz-linear-gradient(center top , #F9F9F9, #ECECEC) repeat-x scroll
color: #7F7F7F; color: #7F7F7F;
font-size: 0.85em; font-size: 0.85em;
} }
.margin-form .normal-text {
display: block;
padding-top: 0.2em;
font-size: 1.2em;
color: black;
}
fieldset.width1 .margin-form { fieldset.width1 .margin-form {
margin: 0 0 1em 130px; margin: 0 0 1em 130px;