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/css/admin.css
+5 -6
View File
@@ -92,14 +92,15 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
/*MENU*/
#header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;}
#header #menu li.maintab{float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
#header #menu li#maintab1 { margin-left:20px;}
#header #menu li:first-child { margin-left:15px;}
#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 6px 4px 0;font-weight:normal;font-size:12px;}
#header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
#header #menu li{_height:32px;_padding-top:3px}
#header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
#header #menu li.active, #header #menu li:hover{background-position:0 -38px;white-space:nowrap;}
#header #menu li.active a{}
#header #menu li:hover, #header #menu li.active {background-color:#49B2FF; }
#header #menu li:hover, #header #menu li.active {background-color:#49B2FF;}
#header #menu li.maintab:hover, #header #menu li.active {border-left:1px solid #49B2FF;border-right:1px solid #49B2FF;}
#header #menu li.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
#header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
#header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 10px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
@@ -169,7 +170,7 @@ a.module_toggle_all{color: #268CCD;}
/*toolbarBox*/
.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
.toolbarBox .pageTitle { margin-left:10px; line-height:48px}
.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0;}
.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;}
.toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;}
.toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
.toolbarBox a.toolbar_btn { border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
@@ -420,6 +421,4 @@ select#show_modules { font-size:12px;}
#footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
#footer .footerLeft { float:left; margin-left:10px;}
#footer .footerRight {float:right; margin-right:10px;}
#footer .footer_link, #footer .footer_link:hover { color:#268CCD;}
#footer .footer_link, #footer .footer_link:hover { color:#268CCD;}
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>
css/admin.css
+4
View File
@@ -511,6 +511,10 @@ select optgroup option {
min-height:32px;
}
#content .warn a {
color:#9e6014;
}
#content .error ol {
clear: both;
margin-top: 5px;