//consistency title page product, description, new form search header, new icon images package fatcow toolbar action

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10709 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vKham
2011-11-28 14:45:31 +00:00
parent a3b64f3253
commit 9b5f3b8c03
18 changed files with 63 additions and 99 deletions
+13 -14
View File
@@ -47,17 +47,12 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
#header #header_infos #header_logout a span {color:#fff;}
#header #header_infos #header_foaccess{ text-decoration:none; color:#fff;}
#header #header_infos #header_foaccess a {color:#fff !important;}
#header #header_search{ float:left; margin-top:15px; }
#header #header_search #bo_query{float:left;background: none repeat scroll 0 0 #fff; border-color: #666666 #CCCCCC #CCCCCC;
border-style:solid dotted solid solid;
border-width: 1px; color: #333; font: 13px Arial,sans-serif; padding: 4px 1px 4px 4px; width: 180px;
box-shadow: 0 1px 0 #444444;}
#header #header_search #bo_search_type{float:left; margin:0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;
border-style:solid solid solid none; height:25px;
border-width: 1px;}
#header #header_search #bo_search_submit { border-color: #CCCCCC #BBBBBB; float:left; font-weight:normal; margin:0; padding: 4px 8px 3px; cursor:pointer; text-shadow: 0 1px 0 #fff; border-bottom-left-radius: 0; border-left: 0 none; border-top-left-radius: 0; }
#header #header_search{ float:left; margin-top:15px; position:relative; }
#header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 #fff; border:1px solid #000; border-radius:4px; padding: 5px 25px 5px 4px; width: 180px; box-shadow: 0 1px 0 #666;}
#header #header_search #bo_search_type{ font-size:13px; float:left; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;border-style:solid solid solid none; height:27px; border-width: 1px;}
#header #header_search #bo_search_submit { background: transparent url(icon-search.png) no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0; cursor:pointer; text-indent:-9999em; position:absolute; right:0;}
#header #header_quick{float:right; display:block; margin-top:15px;}
#header #header_quick #quick_select{margin:0; padding:3px 0 4px; vertical-align:middle;width:140px; height:25px;}
#header #header_quick #quick_select{ font-size:13px; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:140px; height:27px;}
#header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
#header #header_shoplist span { float:left; padding:3px;}
#header #header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
@@ -143,6 +138,10 @@ a.module_toggle_all{color: #268CCD;}
.button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
.processing {overflow: auto;}
/*UI ACCORDEON*/
.ui-accordion-header { background-color: #ccc; color:#000;}
/*TABLE STATUS COMMANDE*/
.table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
@@ -152,8 +151,8 @@ a.module_toggle_all{color: #268CCD;}
.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 48px; margin: 0; padding: 0;}
.toolbarBox ul.cc_button {float:right;margin: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-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;;}
.toolbarBox a.toolbar_btn:hover {}
.toolbarBox a.toolbar_btn { border:1px solid #f8f8f8; border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
.toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;}
.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;}
.toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
.toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);}
@@ -186,8 +185,8 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
#productBox { position:relative; width:100%; float:left;}
/*tab-pane*/
form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px; margin-left:140px;}
/*form.defaultForm{ background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px;}*/
form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:350px; padding: 5px 10px 10px; margin-left:140px;}
form#product_form h4 { font-size:18px; font-weight:normal;}
.tab-row {}
.tab-row .tab {background:#EFEFEF;width:100px;}
.tab-row .tab-page.selected {}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

+2 -2
View File
@@ -151,8 +151,7 @@
</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">
<select name="bo_search_type" id="bo_search_type">
<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'}:">
@@ -163,6 +162,7 @@
<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="text" name="bo_query" id="bo_query" value="{$bo_query}" />
<input type="submit" id="bo_search_submit" class="button" value="{l s='Search'}"/>
</form>
</div>
@@ -23,7 +23,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<h4>{l s='Accounting'}</h4>
<div class="separation"></div>
{if !empty($error)}
<div class="hint" style="display:block">{$error}</div>
{else}
@@ -1,6 +1,3 @@
<a href="#" onclick="$('#add_new_combination').slideToggle();return false;">
<img src="../img/admin/add.gif" alt="" />{l s='Add a new combination'}
</a>
<script type="text/javascript">
$(document).ready(function(){
$(\'#id_mvt_reason\').change(function(){
@@ -46,14 +43,12 @@
);
{/foreach}
</script>
<table cellpadding="5">
<tr>
<td colspan="2"><b>{l s='Add or modify combinations for this product'}</b> {l s='or go to'}
<h4>{l s='Add or modify combinations for this product'}</h4> {l s='or go to'}
&nbsp;<a href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}" onclick="return confirm('{l s='Are you sure you want to delete entered product information?'}');"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" />&nbsp;{l s='Product combinations generator'}</a>
</td>
</tr>
</table>
<div class="separation"></div><br />
<div class="separation"></div>
<a href="#" onclick="$('#add_new_combination').slideToggle();return false;">
<img src="../img/admin/add.gif" alt="" />{l s='Add a new combination'}
</a>
<div id="add_new_combination" style="display: none;">
<table cellpadding="5" style="width:100%">
@@ -1,8 +1,8 @@
<table cellpadding="5">
<tr>
<td colspan="2">
<b>{l s='Assign features to this product:'}</b><br />
<ul style="margin: 10px 0 0 20px;">
<h4>{l s='Assign features to this product:'}</h4>
<ul>
<li>{l s='You can specify a value for each relevant feature regarding this product, empty fields will not be displayed.'}</li>
<li>{l s='You can either set a specific value, or select among existing pre-defined values you added previously.'}</li>
</ul>
@@ -1,11 +1,6 @@
<div class="tab-page" id="step2">
<h4 class="tab" >2. {l s='Images'} (<span id="countImage">{$countImages}</span>)</h4>
<table cellpadding="5">
<tr>
<td><b>{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}</b></td>
</tr>
</table>
<div class="separation"></div><br />
<h4>{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}</h4> <div class="separation"></div><br />
<table cellpadding="5" style="width:100%">
<tr>
<td class="col-left"><label>{l s='File:'}</label></td>
@@ -17,7 +12,7 @@
</div>
<div id="progressBarImage" class="progressBarImage"></div>
<div id="showCounter" style="display:none;"><span id="imageUpload">0</span><span id="imageTotal">0</span></div>
<p class="float" style="clear: both;">
<p class="preference_description" style="clear: both;">
{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size / 1000}{l s='Kb max.'}
</p>
</td>
@@ -83,7 +83,7 @@
</script>
<div class="separation"></div>
<br />
<table cellpadding="5" style="width: 50%; float: left; margin-right: 20px; border-right: 1px solid #E0D0B1;">
<table cellpadding="5" style="width: 50%; float: left; margin-right: 20px; border-right: 1px solid #CCCCCC;">
{* global information *}
<tr>
<td class="col-left"><label>{l s='Name:' }</label></td>
@@ -387,7 +387,7 @@ $(document).ready(function(){
</p>
{* [begin] physical product infos *}
<div id="physical_good" class="toggleVirtualPhysicalProduct" {if $product->productDownload->id && $product->productDownload->active}style="display:none"{/if} >
<div class="separation"></div> <table cellpadding="5" style="width: 50%; float: left; margin-right: 20px; border-right: 1px solid #E0D0B1;">
<div class="separation"></div> <table cellpadding="5" style="width: 50%; float: left; margin-right: 20px; border-right: 1px solid #CCCCCC;">
<tr>
<td class="col-left"><label>{l s='Width ( package ) :' }</label></td>
<td style="padding-bottom:5px;">
@@ -432,7 +432,7 @@ $(document).ready(function(){
{* [begin] virtual product *}
<div id="virtual_good" class="toggleVirtualPhysicalProduct" {if !$product->productDownload->id || $product->productDownload->active}style="display:none"{/if} >
<input type="hidden" id="is_virtual" name="is_virtual" value="{$product->is_virtual}" />
<table cellpadding="5" style="width: 50%; float: left; margin-right: 20px; border-right: 1px solid #E0D0B1;">
<table cellpadding="5" style="width: 50%; float: left; margin-right: 20px; border-right: 1px solid #CCCCCC;">
<tr><td>
<br/>{l s='Does this product has an associated file ?'}<br />
<input type="radio" value="1" id="virtual_good_file_1" name="is_virtual_file" {if $product_downloaded}checked="checked"{/if} />{l s='Yes'}
@@ -459,7 +459,7 @@ $(document).ready(function(){
{/if}
<p class="block">
{if !$product->productDownload->checkFile()}
<div style="padding:5px;width:50%;float:left;margin-right:20px;border-right:1px solid #E0D0B1">
<div style="padding:5px;width:50%;float:left;margin-right:20px;border-right:1px solid #CCCCCC">
<p>{l s='Your server\'s maximum upload file size is'}:&nbsp;{$upload_max_filesize}</p>
{if $show_file_input}
<label id="virtual_product_file_label" for="virtual_product_file" class="t">{l s='Upload a file'}</label>
@@ -580,7 +580,7 @@ $(document).ready(function(){
<td class="col-left"><label>{l s='Pre-tax wholesale price:'}</label></td>
<td style="padding-bottom:5px;">
{$currency->prefix}<input size="11" maxlength="14" name="wholesale_price" type="text" value="{$product->wholesale_price}" onchange="this.value = this.value.replace(/,/g, '.');" />{$currency->suffix}
<span style="margin-left:10px">{l s='The wholesale price at which you bought this product'}</span>
<p class="preference_description">{l s='The wholesale price at which you bought this product'}</p>
</td>
</tr>
@@ -588,7 +588,7 @@ $(document).ready(function(){
<td class="col-left"><label>{l s='Pre-tax retail price:'}</label></td>
<td style="padding-bottom:5px;">
{$currency->prefix}<input size="11" maxlength="14" id="priceTE" name="price" type="text" value="{$product->price}" onchange="this.value = this.value.replace(/,/g, '.');" onkeyup="if (isArrowKey(event)) return; calcPriceTI();" />{$currency->suffix}<sup> *</sup>
<span style="margin-left:2px">{l s='The pre-tax retail price to sell this product'}</span>
<p class="preference_description">{l s='The pre-tax retail price to sell this product'}</p>
</td>
</tr>
<tr>
@@ -697,7 +697,7 @@ $(document).ready(function(){
<td class="col-left"><label>{l s='Minimum quantity:'}</label></td>
<td style="padding-bottom:5px;">
<input size="3" maxlength="6" name="minimal_quantity" id="minimal_quantity" type="text" value="{$product->minimal_quantity|default:1}" />
<p>{l s='The minimum quantity to buy this product (set to 1 to disable this feature)'}</p>
<p class="preference_description">{l s='The minimum quantity to buy this product (set to 1 to disable this feature)'}</p>
</td>
</tr>
{/if}
@@ -970,7 +970,7 @@ $(document).ready(function(){
<span class="hint" name="help_box">{l s='Forbidden characters:'} !&lt;;&gt;;?=+#&quot;&deg;{}_$%<span class="hint-pointer">&nbsp;</span></span>
</div>
{/foreach}
<p class="clear">{l s='Tags separated by commas (e.g., dvd, dvd player, hifi)'}</p>
<p class="preference_description">{l s='Tags separated by commas (e.g., dvd, dvd player, hifi)'}</p>
</td>
</tr>
@@ -1,10 +1,14 @@
<script type="text/javascript">
<div class="block_specific_prices_modifications">
<h4>{l s='Current specific prices'}</h4>
<div class="separation"></div>
<script type="text/javascript">
var product_prices = new Array();
{foreach from=$combinations item='combination'}
product_prices['{$combination.id_product_attribute}'] = '{$combination.price}';
{/foreach}
</script>
<a href="#" onclick="$('#add_specific_price').slideToggle();return false;"><img src="../img/admin/add.gif" alt="" />{l s='Add a new specific price'}</a>
<br/>
<div id="add_specific_price" style="display: none;">
<input type="hidden" name="sp_id_shop" value="0" />
<label>{l s='For:'}</label>
@@ -102,9 +106,6 @@ var product_prices = new Array();
<input type="submit" name="submitPriceAddition" value="{l s='Add'}" class="button" />
</div>
</div>
<div class="separation"></div>
<div class="block_specific_prices_modifications">
<h4>{l s='Current specific prices'}</h4>
<table style="text-align: center;width:100%" class="table" cellpadding="0" cellspacing="0">
<thead>
<tr>
@@ -5,15 +5,8 @@
<p>{l s='In this case, the quantities correspond to the quantitites of the real stock in the warehouses associated to the current shop.'}</p>
</div>
<br />
<table cellpadding="5">
<tbody>
<tr>
<td colspan="2">
<b>{l s='Available quantities for sale'}</b>
</td>
</tr>
</tbody>
</table>
<h4>{l s='Available quantities for sale'}</h4>
<div class="separation"></div>
<div class="warn" id="available_quantity_ajax_msg" style="display: none;"></div>
<div class="error" id="available_quantity_ajax_error_msg" style="display: none;"></div>
@@ -36,11 +29,15 @@
</td>
</tr>
<tr>
<td valign="top" style="text-align:center;vertical-align:top;">
<table class="table" cellpadding="0" cellspacing="0" style="width:60%;margin-left:20%;">
<td valign="top" style="text-align:left;vertical-align:top;">
<table class="table" cellpadding="0" cellspacing="0" style="width:50%;">
<colgroup>
<col width="50"></col>
<col></col>
</colgroup>
<thead>
<tr>
<th style="width:200px;">{l s='Quantity'}</th>
<th>{l s='Quantity'}</th>
<th>{l s='Designation'}</th>
</tr>
</thead>
@@ -3,15 +3,7 @@
<p>{l s='It is also possible to specify for each product/product combinations the supplier reference according to previously associated suppliers.'}</p>
</div>
<br />
<table cellpadding="5">
<tbody>
<tr>
<td colspan="2">
<b>{l s='Suppliers of the current product'}</b>
</td>
</tr>
</tbody>
</table>
<h4>{l s='Suppliers of the current product'}</h4>
<div class="separation"></div>
<p>{l s='Please choose the suppliers associated to this product, and the default one.'}</p>
{assign var=confirm value="Are you sure you want to delete entered product information?"}
@@ -21,8 +13,8 @@
<table cellpadding="5" style="width:100%">
<tbody>
<tr>
<td valign="top" style="text-align:center;vertical-align:top;">
<table class="table" cellpadding="0" cellspacing="0" style="width:60%;margin-left:20%;">
<td valign="top" style="text-align:left;vertical-align:top;">
<table class="table" cellpadding="0" cellspacing="0" style="width:50%;">
<thead>
<tr>
<th>{l s='Selected'}</th>
@@ -45,15 +37,7 @@
</tbody>
</table>
<p>&nbsp;</p>
<table cellpadding="5">
<tbody>
<tr>
<td colspan="2">
<b>{l s='Product reference(s)'}</b>
</td>
</tr>
</tbody>
</table>
<h4>{l s='Product reference(s)'}</h4>
<div class="separation"></div>
<p>{l s='You can specify product reference(s) for each supplier associated.'}</p>
@@ -3,16 +3,8 @@
<p>{l s='It is also possible to specify for each product/product combinations its location in each warehouse.'}</p>
</div>
<br />
<table cellpadding="5">
<tbody>
<tr>
<td colspan="2">
<b>{l s='Product location in warehouses'}</b>
</td>
</tr>
</tbody>
</table>
<div class="separation"></div>
<h4>{l s='Product location in warehouses'}</h4>
<div class="separation"></div>
<p>{l s='Please choose the warehouses associated to this product, and the default one.'}</p>
{assign var=confirm value="Are you sure you want to delete entered product information?"}
@@ -2371,7 +2371,7 @@ class AdminProductsControllerCore extends AdminController
$content .= '
<div class="separation"></div>
<h4>'.$this->l('Priorities management').'</h4>
<div class="hint clear" style="display:block;">
<div class="hint" style="display:block;">
'.$this->l('Sometimes one customer could fit in multiple rules, priorities allows you to define which rule to apply.').'
</div>
<br />
@@ -2480,25 +2480,22 @@ class AdminProductsControllerCore extends AdminController
$hasTextLabels = (int)($this->getFieldValue($obj, 'text_fields'));
$content .= '
<table cellpadding="5">
<tr>
<td colspan="2"><b>'.$this->l('Add or modify customizable properties').'</b></td>
</tr>
</table>
<h4>'.$this->l('Add or modify customizable properties').'</h4>
<div class="separation"></div><br />
<table cellpadding="5" style="width:100%">
<tr>
<td style="width:150px;text-align:right;padding-right:10px;font-weight:bold;vertical-align:top;" valign="top">'.$this->l('File fields:').'</td>
<td style="padding-bottom:5px;">
<input type="text" name="uploadable_files" id="uploadable_files" size="4" value="'.((int)($this->getFieldValue($obj, 'uploadable_files')) ? (int)($this->getFieldValue($obj, 'uploadable_files')) : '0').'" />
<p>'.$this->l('Number of upload file fields displayed').'</p>
<p class="preference_description">'.$this->l('Number of upload file fields displayed').'</p>
</td>
</tr>
<tr>
<td style="width:150px;text-align:right;padding-right:10px;font-weight:bold;vertical-align:top;" valign="top">'.$this->l('Text fields:').'</td>
<td style="padding-bottom:5px;">
<input type="text" name="text_fields" id="text_fields" size="4" value="'.((int)($this->getFieldValue($obj, 'text_fields')) ? (int)($this->getFieldValue($obj, 'text_fields')) : '0').'" />
<p>'.$this->l('Number of text fields displayed').'</p>
<p class="preference_description">'.$this->l('Number of text fields displayed').'</p>
</td>
</tr>
<tr>
@@ -2556,6 +2553,8 @@ class AdminProductsControllerCore extends AdminController
$content .= '
'.($obj->id ? '<input type="hidden" name="id_'.$this->table.'" value="'.$obj->id.'" />' : '').'
<h4>'.$this->l('Attachment').'</h4>
<div class="separation"></div>
<fieldset><legend><img src="../img/t/AdminAttachments.gif" />'.$this->l('Attachment').'</legend>
<label>'.$this->l('Filename:').' </label>
<div class="margin-form">';
@@ -2578,7 +2577,7 @@ class AdminProductsControllerCore extends AdminController
<label>'.$this->l('File').'</label>
<div class="margin-form">
<p><input type="file" name="attachment_file" /></p>
<p>'.$this->l('Upload file from your computer').'</p>
<p class="preference_description">'.$this->l('Upload file from your computer').'</p>
</div>
<div class="clear">&nbsp;</div>
<div class="margin-form">
+1
View File
@@ -1721,6 +1721,7 @@ p.preference_description{
clear: both;
text-align: left;
width: 500px;
color:#7F7F7F;
}
.preference_default_multishop{