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

// fix table manufacturer, change place login preference header, fix menu navigation

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11992 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vKham
2012-01-02 14:05:44 +00:00
parent 1c8d3283a1
commit 30aa671a5d
7 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/header.tpl
+3 -2
View File
@@ -141,9 +141,10 @@
{/if}
</div>
<span id="employee_links">
<span class="employee_name">{$first_name}&nbsp;{$last_name}</span>
<span class="separator"></span>
<a class="employee" href="index.php?controller=AdminEmployees&id_employee={$employee->id}&updateemployee&token={getAdminToken tab='AdminEmployees'}" alt="" /> {l s='My preferences'}</a>
<span class="separator"></span><span class="employee_name">{$first_name}&nbsp;{$last_name}</span>
<span class="separator"></span><a href="index.php?logout" id="header_logout">
<span class="separator"></span><a href="index.php?logout" id="header_logout">
<span>{l s='logout'}</span>
</a>
{if {$base_url}}
admin-dev/themes/default/template/helper/required_fields.tpl
+1 -1
View File
@@ -26,7 +26,7 @@
<br />
<p>
<a href="#" onclick="if ($('.requiredFieldsParameters:visible').length == 0) $('.requiredFieldsParameters').slideDown('slow'); else $('.requiredFieldsParameters').slideUp('slow'); return false;"><img src="../img/admin/duplicate.gif" alt="" /> {l s='Set required fields for this section'}</a>
<a class="button" href="#" onclick="if ($('.requiredFieldsParameters:visible').length == 0) $('.requiredFieldsParameters').slideDown('slow'); else $('.requiredFieldsParameters').slideUp('slow'); return false;"><img src="../img/admin/duplicate.gif" alt="" /> {l s='Set required fields for this section'}</a>
</p>
<fieldset style="display:none" class="width1 requiredFieldsParameters">
<legend>{l s='Required Fields'}</legend>
admin-dev/themes/default/template/manufacturers/view.tpl
+5 -5
View File
@@ -60,7 +60,6 @@
</table><br />
{/foreach}
{/if}
<br /><br />
<h3>{l s='Total products:'} {count($products)}</h3>
{foreach $products AS $product}
@@ -70,9 +69,10 @@
<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="button">{l s='Edit'}</a>
<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
</div>
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:80%;margin-left:10%;">
<br/><br/>
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
<tr>
<th>{$product->name}</th>
<th height="39">{$product->name}</th>
{if !empty($product->reference)}<th width="150">{l s='Ref:'} {$product->reference}</th>{/if}
{if !empty($product->ean13)}<th width="120">{l s='EAN13:'} {$product->ean13}</th>{/if}
{if !empty($product->upc)}<th width="120">{l s='UPC:'} {$product->upc}</th>{/if}
@@ -85,9 +85,9 @@
<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
</div>
<h3><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></h3>
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:80%;margin-left:10%;">
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
<tr>
<th>{l s='Attribute name'}</th>
<th height="39">{l s='Attribute name'}</th>
<th width="80">{l s='Reference'}</th>
<th width="80">{l s='EAN13'}</th>
<th width="80">{l s='UPC'}</th>
admin-dev/themes/default/template/orders/_new_product.tpl
-2
View File
@@ -1,6 +1,4 @@
<<<<<<< .mine
<tr id="new_product" height="52" style="display:none;background-color:#e9f1f6;">
=======
{*
* 2007-2011 PrestaShop
*
admin-dev/themes/default/template/orders/view.tpl
+1 -1
View File
@@ -514,7 +514,7 @@
{/if}
<table style="width: 100%;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
<tr>
<th align="center" style="width: 7%">&nbsp;</th>
<th height="39" align="center" style="width: 7%">&nbsp;</th>
<th>{l s='Product'}</th>
<th style="width: 15%; text-align: center">{l s='UP'} <sup>*</sup></th>
<th style="width: 4%; text-align: center">{l s='Qty'}</th>