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

// Tpl cleaning

Browse Source
This commit is contained in:
dMetzger
2012-08-20 08:27:12 +00:00
parent 8cb64b8da3
commit 1925df40fa
18 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
+6 -6
View File
@@ -36,7 +36,7 @@
<h2><img src="../img/admin/vcard.png" />{l s='Customer information'}</h2> <h2><img src="../img/admin/vcard.png" />{l s='Customer information'}</h2>
<span style="font-size: 14px;"> <span style="font-size: 14px;">
{if $customer->id} {if $customer->id}
<a href="{$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></span> <a href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></span>
{l s='#'}{$customer->id}<br /> {l s='#'}{$customer->id}<br />
<a style="text-decoration: underline; color:#268CCD;" href="mailto:{$customer->email}">{$customer->email}</a> <br /><br /> <a style="text-decoration: underline; color:#268CCD;" href="mailto:{$customer->email}">{$customer->email}</a> <br /><br />
{l s='Account registration date:'} {dateFormat date=$customer->date_add}<br /> {l s='Account registration date:'} {dateFormat date=$customer->date_add}<br />
@@ -51,12 +51,12 @@
<h2><img src="../img/admin/cart.gif" /> {l s='Order information'}</h2> <h2><img src="../img/admin/cart.gif" /> {l s='Order information'}</h2>
<span> <span>
{if $order->id} {if $order->id}
<a href="{$link->getAdminLink('AdminOrders')}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></span> <a href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></span>
<br /><br /> <br /><br />
{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br /> {l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
{else} {else}
{l s='No order created from this cart'}</span> {l s='No order created from this cart'}</span>
<p><a class="button" href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with from cart'}</a></p> <p><a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_cart={$cart->id}&addorder">{l s='Create an order with from cart'}</a></p>
{/if} {/if}
</div> </div>
<br style="clear:both;" /> <br style="clear:both;" />
@@ -80,7 +80,7 @@
{if isset($customized_datas[$product.id_product][$product.id_product_attribute])} {if isset($customized_datas[$product.id_product][$product.id_product_attribute])}
<tr> <tr>
<td align="center">{$product.image}</td> <td align="center">{$product.image}</td>
<td><a href="{$link->getAdminLink('AdminProducts')}&id_product={$product.id_product}&updateproduct"> <td><a href="{$link->getAdminLink('AdminProducts')|escape:'htmlall':'UTF-8'}&id_product={$product.id_product}&updateproduct">
<span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br /> <span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br />
{if $product.reference}$this->l('Ref:') {$product.reference}{/if} {if $product.reference}$this->l('Ref:') {$product.reference}{/if}
{if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if} {if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if}
@@ -125,7 +125,7 @@
<tr> <tr>
<td align="center">{$product.image}</td> <td align="center">{$product.image}</td>
<td> <td>
<a href="{$link->getAdminLink('AdminProducts')}&id_product={$product.id_product}&updateproduct"> <a href="{$link->getAdminLink('AdminProducts')|escape:'htmlall':'UTF-8'}&id_product={$product.id_product}&updateproduct">
<span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br /> <span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br />
{if $product.reference}{l s='Ref:'} {$product.reference}{/if} {if $product.reference}{l s='Ref:'} {$product.reference}{/if}
{if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if} {if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if}
@@ -175,7 +175,7 @@
</tr> </tr>
{foreach from=$discounts item='discount'} {foreach from=$discounts item='discount'}
<tr> <tr>
<td><a href="{$link->getAdminLink('AdminDiscounts')}&id_discount={$discount.id_discount}&updatediscount">{$discount.name}</a></td> <td><a href="{$link->getAdminLink('AdminDiscounts')|escape:'htmlall':'UTF-8'}&id_discount={$discount.id_discount}&updatediscount">{$discount.name}</a></td>
<td align="center">- {displayWtPriceWithCurrency price=$discount.value_real currency=$currency}</td> <td align="center">- {displayWtPriceWithCurrency price=$discount.value_real currency=$currency}</td>
</tr> </tr>
{/foreach} {/foreach}
admin-dev/themes/default/template/controllers/orders/_documents.tpl
+3 -3
View File
@@ -60,12 +60,12 @@
<td class="document_number"> <td class="document_number">
{if get_class($document) eq 'OrderInvoice'} {if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)} {if isset($document->is_delivery)}
<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}"> <a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
{else} {else}
<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}"> <a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}">
{/if} {/if}
{elseif get_class($document) eq 'OrderSlip'} {elseif get_class($document) eq 'OrderSlip'}
<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}"> <a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}">
{/if} {/if}
{if get_class($document) eq 'OrderInvoice'} {if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)} {if isset($document->is_delivery)}
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
+2 -2
View File
@@ -27,7 +27,7 @@
{* Generate HTML code for printing Invoice Icon with link *} {* Generate HTML code for printing Invoice Icon with link *}
<span style="width:20px; margin-right:5px;"> <span style="width:20px; margin-right:5px;">
{if ($order_state->invoice || $order->invoice_number)} {if ($order_state->invoice || $order->invoice_number)}
<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateInvoicePDF&id_order={$order->id}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a> <a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
{else} {else}
- -
{/if} {/if}
@@ -36,7 +36,7 @@
{* Generate HTML code for printing Delivery Icon with link *} {* Generate HTML code for printing Delivery Icon with link *}
<span style="width:20px;"> <span style="width:20px;">
{if ($order_state->delivery || $order->delivery_number)} {if ($order_state->delivery || $order->delivery_number)}
<a target="_blank" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateDeliverySlipPDF&id_order={$order->id}"><img src="../img/admin/delivery.gif" alt="delivery" /></a> <a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
{else} {else}
- -
{/if} {/if}
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+1 -1
View File
@@ -58,7 +58,7 @@
<td> <td>
<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span> <span id="shipping_number_show">{if $line.url && $line.tracking_number}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
{if $line.can_edit} {if $line.can_edit}
<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}"> <form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
<span class="shipping_number_edit" style="display:none;"> <span class="shipping_number_edit" style="display:none;">
<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" /> <input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" /> <input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
admin-dev/themes/default/template/controllers/orders/form.tpl
+4 -4
View File
@@ -950,14 +950,14 @@
<div class="margin-form"> <div class="margin-form">
<input type="text" id="customer" value="" /> <input type="text" id="customer" value="" />
<p>{l s='Search a customer by tapping the first letters of his name'}</p> <p>{l s='Search a customer by tapping the first letters of his name'}</p>
<a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')}&addcustomer&liteDisplaying=1&submitFormAjax=1#"> <a class="fancybox button" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
<img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span> <img src="../img/admin/add.gif" title="new"/><span>{l s='Add new customer'}</span>
</a> </a>
</div> </div>
<div id="customers"> <div id="customers">
</div> </div>
</fieldset><br /> </fieldset><br />
<form action="{$link->getAdminLink('AdminOrders')}&submitAdd{$table}=1" method="post" autocomplete="off"> <form action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
<fieldset id="products_part" style="display:none;"><legend><img src="../img/t/AdminCatalog.gif" />{l s='Cart'}</legend> <fieldset id="products_part" style="display:none;"><legend><img src="../img/t/AdminCatalog.gif" />{l s='Cart'}</legend>
<div> <div>
<label>{l s='Search a product:'} </label> <label>{l s='Search a product:'} </label>
@@ -1099,7 +1099,7 @@
<p> <p>
<label>{l s='Search a voucher:'} </label> <label>{l s='Search a voucher:'} </label>
<input type="text" id="voucher" value="" /> <input type="text" id="voucher" value="" />
<a class="fancybox button" href="{$link->getAdminLink('AdminCartRules')}&addcart_rule&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new voucher'}</a> <a class="fancybox button" href="{$link->getAdminLink('AdminCartRules')|escape:'htmlall':'UTF-8'}&addcart_rule&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new voucher'}</a>
</p> </p>
<div class="margin-form"> <div class="margin-form">
<table cellspacing="0" cellpadding="0" class="table" id="voucher_list"> <table cellspacing="0" cellpadding="0" class="table" id="voucher_list">
@@ -1135,7 +1135,7 @@
<div id="address_invoice_detail"> <div id="address_invoice_detail">
</div> </div>
</div> </div>
<a class="fancybox button" id="new_address" href="{$link->getAdminLink('AdminAddresses')}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new address'}</a> <a class="fancybox button" id="new_address" href="{$link->getAdminLink('AdminAddresses')|escape:'htmlall':'UTF-8'}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#"><img src="../img/admin/add.gif" title="new"/>{l s='Add new address'}</a>
</fieldset> </fieldset>
<br /> <br />
<fieldset id="carriers_part" style="display:none;"> <fieldset id="carriers_part" style="display:none;">
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+8 -8
View File
@@ -64,7 +64,7 @@
<div class="bloc-command"> <div class="bloc-command">
<div class="button-command"> <div class="button-command">
{if (count($invoices_collection))} {if (count($invoices_collection))}
<a class="button" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank"> <a class="button" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
<img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'} <img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}
</a> </a>
{else} {else}
@@ -72,7 +72,7 @@
{/if} {/if}
| |
{if (($currentState && $currentState->delivery) || $order->delivery_number)} {if (($currentState && $currentState->delivery) || $order->delivery_number)}
<a class="button" href="{$link->getAdminLink('AdminPdf')}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank"> <a class="button" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
<img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'} <img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}
</a> </a>
{else} {else}
@@ -198,8 +198,8 @@
<div style="width: 49%; float:right;"> <div style="width: 49%; float:right;">
<div class="button-command-prev-next"> <div class="button-command-prev-next">
<b>{l s='Orders'}</b> : <b>{l s='Orders'}</b> :
{if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if} {if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if}
{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if} {if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
@@ -473,7 +473,7 @@
<td> <td>
<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span> <span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
{if $line.can_edit} {if $line.can_edit}
<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}"> <form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
<span class="shipping_number_edit" style="display:none;"> <span class="shipping_number_edit" style="display:none;">
<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" /> <input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" /> <input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
@@ -510,7 +510,7 @@
<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend> <legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
{if $can_edit} {if $can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}"> <form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<div style="margin-bottom:5px;"> <div style="margin-bottom:5px;">
<p> <p>
<select name="id_address"> <select name="id_address">
@@ -540,7 +540,7 @@
<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend> <legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
{if $can_edit} {if $can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}"> <form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<div style="margin-bottom:5px;"> <div style="margin-bottom:5px;">
<p> <p>
<select name="id_address"> <select name="id_address">
@@ -745,7 +745,7 @@
<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}; overflow: auto; width: 400px;"> <div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}; overflow: auto; width: 400px;">
<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer'}</a> <a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer'}</a>
</div> </div>
<a href="{$link->getAdminLink('AdminCustomerThreads')}"><b>{l s='Click here'}</b> {l s='to see all messages'}</a><br> <a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages'}</a><br>
<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}"> <div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')"> <select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option> <option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl
+1 -1
View File
@@ -26,5 +26,5 @@
{* Generate HTML code for printing Invoice Icon with link *} {* Generate HTML code for printing Invoice Icon with link *}
<span style="width:20px; margin-right:5px;"> <span style="width:20px; margin-right:5px;">
<a href="{$link->getAdminLink('AdminPdf')}&submitAction=generateInvoicePDF&id_order_invoice={$id_invoice}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a> <a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$id_invoice}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
</span> </span>
admin-dev/themes/default/template/controllers/products/associations.tpl
+2 -2
View File
@@ -51,7 +51,7 @@
<tr> <tr>
<td></td> <td></td>
<td class="col-right"> <td class="col-right">
<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')}&addcategory"> <a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
<img src="../img/admin/add.gif" alt="{l s='Create new category'}" title="{l s='Create new category'}" /> <img src="../img/admin/add.gif" alt="{l s='Create new category'}" title="{l s='Create new category'}" />
<span>{l s='Create new category'}</span> <span>{l s='Create new category'}</span>
</a> </a>
@@ -110,7 +110,7 @@
{/if} {/if}
<option disabled="disabled">----------</option> <option disabled="disabled">----------</option>
</select>&nbsp;&nbsp;&nbsp; </select>&nbsp;&nbsp;&nbsp;
<a class="button bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')}&addmanufacturer"> <a class="button bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
<img src="../img/admin/add.gif" alt="{l s='Create new manufacturer'}" title="{l s='Create new manufacturer'}" /> <img src="../img/admin/add.gif" alt="{l s='Create new manufacturer'}" title="{l s='Create new manufacturer'}" />
<span>{l s='Create new manufacturer'}</span> <span>{l s='Create new manufacturer'}</span>
</a> </a>
admin-dev/themes/default/template/controllers/products/features.tpl
+2 -2
View File
@@ -72,7 +72,7 @@
{else} {else}
<input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" /> <input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" />
<span>{l s='N/A'} - <span>{l s='N/A'} -
<a href="{$link->getAdminLink('AdminFeatures')}&amp;addfeature_value&id_feature={$available_feature.id_feature}" <a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature_value&id_feature={$available_feature.id_feature}"
class="confirm_leave button"><img src="../img/admin/add.gif" alt="values_first" title="{l s='Add pre-defined values first'}" />&nbsp;{l s='Add pre-defined values first'}</a> class="confirm_leave button"><img src="../img/admin/add.gif" alt="values_first" title="{l s='Add pre-defined values first'}" />&nbsp;{l s='Add pre-defined values first'}</a>
</span> </span>
{/if} {/if}
@@ -94,7 +94,7 @@
</table> </table>
<div class="separation"></div> <div class="separation"></div>
<div> <div>
<a href="{$link->getAdminLink('AdminFeatures')}&amp;addfeature" class="confirm_leave button"> <a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature" class="confirm_leave button">
<img src="../img/admin/add.gif" alt="new_features" title="{l s='Add a new feature'}" />&nbsp;{l s='Add a new feature'} <img src="../img/admin/add.gif" alt="new_features" title="{l s='Add a new feature'}" />&nbsp;{l s='Add a new feature'}
</a> </a>
</div> </div>
admin-dev/themes/default/template/controllers/products/prices.tpl
+2 -2
View File
@@ -166,12 +166,12 @@ $(document).ready(function () {
</option> </option>
{/foreach} {/foreach}
</select> </select>
<a class="button" href="{$link->getAdminLink('AdminTaxRulesGroup')}&addtax_rules_group&id_product={$product->id}" class="confirm_leave"> <a class="button" href="{$link->getAdminLink('AdminTaxRulesGroup')|escape:'htmlall':'UTF-8'}&addtax_rules_group&id_product={$product->id}" class="confirm_leave">
<img src="../img/admin/add.gif" alt="{l s='Create'}" title="{l s='Create'}" /> {l s='Create'} <img src="../img/admin/add.gif" alt="{l s='Create'}" title="{l s='Create'}" /> {l s='Create'}
</a> </a>
</span> </span>
{if $tax_exclude_taxe_option} {if $tax_exclude_taxe_option}
<span style="margin-left:10px; color:red;">{l s='Taxes are currently disabled'}</span> (<b><a href="{$link->getAdminLink('AdminTaxes')}">{l s='Tax options'}</a></b>) <span style="margin-left:10px; color:red;">{l s='Taxes are currently disabled'}</span> (<b><a href="{$link->getAdminLink('AdminTaxes')|escape:'htmlall':'UTF-8'}">{l s='Tax options'}</a></b>)
<input type="hidden" value="{$product->getIdTaxRulesGroup()}" name="id_tax_rules_group" /> <input type="hidden" value="{$product->getIdTaxRulesGroup()}" name="id_tax_rules_group" />
{/if} {/if}
</td> </td>
admin-dev/themes/default/template/controllers/products/suppliers.tpl
+1 -1
View File
@@ -36,7 +36,7 @@
<p>{l s='When using the advanced stock management (see Preferences/Products), the values you fill here (prices, references) will be used in the supply orders.'}</p> <p>{l s='When using the advanced stock management (see Preferences/Products), the values you fill here (prices, references) will be used in the supply orders.'}</p>
</div> </div>
<p>{l s='Please choose the suppliers associated with this product, and the default one.'}</p> <p>{l s='Please choose the suppliers associated with this product, and the default one.'}</p>
<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')}&addsupplier"> <a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')|escape:'htmlall':'UTF-8'}&addsupplier">
<img src="../img/admin/add.gif" alt="{l s='Create new supplier'}" title="{l s='Create new supplier'}" /><span>{l s='Create new supplier'}</span> <img src="../img/admin/add.gif" alt="{l s='Create new supplier'}" title="{l s='Create new supplier'}" /><span>{l s='Create new supplier'}</span>
</a> </a>
<table cellpadding="5" style="width:100%"> <table cellpadding="5" style="width:100%">
admin-dev/themes/default/template/controllers/products/warehouses.tpl
+1 -1
View File
@@ -35,7 +35,7 @@
</div> </div>
<p>{l s='Please choose the warehouses associated with this product, and the default one.'}</p> <p>{l s='Please choose the warehouses associated with this product, and the default one.'}</p>
<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminWarehouses')}&addwarehouse"> <a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminWarehouses')|escape:'htmlall':'UTF-8'}&addwarehouse">
<img src="../img/admin/add.gif" alt="{l s='Create new warehouse'}" title="{l s='Create new warehouse'}" /><span>{l s='Create new warehouse'}</span> <img src="../img/admin/add.gif" alt="{l s='Create new warehouse'}" title="{l s='Create new warehouse'}" /><span>{l s='Create new warehouse'}</span>
</a> </a>
admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl
+1 -1
View File
@@ -31,7 +31,7 @@
{if isset($tr.$key)} {if isset($tr.$key)}
<a href="{$tr.$key}" onmouseover="$(this).css('text-decoration', 'underline')" onmouseout="$(this).css('text-decoration', 'none')" target="_blank">{$tr.$key}</a> <a href="{$tr.$key}" onmouseover="$(this).css('text-decoration', 'underline')" onmouseout="$(this).css('text-decoration', 'none')" target="_blank">{$tr.$key}</a>
{else} {else}
<a href="{$link->getAdminLink('AdminShopUrl')}&id_shop={$tr.$identifier}&addshop_url" class="multishop_warning">{l s='Click here to set an URL for this shop'}</a> <a href="{$link->getAdminLink('AdminShopUrl')|escape:'htmlall':'UTF-8'}&id_shop={$tr.$identifier}&addshop_url" class="multishop_warning">{l s='Click here to set an URL for this shop'}</a>
{/if} {/if}
{else} {else}
{$smarty.block.parent} {$smarty.block.parent}
admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
+1 -1
View File
@@ -68,7 +68,7 @@ $(document).ready(function() {
<img src="../img/admin/pdf.gif" alt="{l s='Supply Order State'}"> <img src="../img/admin/pdf.gif" alt="{l s='Supply Order State'}">
{l s='Print the supply order form'} {l s='Print the supply order form'}
</legend> </legend>
<a href="{$link->getAdminLink('AdminPdf')}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" target="_blank" title="Export as PDF">{l s='Click here to download the supply order form'}.</a> <a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" target="_blank" title="Export as PDF">{l s='Click here to download the supply order form'}.</a>
</fieldset> </fieldset>
{/if} {/if}
admin-dev/themes/default/template/header.tpl
+75 -74
View File
@@ -88,9 +88,7 @@
<link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" /> <link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" />
<![endif]--> <![endif]-->
<style type="text/css"> <style type="text/css">
div#header_infos, div#header_infos a#header_shopname, div#header_infos a#header_logout, div#header_infos a#header_foaccess { div#header_infos, div#header_infos a#header_shopname, div#header_infos a#header_logout, div#header_infos a#header_foaccess {ldelim}color:{$brightness}{rdelim}
color:{$brightness}
}
</style> </style>
</head> </head>
<body style="{if isset($bo_color) && $bo_color}background:{$bo_color};{/if}{if isset($bo_width) && $bo_width > 0}text-align:center;{/if}"> <body style="{if isset($bo_color) && $bo_color}background:{$bo_color};{/if}{if isset($bo_width) && $bo_width > 0}text-align:center;{/if}">
@@ -102,7 +100,7 @@
{* begin HEADER *} {* begin HEADER *}
<div id="header"> <div id="header">
<div id="header_infos"> <div id="header_infos">
<a id="header_shopname" href="{$link->getAdminLink('AdminHome')}"><span>{$shop_name}</span></a><div id="notifs_icon_wrapper"> <a id="header_shopname" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}"><span>{$shop_name}</span></a><div id="notifs_icon_wrapper">
{if {$show_new_orders} == 1} {if {$show_new_orders} == 1}
<div id="orders_notif" class="notifs"> <div id="orders_notif" class="notifs">
<span id="orders_notif_number_wrapper" class="number_wrapper"> <span id="orders_notif_number_wrapper" class="number_wrapper">
@@ -112,7 +110,7 @@
<h3>{l s='Last orders'}</h3> <h3>{l s='Last orders'}</h3>
<p class="no_notifs">{l s='No new orders has been placed on your shop'}</p> <p class="no_notifs">{l s='No new orders has been placed on your shop'}</p>
<ul id="list_orders_notif"></ul> <ul id="list_orders_notif"></ul>
<p><a href="index.php?controller=AdminOrders&token={getAdminToken tab='AdminOrders'}">{l s='Show all orders'}</a></p> <p><a href="index.php?controller=AdminOrders&amp;token={getAdminToken tab='AdminOrders'}">{l s='Show all orders'}</a></p>
</div> </div>
</div> </div>
{/if} {/if}
@@ -125,7 +123,7 @@
<h3>{l s='Last customers'}</h3> <h3>{l s='Last customers'}</h3>
<p class="no_notifs">{l s='No new customers registered on your shop'}</p> <p class="no_notifs">{l s='No new customers registered on your shop'}</p>
<ul id="list_customers_notif"></ul> <ul id="list_customers_notif"></ul>
<p><a href="index.php?controller=AdminCustomers&token={getAdminToken tab='AdminCustomers'}">{l s='Show all customers'}</a></p> <p><a href="index.php?controller=AdminCustomers&amp;token={getAdminToken tab='AdminCustomers'}">{l s='Show all customers'}</a></p>
</div> </div>
</div> </div>
{/if} {/if}
@@ -138,81 +136,84 @@
<h3>{l s='Last messages'}</h3> <h3>{l s='Last messages'}</h3>
<p class="no_notifs">{l s='No new messages posted on your shop'}</p> <p class="no_notifs">{l s='No new messages posted on your shop'}</p>
<ul id="list_customer_messages_notif"></ul> <ul id="list_customer_messages_notif"></ul>
<p><a href="index.php?tab=AdminCustomerThreads&token={getAdminToken tab='AdminCustomerThreads'}">{l s='Show all messages'}</a></p> <p><a href="index.php?tab=AdminCustomerThreads&amp;token={getAdminToken tab='AdminCustomerThreads'}">{l s='Show all messages'}</a></p>
</div> </div>
</div> </div>
{/if} {/if}
</div> </div>
<span id="employee_links"> <div id="employee_links">
<span class="employee_name">{$first_name}&nbsp;{$last_name}</span> <span class="employee_name">{$first_name}&nbsp;{$last_name}</span>
<span class="separator"></span> <span class="separator">&nbsp;</span>
<a class="employee" href="index.php?controller=AdminEmployees&id_employee={$employee->id}&updateemployee&token={getAdminToken tab='AdminEmployees'}" alt="" /> {l s='My preferences'}</a> <a class="employee" href="index.php?controller=AdminEmployees&amp;id_employee={$employee->id}&amp;updateemployee&amp;token={getAdminToken tab='AdminEmployees'}" alt="">{l s='My preferences'}</a>
<span class="separator"></span><a href="index.php?logout" id="header_logout"> <span class="separator">&nbsp;</span>
<span>{l s='logout'}</span> <a href="index.php?logout" id="header_logout">{l s='logout'}</a>
</a> {if {$base_url}}
{if {$base_url}} <span class="separator">&nbsp;</span>
<span class="separator"></span> <a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}"><span>{l s='View my shop'}</span></a> <a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">{l s='View my shop'}</a>
{/if}
</span>
<div id="header_search">
<form method="post" action="index.php?controller=AdminSearch&token={getAdminToken tab='AdminSearch'}">
<input type="text" name="bo_query" id="bo_query" value="{$bo_query}" />
<select name="bo_search_type" id="bo_search_type" class="chosen no-search">
<option value="0">{l s='everywhere'}</option>
<option value="1" {if {$search_type} == 1} selected="selected" {/if}>{l s='catalog'}</option>
<optgroup label="{l s='customers'}:">
<option value="2" {if {$search_type} == 2} selected="selected" {/if}>{l s='by name'}</option>
<option value="6" {if {$search_type} == 6} selected="selected" {/if}>{l s='by ip address'}</option>
</optgroup>
<option value="3" {if {$search_type} == 3} selected="selected" {/if}>{l s='orders'}</option>
<option value="4" {if {$search_type} == 4} selected="selected" {/if}>{l s='invoices'}</option>
<option value="5" {if {$search_type} == 5} selected="selected" {/if}>{l s='carts'}</option>
</select>
<input type="submit" id="bo_search_submit" class="button" value="{l s='Search'}"/>
</form>
</div>
{if count($quick_access) > 0}
<div id="header_quick">
<script type="text/javascript">
function quickSelect(elt)
{
var eltVal = $(elt).val();
if (eltVal == "0") return false;
else if (eltVal.substr(eltVal.length - 6) == '_blank') window.open(eltVal.substr(0, eltVal.length - 6), '_blank');
else location.href = eltVal;
}
</script>
<select onchange="quickSelect(this);" id="quick_select" class="chosen no-search">
<option value="0">{l s='Quick Access'}</option>
{foreach $quick_access as $quick}
<option value="{$quick.link}{if $quick.new_window}_blank{/if}">&raquo; {$quick.name}</option>
{/foreach}
</select>
</div>
{/if} {/if}
{hook h="displayBackOfficeTop"}
</div> </div>
<ul id="menu"> <div id="header_search">
{if !$tab} <form method="post" action="index.php?controller=AdminSearch&amp;token={getAdminToken tab='AdminSearch'}">
<div class="mainsubtablist" style="display:none"> <input type="text" name="bo_query" id="bo_query" value="{$bo_query}" />
</div> <select name="bo_search_type" id="bo_search_type" class="chosen no-search">
{/if} <option value="0">{l s='everywhere'}</option>
{foreach $tabs AS $t} <option value="1" {if {$search_type} == 1} selected="selected" {/if}>{l s='catalog'}</option>
<li class="submenu_size maintab {if $t.current}active{/if}" id="maintab{$t.id_tab}"> <optgroup label="{l s='customers'}:">
<span class="title"> <option value="2" {if {$search_type} == 2} selected="selected" {/if}>{l s='by name'}</option>
<img src="{$t.img}" alt="" />{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if} <option value="6" {if {$search_type} == 6} selected="selected" {/if}>{l s='by ip address'}</option>
</span> </optgroup>
<ul class="submenu"> <option value="3" {if {$search_type} == 3} selected="selected" {/if}>{l s='orders'}</option>
{foreach from=$t.sub_tabs item=t2} <option value="4" {if {$search_type} == 4} selected="selected" {/if}>{l s='invoices'}</option>
<li><a href="{$t2.href}">{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name}{/if}</a></li> <option value="5" {if {$search_type} == 5} selected="selected" {/if}>{l s='carts'}</option>
{/foreach} </select>
</ul> <input type="submit" id="bo_search_submit" class="button" value="{l s='Search'}"/>
</li> </form>
{/foreach} </div>
</ul>
{if count($quick_access) > 0}
<div id="header_quick">
<script type="text/javascript">
function quickSelect(elt)
{
var eltVal = $(elt).val();
if (eltVal == "0")
return false;
else if (eltVal.substr(eltVal.length - 6) == '_blank')
window.open(eltVal.substr(0, eltVal.length - 6), '_blank');
else
location.href = eltVal;
}
</script>
<select onchange="quickSelect(this);" id="quick_select" class="chosen no-search">
<option value="0">{l s='Quick Access'}</option>
{foreach $quick_access as $quick}
<option value="{$quick.link|escape:'htmlall':'UTF-8'}{if $quick.new_window}_blank{/if}">&raquo; {$quick.name}</option>
{/foreach}
</select>
</div>
{/if}
{hook h="displayBackOfficeTop"}
</div> {* end header *} </div> {* end header *}
<ul id="menu">
{if !$tab}
<div class="mainsubtablist" style="display:none">
</div>
{/if}
{foreach $tabs AS $t}
<li class="submenu_size maintab {if $t.current}active{/if}" id="maintab{$t.id_tab}">
<span class="title">
<img src="{$t.img}" alt="" />{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}
</span>
<ul class="submenu">
{foreach from=$t.sub_tabs item=t2}
<li><a href="{$t2.href|escape:'htmlall':'UTF-8'}">{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</a></li>
{/foreach}
</ul>
</li>
{/foreach}
</ul>
{/if} {/if}
<div id="main"> <div id="main">
<div id="content"> <div id="content">
admin-dev/themes/default/template/toolbar.tpl
+3 -3
View File
@@ -38,7 +38,7 @@
{/foreach} {/foreach}
</ul> </ul>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript"><![CDATA[
var submited = false var submited = false
$(function() { $(function() {
//get reference on save link //get reference on save link
@@ -108,7 +108,7 @@
{/block} {/block}
} }
}); });
</script> ]]></script>
{/block} {/block}
<div class="pageTitle"> <div class="pageTitle">
<h3>{block name=pageTitle} <h3>{block name=pageTitle}
@@ -118,7 +118,7 @@
{* Use strip_tags because if the string already has been through htmlentities using escape will break it *} {* Use strip_tags because if the string already has been through htmlentities using escape will break it *}
<span class="breadcrumb item-{$key} ">{$item|strip_tags} <span class="breadcrumb item-{$key} ">{$item|strip_tags}
{if !$smarty.foreach.title.last} {if !$smarty.foreach.title.last}
<img alt="&gt;" style="margin-right:5px" src="../img/admin/separator_breadcrum.png"> <img alt="&gt;" style="margin-right:5px" src="../img/admin/separator_breadcrumb.png" />
{/if} {/if}
</span> </span>
{/foreach} {/foreach}
controllers/admin/AdminRequestSqlController.php
+7 -9
View File
@@ -107,15 +107,13 @@ class AdminRequestSqlControllerCore extends AdminController
$this->displayWarning($this->l('When saving the query, only the request type "SELECT" are allowed.')); $this->displayWarning($this->l('When saving the query, only the request type "SELECT" are allowed.'));
$this->displayInformation(' $this->displayInformation('
<strong>'.$this->l('How to create a new sql query?').'</strong> <strong>'.$this->l('How to create a new sql query?').'</strong><br />
<br /> <ul>
<ul> <li>'.$this->l('Click "Add new".').'</li>
<li>'.$this->l('Click "Add new".').'<br /></li> <li>'.$this->l('Fill in the fields and click "Save".').'</li>
<li>'.$this->l('Fill in the fields and click "Save".').'</li> <li>'.$this->l('You can then view the query results by clicking on the tab:').' <img src="../img/admin/details.gif" /></li>
<li>'.$this->l('You can then view the query results by clicking on the tab:').' <img src="../img/admin/details.gif"></li> <li>'.$this->l('You can then export the query results as CSV file by clicking on the tab:').' <img src="../img/admin/export.gif" /></li>
<li>'.$this->l('You can then export the query results as CSV file by clicking on the tab:').' <img src="../img/admin/export.gif"></li> </ul>');
</ul>
');
$this->addRowAction('export'); $this->addRowAction('export');
$this->addRowAction('view'); $this->addRowAction('view');
img/admin/separator_breadcrum.png → img/admin/separator_breadcrumb.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 260 B