//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

admin-dev/themes/template/header.tpl

@@ -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>

admin-dev/themes/template/products/accounting.tpl

@@ -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}

admin-dev/themes/template/products/combinations.tpl

@@ -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%">

admin-dev/themes/template/products/features.tpl

@@ -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>

admin-dev/themes/template/products/images.tpl

@@ -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>

admin-dev/themes/template/products/informations.tpl

@@ -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>
 				

admin-dev/themes/template/products/prices.tpl

@@ -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>

admin-dev/themes/template/products/quantities.tpl

@@ -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>

admin-dev/themes/template/products/suppliers.tpl

@@ -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>
 

admin-dev/themes/template/products/warehouses.tpl

@@ -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?"}