dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-04-11 15:59:58 +02:00
parent 467a6f45fd 8bdcaa2c2d
commit f231cd5bd0
16 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/mobile/authentication-choice.tpl
+1 -1
View File
@@ -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>
themes/default/mobile/best-sales.tpl
+1 -1
View File
@@ -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"}
themes/default/mobile/category.tpl
+2 -2
View File
@@ -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}
themes/default/mobile/contact-form.tpl
+14 -3
View File
@@ -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}
themes/default/mobile/header.tpl
+1 -1
View File
@@ -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">*}
themes/default/mobile/manufacturer.tpl
+1 -1
View File
@@ -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"}
themes/default/mobile/new-products.tpl
+1 -1
View File
@@ -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"}
themes/default/mobile/order-detail.tpl
+3 -3
View File
@@ -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>
themes/default/mobile/pages-list.tpl
+1 -1
View File
@@ -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}
themes/default/mobile/prices-drop.tpl
+1 -1
View File
@@ -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"}
themes/default/mobile/product-attributes.tpl
+1 -1
View File
@@ -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}
themes/default/mobile/product-desc-features.tpl
+1 -1
View File
@@ -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}
themes/default/mobile/product.tpl
+4 -4
View File
@@ -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}
themes/default/mobile/search.tpl
+1 -1
View File
@@ -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}
themes/default/mobile/sitemap.tpl
+2 -2
View File
@@ -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}
themes/default/mobile/supplier.tpl
+1 -1
View File
@@ -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"}