From 8bdcaa2c2d42a8f15c9604d9759faac9e1e619d5 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Thu, 11 Apr 2013 15:52:07 +0200
Subject: [PATCH] Merge pull request #65 from Ha99y:mobile-them-HR-fix2

---
 themes/default/mobile/authentication-choice.tpl |  2 +-
 themes/default/mobile/best-sales.tpl            |  2 +-
 themes/default/mobile/category.tpl              |  4 ++--
 themes/default/mobile/contact-form.tpl          | 17 ++++++++++++++---
 themes/default/mobile/header.tpl                |  2 +-
 themes/default/mobile/manufacturer.tpl          |  2 +-
 themes/default/mobile/new-products.tpl          |  2 +-
 themes/default/mobile/order-detail.tpl          |  6 +++---
 themes/default/mobile/pages-list.tpl            |  2 +-
 themes/default/mobile/prices-drop.tpl           |  2 +-
 themes/default/mobile/product-attributes.tpl    |  2 +-
 themes/default/mobile/product-desc-features.tpl |  2 +-
 themes/default/mobile/product.tpl               |  8 ++++----
 themes/default/mobile/search.tpl                |  2 +-
 themes/default/mobile/sitemap.tpl               |  4 ++--
 themes/default/mobile/supplier.tpl              |  2 +-
 16 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/themes/default/mobile/authentication-choice.tpl b/themes/default/mobile/authentication-choice.tpl
index 4bbfb00bc..7d8346a4d 100644
--- a/themes/default/mobile/authentication-choice.tpl
+++ b/themes/default/mobile/authentication-choice.tpl
@@ -13,7 +13,7 @@
 		</div>
 	</form>
 
-	<hr width="99%" align="center" size="2" class=""/>
+	<hr/>
 
 	<form action="{$link->getPageLink('authentication', true)}" method="post" class="login_form">
 		<h2>{l s='Already registered?'}</h2>
diff --git a/themes/default/mobile/best-sales.tpl b/themes/default/mobile/best-sales.tpl
index d8dba671c..438676a91 100644
--- a/themes/default/mobile/best-sales.tpl
+++ b/themes/default/mobile/best-sales.tpl
@@ -46,7 +46,7 @@
 			<div class="clearfix">
 				{include file="./category-product-sort.tpl" container_class="container-sort"}
 			</div>
-			<hr width="99%" align="center" size="2"/>
+			<hr/>
 			{include file="./pagination.tpl"}
 			{include file="./category-product-list.tpl" products=$products}
 			{include file="./pagination.tpl"}
diff --git a/themes/default/mobile/category.tpl b/themes/default/mobile/category.tpl
index 2b86926c4..90dc09310 100644
--- a/themes/default/mobile/category.tpl
+++ b/themes/default/mobile/category.tpl
@@ -45,13 +45,13 @@
 					<p>{$category->description}</p>
 				{/if}
 			</div>
-			<hr width="99%" align="center" size="2" class="margin_less"/>
+			<hr class="margin_less"/>
 		{/if}
 		<div class="clearfix">
 			{include file="./category-product-sort.tpl" container_class="container-sort"}
 			<p class="nbr_result">{include file="$tpl_dir./category-count.tpl"}</p>
 		</div>
-		<hr width="99%" align="center" size="2" class="margin_less"/>
+		<hr class="margin_less"/>
 		
 		{include file="./pagination.tpl"}
 		{include file="./category-product-list.tpl" products=$products}
diff --git a/themes/default/mobile/contact-form.tpl b/themes/default/mobile/contact-form.tpl
index 14b6cc043..6c435356a 100644
--- a/themes/default/mobile/contact-form.tpl
+++ b/themes/default/mobile/contact-form.tpl
@@ -44,7 +44,7 @@
 					<option value="{$contact.id_contact|intval}" {if isset($smarty.post.id_contact) && $smarty.post.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'htmlall':'UTF-8'}</option>
 				{/foreach}
 				</select>
-			</p>
+
 			<p id="desc_contact0" class="desc_contact">&nbsp;</p>
 				{foreach from=$contacts item=contact}
 					<p id="desc_contact{$contact.id_contact|intval}" class="desc_contact" style="display:none;">
@@ -65,7 +65,11 @@
 				{if (!isset($customerThread.id_order) || $customerThread.id_order > 0)}
 				<fieldset>
 					{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
-						<select name="id_order" ><option value="0">-- {l s='Order ID'} --</option>{$orderList}</select>
+						<select name="id_order" ><option value="0">-- {l s='Order ID'} --</option>
+						{foreach from=$orderList item=order}
+							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
+						{/foreach}
+						</select>
 					{elseif !isset($customerThread.id_order) && !isset($isLogged)}
 						<input type="text" placeholder="{l s='Order ID'}" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|intval}{/if}{/if}" />
 					{elseif $customerThread.id_order > 0}
