From 8bafaceb403dd7ee5d83a566cd40011bcaa82b90 Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Tue, 30 Jul 2013 10:35:47 +0200
Subject: [PATCH] [+] BO Customers > Addresses // Helper > Required Fields

---
 .../addresses/helpers/form/form.tpl           |  6 ++--
 .../controllers/products/input_text_lang.tpl  |  4 ++-
 .../template/helpers/required_fields.tpl      | 31 ++++++++++---------
 .../admin/AdminAddressesController.php        | 11 ++++---
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
index 3999c20fb..c6eb62f1a 100644
--- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
@@ -40,9 +40,9 @@
 {block name="field"}
 	{if $input.type == 'text_customer'}
 		{if isset($customer)}
-			<div>
-				<a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={$tokenCustomer}">
-					{$customer->lastname} {$customer->firstname} ({$customer->email})
+			<div class="col-lg-9">
+				<a class="btn btn-default" href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={$tokenCustomer}">
+					<i class="icon-eye-open"></i> {$customer->lastname} {$customer->firstname} ({$customer->email})
 				</a>
 			</div>
 			<input type="hidden" name="id_customer" value="{$customer->id}" />
diff --git a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
index 575e7518f..f87e8a818 100644
--- a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
+++ b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
@@ -39,7 +39,9 @@
 			</button>
 			<ul class="dropdown-menu">
 				{foreach from=$languages item=language}
-				<li><a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.iso_code}</a></li>
+				<li>
+					<a href="javascript:hideOtherLanguage({$language.id_lang});"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.iso_code}</a>
+				</li>
 				{/foreach}
 			</ul>
 		</div>
diff --git a/admin-dev/themes/default/template/helpers/required_fields.tpl b/admin-dev/themes/default/template/helpers/required_fields.tpl
index c55be5b99..edfbd6e69 100644
--- a/admin-dev/themes/default/template/helpers/required_fields.tpl
+++ b/admin-dev/themes/default/template/helpers/required_fields.tpl
@@ -23,16 +23,20 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<br />
-<p>
-	<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>
+	<a class="btn btn-default" href="#" onclick="if ($('.requiredFieldsParameters:visible').length == 0) $('.requiredFieldsParameters').slideDown('slow'); else $('.requiredFieldsParameters').slideUp('slow'); return false;">
+		<i class="icon-plus-sign"></i> {l s='Set required fields for this section'}
+	</a>
+
+<fieldset style="display:none" class="requiredFieldsParameters">
+	<h3><i class="icon-asterisk"></i> {l s='Required Fields'}</h3>
 	<form name="updateFields" action="{$current}&submitFields=1&token={$token}" method="post">
-		<p>
-			<b>{l s='Select the fields you would like to be required for this section.'}</b><br />
-			<table cellspacing="0" cellpadding="0" class="table width1 clear">
+
+			<div class="alert alert-info">
+				{l s='Select the fields you would like to be required for this section.'}
+			</div>
+
+			<table class="table">
+
 				<thead>
 					<tr>
 						<th><input type="checkbox" onclick="checkDelBoxes(this.form, 'fieldsBox[]', this.checked)" class="noborder" name="checkme"></th>
@@ -49,10 +53,9 @@
 					{/if}
 				{/foreach}
 				</tbody>
-			</table><br />
-			<center>
-				<input style="margin-left:15px;" class="button" type="submit" value="{l s='Save'}" name="submitFields" />
-			</center>
-		</p>
+			</table>
+
+	<button class="btn btn-primary pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button>
+
 	</form>
 </fieldset>
diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index ce0558a07..054583a23 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -109,27 +109,28 @@ class AdminAddressesControllerCore extends AdminController
 					'label' => $this->l('Address alias'),
 					'name' => 'alias',
 					'required' => true,
-					'hint' => $this->l('Invalid characters:').' <>;=#{}'
+					'hint' => $this->l('Invalid characters:').' &lt;&gt;;=#{}'
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Home phone'),
 					'name' => 'phone',
 					'required' => false,
+					'hint' => Configuration::get('PS_ONE_PHONE_AT_LEAST') ? sprintf($this->l('You must register at least one phone number')) : ''
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Mobile phone'),
 					'name' => 'phone_mobile',
 					'required' => false,
-					'hint' => Configuration::get('PS_ONE_PHONE_AT_LEAST')? sprintf($this->l('You must register at least one phone number %s')) : ''
+					'hint' => Configuration::get('PS_ONE_PHONE_AT_LEAST') ? sprintf($this->l('You must register at least one phone number')) : ''
 				),
 				array(
 					'type' => 'textarea',
 					'label' => $this->l('Other'),
 					'name' => 'other',
 					'required' => false,
-					'hint' => $this->l('Forbidden characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span>'
+					'hint' => $this->l('Forbidden characters:').' &lt;&gt;;=#{}'
 				),
 			),
 			'submit' => array(
@@ -190,7 +191,7 @@ class AdminAddressesControllerCore extends AdminController
 					'label' => $this->l('Last Name'),
 					'name' => 'lastname',
 					'required' => true,
-					'hint' => $this->l('Invalid characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:',
+					'hint' => $this->l('Invalid characters:').' 0-9!&amp;lt;&amp;gt;,;?=+()@#"�{}_$%:',
 					'default_value' => $default_value,
 				);
 			}
@@ -209,7 +210,7 @@ class AdminAddressesControllerCore extends AdminController
 					'label' => $this->l('First Name'),
 					'name' => 'firstname',
 					'required' => true,
-					'hint' => $this->l('Invalid characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:',
+					'hint' => $this->l('Invalid characters:').' 0-9!&amp;lt;&amp;gt;,;?=+()@#"�{}_$%:',
 					'default_value' => $default_value,
 				);
 			}