From bf78a0a677376943b80ea64d3bbb0f463ef4df50 Mon Sep 17 00:00:00 2001
From: vKham <vKham@prestashop.com>
Date: Wed, 1 Feb 2012 15:50:40 +0000
Subject: [PATCH] // change layout carts_rules and uniform stylesheet
 description

---
 .../controllers/cart_rules/conditions.tpl     | 10 +++----
 .../controllers/cart_rules/informations.tpl   | 26 +++++++++----------
 css/admin.css                                 |  3 ++-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
index cfa3cbec2..0254426ee 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -2,7 +2,7 @@
 <div class="margin-form">
 	<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
 	<input type="text" id="customerFilter" name="customerFilter" value="{$customerFilter}" style="width:400px" />
-	<p>{l s='Optional, the cart rule will be available for everyone if you leave this field blank.'}</p>
+	<p class="preference_description">{l s='Optional, the cart rule will be available for everyone if you leave this field blank.'}</p>
 </div>
 <label>{l s='Validity'}</label>
 <div class="margin-form">
@@ -10,7 +10,7 @@
 	<input type="text" class="datepicker" name="date_from" value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')}{else}{$defaultDateFrom}{/if}" />
 	<strong>{l s='to'}</strong>
 	<input type="text" class="datepicker" name="date_to" value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')}{else}{$defaultDateTo}{/if}" />
-	<p>{l s='Default period is one year.'}</p>
+	<p class="preference_description">{l s='Default period is one year.'}</p>
 </div>
 <label>{l s='Minimum amount'}</label>
 <div class="margin-form">
@@ -28,17 +28,17 @@
 		<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
 		<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
 	</select>
-	<p>{l s='You can choose a minimum amount for the cart either with or without the taxes, with or without shipping.'}</p>
+	<p class="preference_description">{l s='You can choose a minimum amount for the cart either with or without the taxes, with or without shipping.'}</p>
 </div>
 <label>{l s='Total available'}</label>
 <div class="margin-form">
 	<input type="text" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
-	<p>{l s='The cart rule will be applied to the X first customers only.'}</p>
+	<p class="preference_description">{l s='The cart rule will be applied to the X first customers only.'}</p>
 </div>
 <label>{l s='Total available for each user'}</label>
 <div class="margin-form">
 	<input type="text" name="quantity_per_user" value="{$currentTab->getFieldValue($currentObject, 'quantity_per_user')|intval}" />
-	<p>{l s='A customer will only be able to use the cart rule X time(s).'}</p>
+	<p class="preference_description">{l s='A customer will only be able to use the cart rule X time(s).'}</p>
 </div>
 {if $countries.unselected|@count + $countries.selected|@count > 1}
 <br />
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
index 43e47d90e..9a84ccb8b 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
@@ -1,22 +1,27 @@
 <table cellpadding="0" cellspacing="0">
 	<tr>
-		<td style="width:50%">
+		<td>
 			<label>{l s='Name'}</label>
 			<div class="margin-form">
 				<div class="translatable">
 				{foreach from=$languages item=language}
 					<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultLanguage}block{else}none{/if};float:left">
-						<input type="text" id="name_{$language.id_lang}" name="name_{$language.id_lang}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)}" style="width:500px" />
+						<input type="text" id="name_{$language.id_lang}" name="name_{$language.id_lang}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)}" />
 					</div>
 				{/foreach}
 				</div>
-				<p class="clear">{l s='Will be displayed in the cart summary as well as on the invoice.'}</p>
+				<p class="preference_description">{l s='Will be displayed in the cart summary as well as on the invoice.'}</p>
+			</div>
+			<label>{l s='Description'}</label>
+			<div class="margin-form">
+				<textarea name="description" style="width:80%;height:100px">{$currentTab->getFieldValue($currentObject, 'description')}</textarea>
+				<p class="preference_description">{l s='For you only, never displayed to the customer.'}</p>
 			</div>
 			<label>{l s='Code'}</label>
 			<div class="margin-form">
 				<input type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')}" />
-				<a href="javascript:gencode(8);" style="cursor:pointer">{l s='(Click to generate random code)'}</a>
-				<p>{l s='Caution! The rule will automatically be applied if you leave this field blank.'}</p>
+				<a href="javascript:gencode(8);" class="button">{l s='(Click to generate random code)'}</a>
+				<p class="preference_description">{l s='Caution! The rule will automatically be applied if you leave this field blank.'}</p>
 			</div>
 			<label>{l s='Partial use'}</label>
 			<div class="margin-form">
@@ -26,7 +31,7 @@
 				&nbsp;&nbsp;
 				<input type="radio" name="partial_use" id="partial_use_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'partial_use')|intval}checked="checked"{/if} />
 				<label class="t" for="partial_use_off"> <img src="../img/admin/disabled.gif" alt="{l s='Not allowed'}" title="{l s='Not allowed'}" style="cursor:pointer" /></label>
-				<p>
+				<p class="preference_description">
 					{l s='Only applicable if the voucher value is greater than the cart total.'}<br />
 					{l s='If you do not allow partial use, the voucher value will be lowered to the total order amount, but if you do, a new voucher will be created with the remainder.'}
 				</p>
@@ -34,7 +39,7 @@
 			<label>{l s='Priority'}</label>
 			<div class="margin-form">
 				<input type="text" name="priority" value="{$currentTab->getFieldValue($currentObject, 'priority')|intval}" />
-				<p>{l s='Cart rules are applied to the cart by priority. A cart rule with priority of "1" will be processed before a cart rule with a priority of "2".'}</p>
+				<p class="preference_description">{l s='Cart rules are applied to the cart by priority. A cart rule with priority of "1" will be processed before a cart rule with a priority of "2".'}</p>
 			</div>
 			<label>{l s='Status'}</label>
 			<div class="margin-form">
@@ -46,12 +51,5 @@
 				<label class="t" for="active_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /></label>
 			</div>
 		</td>
-		<td style="width:50%">
-			<label>{l s='Description'}</label>
-			<div class="margin-form">
-				<textarea name="description" style="width:90%;height:200px">{$currentTab->getFieldValue($currentObject, 'description')}</textarea>
-				<p>{l s='For you only, never displayed to the customer.'}</p>
-			</div>
-		</td>
 	</tr>
 </table>
\ No newline at end of file
diff --git a/css/admin.css b/css/admin.css
index 0b77eeec7..abfd84ea7 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -1798,6 +1798,7 @@ p.preference_description{
     text-align: left;
     width: 500px;
     color:#7F7F7F;
+    font-size:11px;
 }
 
 .preference_default_multishop{
@@ -2249,7 +2250,7 @@ margin-bottom:7px;
 
 /*cart_rule_form*/
 #cart_rule_form {}
-#cart_rule_form h4 { margin-top:0;}
+#cart_rule_form h4 { font-size:18px; font-weight:normal; margin-top:0;}
 
 #ajax_running {
 	display: none;