@@ -75,8 +79,15 @@
 				{/if}
 				{if isset($isLogged) && $isLogged}
 				<fieldset>
+
 					{if !isset($customerThread.id_product)}
-						<select name="id_product" style="width:300px;"><option value="0">-- {l s='Product'} --</option>{$orderedProductList}</select>
+						{foreach from=$orderedProductList key=id_order item=products name=products}
+							<select name="id_product"><option value="0">-- {l s='Product'} --</option>
+								{foreach from=$products item=product}
+									<option value="{$product.value|intval}">{$product.label|escape:'htmlall':'UTF-8'}</option>
+								{/foreach}
+							</select>
+						{/foreach}
 					{elseif $customerThread.id_product > 0}
 						<input type="text" name="id_product" id="id_product" value="{$customerThread.id_product|intval}" readonly="readonly" />
 					{/if}
diff --git a/themes/default/mobile/header.tpl b/themes/default/mobile/header.tpl
index 973b3582c..34752abba 100644
--- a/themes/default/mobile/header.tpl
+++ b/themes/default/mobile/header.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 <!DOCTYPE html>
-<html>
+<html lang="{$lang_iso}">
 	<head>
 		<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>
 		{*<meta name="viewport" content="width=device-width, initial-scale=1">*}
diff --git a/themes/default/mobile/manufacturer.tpl b/themes/default/mobile/manufacturer.tpl
index 3143b61a5..5233a48ed 100644
--- a/themes/default/mobile/manufacturer.tpl
+++ b/themes/default/mobile/manufacturer.tpl
@@ -48,7 +48,7 @@
 			<div class="clearfix">
 				{include file="./category-product-sort.tpl" container_class="container-sort"}
 			</div>
-			<hr width="99%" align="center" size="2"/>
+			<hr/>
 			{include file="./pagination.tpl"}
 			{include file="./category-product-list.tpl" products=$products}
 			{include file="./pagination.tpl"}
diff --git a/themes/default/mobile/new-products.tpl b/themes/default/mobile/new-products.tpl
index 81b9aaa9c..4d5950126 100644
--- a/themes/default/mobile/new-products.tpl
+++ b/themes/default/mobile/new-products.tpl
@@ -31,7 +31,7 @@
 		<div class="clearfix">
 			{include file="./category-product-sort.tpl" container_class="container-sort"}
 		</div>
-		<hr width="99%" align="center" size="2"/>
+		<hr/>
 		{include file="./pagination.tpl"}
 		{include file="./category-product-list.tpl" products=$products}
 		{include file="./pagination.tpl"}
diff --git a/themes/default/mobile/order-detail.tpl b/themes/default/mobile/order-detail.tpl
index c341b7461..558854be4 100644
--- a/themes/default/mobile/order-detail.tpl
+++ b/themes/default/mobile/order-detail.tpl
@@ -117,7 +117,7 @@
 		{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<p class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'htmlall':'UTF-8'}</p>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item}
-				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item}">{$invoiceAddressFormatedValues[$word_item]|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
+				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
 		{/if}
 	{/foreach}
 	</li>
@@ -130,7 +130,7 @@
 		{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<p class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</p>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item} 
-				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item}">{$deliveryAddressFormatedValues[$word_item]|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
+				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
 		{/if}
 	{/foreach}
 	</li>
@@ -174,7 +174,7 @@
 	{if $priceDisplay && $use_tax}
 		<li data-theme="b" class="item">
 			{l s='Total products (tax excl.)'} <span class="price">{displayWtPriceWithCurrency price=$order->getTotalProductsWithoutTaxes() currency=$currency}</span>
-		</tr>
+		</li>
 	{/if}
 	<li data-theme="b" class="item">
 		{l s='Total products'} {if $use_tax}{l s='(tax incl.)'}{/if}: <span class="price">{displayWtPriceWithCurrency price=$order->getTotalProductsWithTaxes() currency=$currency}</span>
diff --git a/themes/default/mobile/pages-list.tpl b/themes/default/mobile/pages-list.tpl
index 3f6148c5a..8513b4714 100644
--- a/themes/default/mobile/pages-list.tpl
+++ b/themes/default/mobile/pages-list.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-		<hr width="99%" align="center" size="2" class=""/>
+		<hr/>
 		<h2 class="site_map">{l s='Sitemap'}</h2>
 		<ul data-role="listview" data-inset="true" id="category">
 			{if $controller_name != 'index'}<li><a href="{$link->getPageLink('index', true)}" data-ajax="false">Accueil</a></li>{/if}
diff --git a/themes/default/mobile/prices-drop.tpl b/themes/default/mobile/prices-drop.tpl
index 0404bea93..e331a6054 100644
--- a/themes/default/mobile/prices-drop.tpl
+++ b/themes/default/mobile/prices-drop.tpl
@@ -31,7 +31,7 @@
 		<div class="clearfix">
 			{include file="./category-product-sort.tpl" container_class="container-sort"}
 		</div>
