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

// Fix orders view icons

Browse Source
This commit is contained in:
jBreux
2011-12-16 15:18:01 +00:00
parent 46d99ed264
commit 4a5e769e1b
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/orders/view.tpl
+4 -4
View File
@@ -245,9 +245,9 @@
<td class="right"> <td class="right">
{*if TYPE DOCUMENT = INVOICE *} {*if TYPE DOCUMENT = INVOICE *}
{if $document->getRestPaid()} {if $document->getRestPaid()}
<a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a> <a href="#" class="js-set-payment" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}"><img src="../img/admin/money_add.png" alt="{l s='Set payment form'}" /></a>
{/if} {/if}
<a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;"><img src="../img/admin/comment_edit.png" alt="{l s='Edit note'}" /></a> <a href="#" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"><img src="../img/admin/note.png" alt="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}"{if $document->note eq ''} class="js-disabled-action"{/if} /></a>
{*/if*} {*/if*}
</td> </td>
</tr> </tr>
@@ -258,7 +258,7 @@
<p> <p>
<label for="editNote{$document->id}" class="t">{l s='Note'}</label> <label for="editNote{$document->id}" class="t">{l s='Note'}</label>
<input type="hidden" name="id_order_invoice" value="{$document->id}" /> <input type="hidden" name="id_order_invoice" value="{$document->id}" />
<textarea name="note" rows="10" cols="10" id="editNote{$document->id}" style="width:98%;height:100px;">{$document->note|escape:'htmlall':'UTF-8'}</textarea> <textarea name="note" rows="10" cols="10" id="editNote{$document->id}" class="edit-note">{$document->note|escape:'htmlall':'UTF-8'}</textarea>
</p> </p>
<p class="right"> <p class="right">
<input type="submit" name="submitEditNote" value="{l s='Save'}" class="button" /> <input type="submit" name="submitEditNote" value="{l s='Save'}" class="button" />
@@ -283,7 +283,7 @@
<!-- Payments block --> <!-- Payments block -->
<fieldset style="width: 100%;"> <fieldset style="width: 100%;">
<legend><img src="../img/admin/details.gif" /> {l s='Payment'}</legend> <legend><img src="../img/admin/money.gif" /> {l s='Payment'}</legend>
{if !$order->valid} {if !$order->valid}
<form method="post" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"> <form method="post" action="{$currentIndex}&viewOrder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
css/admin.css
+3 -1
View File
@@ -2017,4 +2017,6 @@ div#scrollTop a:hover{
.category-filter #filternameForm { float:left; margin-left:10px; color:#585A69;} .category-filter #filternameForm { float:left; margin-left:10px; color:#585A69;}
.current-edit { background-color: rgb(232, 237, 194); } .current-edit { background-color: rgb(232, 237, 194); }
.edit-note { width: 98%; height: 100px; }
img/admin/note.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 500 B

js/admin_order.js
+3 -1
View File
@@ -488,7 +488,9 @@ $(document).ready(function() {
$.scrollTo('#formAddPayment', 1000, {offset: -100}); $.scrollTo('#formAddPayment', 1000, {offset: -100});
return false; return false;
}) });
$('img.js-disabled-action').css({"opacity":0.5});
}); });
function addProductRefreshTotal() function addProductRefreshTotal()