-		<hr width="99%" align="center" size="2"/>
+		<hr/>
 		{include file="./pagination.tpl"}
 		{include file="./category-product-list.tpl" products=$products}
 		{include file="./pagination.tpl"}
diff --git a/themes/default/mobile/product-attributes.tpl b/themes/default/mobile/product-attributes.tpl
index 1f45f4929..ec6672b0c 100644
--- a/themes/default/mobile/product-attributes.tpl
+++ b/themes/default/mobile/product-attributes.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 {if isset($groups)}
-<hr width="99%" align="center" size="2" class="margin_less"/>
+<hr class="margin_less"/>
 
 <div id="attributes">
 {foreach from=$groups key=id_attribute_group item=group}
diff --git a/themes/default/mobile/product-desc-features.tpl b/themes/default/mobile/product-desc-features.tpl
index f81f3fd88..8692a9a3d 100644
--- a/themes/default/mobile/product-desc-features.tpl
+++ b/themes/default/mobile/product-desc-features.tpl
@@ -5,7 +5,7 @@
 		{if isset($product) && $product->description}
 		<div data-role="collapsible" data-theme="a" data-content-theme="a">
 			<h3>{l s='More info'}</h3>
-			<p>{$product->description}</p>
+			<div>{$product->description}</div>
 		</div>
 		{/if}
 		
diff --git a/themes/default/mobile/product.tpl b/themes/default/mobile/product.tpl
index 1e22cd482..e9b88fd95 100644
--- a/themes/default/mobile/product.tpl
+++ b/themes/default/mobile/product.tpl
@@ -119,10 +119,10 @@
 		</div><!-- .clearfix -->
 		
 		{if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
-			<hr width="99%" align="center" size="2" class="margin_less"/>
+			<hr class="margin_less"/>
 			{include file="./product-prices.tpl"}
 		{else}
-			<hr width="99%" align="center" size="2" class="margin_bottom"/>
+			<hr class="margin_bottom"/>
 		{/if}
 		<div id="displayMobileAddToCartTop">
 			{hook h="displayMobileAddToCartTop"}
@@ -147,13 +147,13 @@
 	{include file="./product-quantity-discount.tpl"}
 	{* ================================== *}
 	
-	<hr width="99%" align="center" size="2" class=""/>
+	<hr/>
 	<!-- description and features -->
 	{include file="./product-desc-features.tpl"}
 	
 	{if isset($packItems) && $packItems|@count > 0}
 	<!-- pack list -->
-	<hr width="99%" align="center" size="2" class="margin_less"/>
+	<hr class="margin_less"/>
 	<div id="blockpack">
 		<h2>{l s='Pack content'}</h2>
 		{include file="./category-product-list.tpl" products=$packItems}
diff --git a/themes/default/mobile/search.tpl b/themes/default/mobile/search.tpl
index 61ba394e0..f46bffa03 100644
--- a/themes/default/mobile/search.tpl
+++ b/themes/default/mobile/search.tpl
@@ -42,7 +42,7 @@
 		</div>
 		{/if}
 		
-		<hr width="99%" align="center" size="2"/>
+		<hr/>
 		{if !isset($instantSearch) || (isset($instantSearch) && !$instantSearch)}
 			{include file="./pagination.tpl"}
 		{/if}
diff --git a/themes/default/mobile/sitemap.tpl b/themes/default/mobile/sitemap.tpl
index 1b816ab10..7b0f17401 100644
--- a/themes/default/mobile/sitemap.tpl
+++ b/themes/default/mobile/sitemap.tpl
@@ -25,7 +25,7 @@
 <div id="hook_mobile_top_site_map">
 {hook h="displayMobileTopSiteMap"}
 </div>
-<hr width="99%" align="center" size="2" class=""/>
+<hr/>
 {if isset($categoriesTree.children)}
 	<h2>{l s='Our offers'}</h2>
 
@@ -54,7 +54,7 @@
 	</ul>
 {/if}
 
-<hr width="99%" align="center" size="2" class=""/>
+<hr/>
 <h2>{l s='Sitemap'}</h2>
 <ul data-role="listview" data-inset="true" id="category">
 	{if $controller_name != 'index'}<li><a href="{$link->getPageLink('index', true)}">{l s='Home'}</a></li>{/if}
diff --git a/themes/default/mobile/supplier.tpl b/themes/default/mobile/supplier.tpl
index 60a22525c..1526f58c0 100644
--- a/themes/default/mobile/supplier.tpl
+++ b/themes/default/mobile/supplier.tpl
@@ -47,7 +47,7 @@
 		<div class="clearfix">
 			{include file="./category-product-sort.tpl" container_class="container-sort"}
 		</div>
-		<hr width="99%" align="center" size="2"/>
+		<hr/>
 		{include file="./pagination.tpl"}
 		{include file="./category-product-list.tpl" products=$products}
 		{include file="./pagination.tpl"}