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

Merge branch 'release' into development

Browse Source
This commit is contained in:
François Gaillard
2013-03-14 16:39:47 +01:00
parent 13e9de16e1 da77ce1029
commit e08945de6b
715 changed files with 10968 additions and 19548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/mobile/404.tpl
+2 -2
View File
@@ -31,10 +31,10 @@
<div data-role="content" id="content">
<div id="not_found">
<p>{l s='We\'re sorry, but the Web address you\'ve entered is no longer available.'}</p>
<p>{l s='To find a product, please type its name in the field below'}</p>
<p>{l s='To find a product, please type its name in the field below.'}</p>
<div data-role="fieldcontain" class="input_search_404">
<form action="{$link->getPageLink('search')}" method="post" class="std">
<input type="search" name="search_query" id="search_query" value="{l s='Search:'}" />
<input type="search" name="search_query" id="search_query" value="{l s='Search'}" />
</form>
</div>
<p>
themes/default/mobile/authentication-choice.tpl
+1 -1
View File
@@ -1,6 +1,6 @@
<div data-role="content" id="content">
<form action="{$link->getPageLink('authentication', true)}" method="post" id="create-account_form" class="std login_form">
<form action="{$link->getPageLink('authentication', true)}" method="post" id="create-account_form" class="std login_form" data-ajax="false">
<h2>{l s='Create an account'}</h2>
<div class="form_content clearfix">
<p class="title_block">{l s='Enter your email address to create an account'}.</p>
themes/default/mobile/authentication-create-account.tpl
+1 -1
View File
@@ -123,7 +123,7 @@
<p class="required text">
<label for="address1">{l s='Address'} <sup>*</sup></label>
<input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}" />
<span class="inline-infos">{l s='Street address, P.O. box, compagny name, c/o'}</span>
<span class="inline-infos">{l s='Street address, P.O. Box, company name, etc.'}</span>
</p>
{elseif $field_name eq "address2"}
<p class="text">
themes/default/mobile/css/global.css
+5 -12
View File
@@ -68,6 +68,11 @@
/* JQUERY MOBILE */
.ui-content {
overflow-y:hidden;
background:none !important;
}
.ui-page > .ui-content {
padding:15px !important;
}
section .ui-content {
@@ -362,18 +367,6 @@ ul.pagination_mobile {
border:1px solid red;
}
#account-creation_form p .ui-radio-on .ui-icon {
width:0;
height:18px;
background:none;
background-image:url(../img/icons-18-white.png);
background-position:-720px 50%;
background-repeat:no-repeat;
-moz-border-radius:9px;
-webkit-border-radius:9px;
border-radius:9px;
}
#account-creation_form p.select .ui-select .ui-icon {
background:none;
}
themes/default/mobile/css/jquery.mobile-1.2.0.min.css
Vendored
-2
View File
File diff suppressed because one or more lines are too long
themes/default/mobile/css/jquery.mobile-1.3.0.min.css
Vendored
+2
View File
File diff suppressed because one or more lines are too long
themes/default/mobile/identity.tpl
+1 -1
View File
@@ -56,7 +56,7 @@
<input type="text" name="lastname" id="lastname" value="{$smarty.post.lastname}" />
</fieldset>
<fieldset class="required text">
<label for="email">{l s='Email:'} <sup>*</sup></label>
<label for="email">{l s='Email'} <sup>*</sup></label>
<input type="text" name="email" id="email" value="{$smarty.post.email}" />
</fieldset>
<fieldset class="required text">
themes/default/mobile/js/jquery.mobile-1.2.0.js
-9162
View File
File diff suppressed because it is too large Load Diff
themes/default/mobile/js/jquery.mobile-1.3.0.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
themes/default/mobile/maintenance.tpl
+1 -1
View File
@@ -46,7 +46,7 @@
<div data-role="content" id="maintenance" class="maintenance">
<p id="store"><img src="{$content_dir}img/logo.jpg" alt="logo" /><br /></p>
<p id="message">
{l s='In order to perform site maintenance, our online shop has shut down temporarily.'}<br /><br />
{l s='In order to perform website maintenance, our online store will be temporarily offline.'}<br /><br />
{l s='We apologize for the inconvenience and ask that you please try again later.'}
</p>
<p id="prestashop"> &nbsp; </p>
themes/default/mobile/my-account.tpl
+2 -2
View File
@@ -32,9 +32,9 @@
<ul data-role="listview" data-inset="true" id="list_myaccount">
{if $has_customer_an_address}
<li>
<a href="{$link->getPageLink('address', true)}" title="{l s='Add my first address.'}" data-ajax="false">
<a href="{$link->getPageLink('address', true)}" title="{l s='Add my first address'}" data-ajax="false">
<img src="{$img_mobile_dir}icon/addrbook.png" alt="{l s='Addresses'}" class="ui-li-icon ui-li-thumb" />
{l s='Add my first address.'}
{l s='Add my first address'}
</a>
</li>
{/if}
themes/default/mobile/order-address.tpl
+223
View File
@@ -0,0 +1,223 @@
{if $opc}
{assign var="back_order_page" value="order-opc.php"}
{else}
{assign var="back_order_page" value="order.php"}
{/if}
<script type="text/javascript">
// <![CDATA[
{if !$opc}
var orderProcess = 'order';
var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}';
var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product' js=1}";
var txtProducts = "{l s='products' js=1}";
{/if}
var addressMultishippingUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")}";
var addressUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back}{/if}")}";
var formatedAddressFieldsValuesList = new Array();
{foreach from=$formatedAddressFieldsValuesList key=id_address item=type}
formatedAddressFieldsValuesList[{$id_address}] =
{ldelim}
'ordered_fields':[
{foreach from=$type.ordered_fields key=num_field item=field_name name=inv_loop}
{if !$smarty.foreach.inv_loop.first},{/if}"{$field_name}"
{/foreach}
],
'formated_fields_values':{ldelim}
{foreach from=$type.formated_fields_values key=pattern_name item=field_name name=inv_loop}
{if !$smarty.foreach.inv_loop.first},{/if}"{$pattern_name}":"{$field_name}"
{/foreach}
{rdelim}
{rdelim}
{/foreach}
function getAddressesTitles()
{
return {
'invoice': "<span style=\"font-weight:bold;font-size:1.2em;padding-bottom:5px;display:block\">{l s='Your billing address' js=1}</span>",
'delivery': "<span style=\"font-weight:bold;font-size:1.2em;padding-bottom:5px;display:block\">{l s='Your delivery address' js=1}</span>"
};
}
function buildAddressBlock(id_address, address_type, dest_comp)
{
var adr_titles_vals = getAddressesTitles();
var li_content = formatedAddressFieldsValuesList[id_address]['formated_fields_values'];
var ordered_fields_name = ['title'];
ordered_fields_name = ordered_fields_name.concat(formatedAddressFieldsValuesList[id_address]['ordered_fields']);
ordered_fields_name = ordered_fields_name.concat(['update']);
dest_comp.html('');
li_content['title'] = adr_titles_vals[address_type];
li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back={$back_order_page}?step=1{if $back}&mod={$back}{/if}" title="{l s='Update' js=1}" style="font-size:.9em;font-weight:normal;padding:8px 0;display:block;text-align:right">&raquo; {l s='Update' js=1}</a>';
appendAddressList(dest_comp, li_content, ordered_fields_name);
}
function appendAddressList(dest_comp, values, fields_name)
{
for (var item in fields_name)
{
var name = fields_name[item];
var value = getFieldValue(name, values);
if (value != "")
{
var new_li = document.createElement('li');
new_li.className = 'address_'+ name;
new_li.innerHTML = getFieldValue(name, values);
dest_comp.append(new_li);
}
}
}
function getFieldValue(field_name, values)
{
var reg=new RegExp("[ ]+", "g");
var items = field_name.split(reg);
var vals = new Array();
for (var field_item in items)
{
items[field_item] = items[field_item].replace(",", "");
vals.push(values[items[field_item]]);
}
return vals.join(" ");
}
//]]>
</script>
{if isset($empty)}
<p class="warning">{l s='Your shopping cart is empty.'}</p>
{elseif $PS_CATALOG_MODE}
<p class="warning">{l s='This store has not accepted your new order.'}</p>
{else}
<div id="displayMobileShoppingCartTop">
{hook h="displayMobileShoppingCartTop"}
</div>
<div data-role="content" id="content" class="cart">
{include file="$tpl_dir./errors.tpl"}
<h2>{l s='Addresses'}</h2>
{if !$opc}
{assign var='current_step' value='address'}
{include file="$tpl_dir./errors.tpl"}
{if !$multi_shipping && {Configuration::get('PS_ALLOW_MULTISHIPPING')} && !$cart->isVirtualCart()}
<div class="button_multishipping_mode" id="multishipping_mode_box">
<div class="title">{l s='Multi-shipping'}</div>
<div class="description">
<a href="{$link->getPageLink('order', true, NULL, 'step=1&multi-shipping=1')}"/>
{l s='Specify a delivery address for each product ordered.'}
</a>
</div>
</div>
{/if}
<form action="{$link->getPageLink($back_order_page, true)}" method="post" data-ajax="false">
{else}
{if {Configuration::get('PS_ALLOW_MULTISHIPPING')} && !$cart->isVirtualCart()}
<div class="address-form-multishipping">
<div class="button_multishipping_mode" id="multishipping_mode_box">
<div class="title">{l s='Multi-shipping'}</div>
<div class="description">
<input type="checkbox" id="multishipping_mode_checkbox" onchange="multishippingMode(this); return false;"/><label for="multishipping_mode_checkbox">{l s='I\'d like to specify a delivery address for each product ordered.'}</label>
</div>
<div class="description_off">
<a href="{$link->getPageLink('order-opc', true, NULL, 'ajax=1&multi-shipping=1&method=multishipping')}" id="link_multishipping_form" title="{l s='Choose the delivery address(es)'}">
{l s='Specify a delivery address for each product.'}
</a>
</div>
</div>
<script type="text/javascript">
{if $is_multi_address_delivery}
var multishipping_mode = true;
{else}
var multishipping_mode = false;
{/if}
var open_multishipping_fancybox = {$open_multishipping_fancybox|intval};
</script>
</div>
{/if}
<div id="opc_account" class="opc-main-block">
<div id="opc_account-overlay" class="opc-overlay" style="display: none;"></div>
{/if}
<div class="addresses clearfix">
<p class="address_delivery select">
<label for="id_address_delivery">{if $cart->isVirtualCart()}{l s='Choose a billing address:'}{else}{l s='Choose a delivery address:'}{/if}</label>
<select name="id_address_delivery" id="id_address_delivery" class="address_select" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}">
{foreach from=$addresses key=k item=address}
<option value="{$address.id_address|intval}" {if $address.id_address == $cart->id_address_delivery}selected="selected"{/if}>{$address.alias|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
<p class="checkbox addressesAreEquals" {if $cart->isVirtualCart()}style="display:none;"{/if}>
<input type="checkbox" name="same" id="addressesAreEquals" value="1" onclick="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}" {if $cart->id_address_invoice == $cart->id_address_delivery || $addresses|@count == 1}checked="checked"{/if} />
<label for="addressesAreEquals">{l s='Use the delivery address as the billing address.'}</label>
</p>
<p id="address_invoice_form" class="select" {if $cart->id_address_invoice == $cart->id_address_delivery}style="display: none;"{/if}>
{if $addresses|@count > 1}
<label for="id_address_invoice" class="strong">{l s='Choose a billing address:'}</label>
<select name="id_address_invoice" id="id_address_invoice" class="address_select" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}">
{section loop=$addresses step=-1 name=address}
<option value="{$addresses[address].id_address|intval}" {if $addresses[address].id_address == $cart->id_address_invoice && $cart->id_address_delivery != $cart->id_address_invoice}selected="selected"{/if}>{$addresses[address].alias|escape:'htmlall':'UTF-8'}</option>
{/section}
</select>
{else}
<a style="margin-left: 221px;" href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1&select_address=1{if $back}&mod={$back}{/if}")}" title="{l s='Add'}" class="button_large">{l s='Add a new address'}</a>
{/if}
</p>
</div>
<div class="addresses">
<div class="ui-grid-a same-height">
<div class="ui-block-a">
<div class="ui-bar ui-bar-c">
<ul class="address item" id="address_delivery" {if $cart->isVirtualCart()}style="display:none;margin:0;padding:0;list-style:none;font-size:.9em;font-weight:normal"{else}style="margin:0;padding:0;list-style:none;font-size:.9em;font-weight:normal"{/if}></ul>
</div>
</div>
<div class="ui-block-b">
<div class="ui-bar ui-bar-c">
<ul class="address alternate_item {if $cart->isVirtualCart()}full_width{/if}" id="address_invoice" style="margin:0;padding:0;list-style:none;font-size:.9em;font-weight:normal"></ul>
</div>
</div>
</div>
<p class="address_add submit">
<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back}{/if}")}" title="{l s='Add'}" class="button_large" data-role="button" data-icon="plus">{l s='Add a new address'}</a>
</p>
{if !$opc}
<div id="ordermsg" class="clearfix">
<p class="txt">{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
<p class="textarea"><textarea cols="60" rows="3" name="message">{if isset($oldMessage)}{$oldMessage}{/if}</textarea></p>
</div>
{/if}
</div>
{if !$opc}
<fieldset class="cart_navigation submit ui-grid-a">
<input type="hidden" class="hidden" name="step" value="2" />
<input type="hidden" name="back" value="{$back}" />
<div class="ui-block-a"><a href="{$link->getPageLink($back_order_page, true, NULL, "step=0{if $back}&back={$back}{/if}")}" title="{l s='Previous'}" data-role="button" data-icon="back" data-ajax="false">&laquo; {l s='Previous'}</a></div>
<div class="ui-block-b"><input type="submit" name="processAddress" value="{l s='Next'}" class="exclusive" data-icon="check" data-iconpos="right" data-theme="b" /></div>
</fieldset>
</form>
{else}
</div>
{/if}
</div><!-- /content -->
<div id="displayMobileShoppingCartBottom">
{hook h="displayMobileShoppingCartBottom"}
</div>
{/if}
themes/default/mobile/order-carrier.tpl
+251
View File
@@ -0,0 +1,251 @@
{if $opc}
{assign var="back_order_page" value="order-opc.php"}
{else}
{assign var="back_order_page" value="order.php"}
{/if}
{if !$opc}
<script type="text/javascript">
// <![CDATA[
var orderProcess = 'order';
var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}';
var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product' js=1}";
var txtProducts = "{l s='products' js=1}";
var orderUrl = '{$link->getPageLink("order", true)}';
var msg = "{l s='You must agree to the terms of service before continuing.' js=1}";
{literal}
function acceptCGV()
{
if ($('#cgv').length && !$('input#cgv:checked').length)
{
alert(msg);
return false;
}
else
return true;
}
{/literal}
//]]>
</script>
{else}
<script type="text/javascript">
var txtFree = "{l s='Free'}";
</script>
{/if}
{if isset($virtual_cart) && !$virtual_cart && $giftAllowed && $cart->gift == 1}
<script type="text/javascript">
{literal}
// <![CDATA[
$('document').ready( function(){
if ($('input#gift').is(':checked'))
$('p#gift_div').show();
});
//]]>
{/literal}
</script>
{/if}
{if isset($empty)}
<p class="warning">{l s='Your shopping cart is empty.'}</p>
{elseif $PS_CATALOG_MODE}
<p class="warning">{l s='This store has not accepted your new order.'}</p>
{else}
<div id="displayMobileShoppingCartTop">
{hook h="displayMobileShoppingCartTop"}
</div>
<div data-role="content" id="content" class="cart">
{include file="$tpl_dir./errors.tpl"}
<h2>{l s='Delivery methods'}</h2>
{if !$opc}
{assign var='current_step' value='shipping'}
{include file="$tpl_dir./errors.tpl"}
<form id="form" action="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")}" method="post" onsubmit="return acceptCGV();" data-ajax="false">
{else}
<div id="opc_delivery_methods" class="opc-main-block">
<div id="opc_delivery_methods-overlay" class="opc-overlay" style="display: none;"></div>
{/if}
<div class="order_carrier_content">
{if isset($virtual_cart) && $virtual_cart}
<input id="input_virtual_carrier" class="hidden" type="hidden" name="id_carrier" value="0" />
{else}
<div id="HOOK_BEFORECARRIER">
{if isset($carriers) && isset($HOOK_BEFORECARRIER)}
{$HOOK_BEFORECARRIER}
{/if}
</div>
{if isset($isVirtualCart) && $isVirtualCart}
<p class="warning">{l s='No carrier is needed for this order.'}</p>
{else}
{if $recyclablePackAllowed}
<p class="checkbox">
<input type="checkbox" name="recyclable" id="recyclable" value="1" {if $recyclable == 1}checked="checked"{/if} />
<label for="recyclable">{l s='I would like to receive my order in recycled packaging.'}.</label>
</p>
{/if}
<div class="delivery_options_address">
{if isset($delivery_option_list)}
{foreach $delivery_option_list as $id_address => $option_list}
<label id="delivery_option">
{if isset($address_collection[$id_address])}
{l s='Choose a shipping option for this address:'} {$address_collection[$id_address]->alias}
{else}
{l s='Choose a shipping option'}
{/if}
</label>
<div class="delivery_options">
{foreach $option_list as $key => $option}
<div class="delivery_option {if ($option@index % 2)}alternate_{/if}item">
<input class="delivery_option_radio" type="radio" name="delivery_option[{$id_address}]" onchange="{if $opc}updateCarrierSelectionAndGift();{else}updateExtraCarrier('{$key}', {$id_address});{/if}" id="delivery_option_{$id_address}_{$option@index}" value="{$key}" {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}checked="checked"{/if} />
<label for="delivery_option_{$id_address}_{$option@index}">
<div class="ui-grid-a">
<span class="resume ui-block-a">
<div class="ui-grid-b">
<p class="delivery_option_logo ui-block-a">
{foreach $option.carrier_list as $carrier}
{if $carrier.logo}
<img src="{$carrier.logo}" alt="{$carrier.instance->name}"/>
{else if !$option.unique_carrier}
{$carrier.instance->name}
{if !$carrier@last} - {/if}
{/if}
{/foreach}
</p>
<div class="ui-block-b" style="padding-left:4px;">
{if $option.unique_carrier}
{foreach $option.carrier_list as $carrier}
<div class="delivery_option_title">{$carrier.instance->name}</div>
{/foreach}
{/if}
</div>
<div class="ui-block-c">
<div class="delivery_option_price">
{if $option.total_price_with_tax && !$free_shipping}
{if $use_taxes == 1}
{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
{else}
{convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'}
{/if}
{else}
{l s='Free'}
{/if}
</div>
</div>
</div>
</span>
<span class="delivery_option_carrier ui-block-b {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}selected{/if} {if $option.unique_carrier}not-displayable{/if}">
{foreach $option.carrier_list as $carrier}
<tr>
{if !$option.unique_carrier}
<td class="first_item">
<input type="hidden" value="{$carrier.instance->id}" name="id_carrier" />
{if $carrier.logo}
<img src="{$carrier.logo}" alt="{$carrier.instance->name}"/>
{/if}
</td>
<td>
{$carrier.instance->name}
</td>
{/if}
<td {if $option.unique_carrier}class="first_item" colspan="2"{/if}>
<input type="hidden" value="{$carrier.instance->id}" name="id_carrier" />
{if isset($carrier.instance->delay[$cookie->id_lang])}
{$carrier.instance->delay[$cookie->id_lang]}<br />
{if count($carrier.product_list) <= 1}
({l s='Product concerned:'}
{else}
({l s='Products concerned:'}
{/if}
{* This foreach is on one line, to avoid tabulation in the title attribute of the acronym *}
{foreach $carrier.product_list as $product}
{if $product@index == 4}<acronym title="{/if}{if $product@index >= 4}{$product.name}{if !$product@last}, {else}">...</acronym>){/if}{else}{$product.name}{if !$product@last}, {else}){/if}{/if}{/foreach}
{/if}
</td>
</tr>
{/foreach}
</span>
</div>
</label>
</div>
{/foreach}
</div>
<div class="hook_extracarrier" id="HOOK_EXTRACARRIER_{$id_address}">{if isset($HOOK_EXTRACARRIER_ADDR) && isset($HOOK_EXTRACARRIER_ADDR.$id_address)}{$HOOK_EXTRACARRIER_ADDR.$id_address}{/if}</div>
{foreachelse}
<p class="warning" id="noCarrierWarning">
{foreach $cart->getDeliveryAddressesWithoutCarriers(true) as $address}
{if empty($address->alias)}
{l s='No carriers available.'}
{else}
{l s='No carriers available for the address "%s".' sprintf=$address->alias}
{/if}
{if !$address@last}
<br />
{/if}
{/foreach}
</p>
{/foreach}
{/if}
</div>
<div style="display: none;" id="extra_carrier"></div>
{if $giftAllowed}
<h3 class="gift_title">{l s='Gift'}</h3>
<p class="checkbox">
<input type="checkbox" name="gift" id="gift" value="1" {if $cart->gift == 1}checked="checked"{/if} />
<label for="gift">{l s='I would like my order to be gift wrapped.'}</label>
<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
{if $gift_wrapping_price > 0}
({l s='Additional cost of'}
<span class="price" id="gift-price">
{if $priceDisplay == 1}{convertPrice price=$total_wrapping_tax_exc_cost}{else}{convertPrice price=$total_wrapping_cost}{/if}
</span>
{if $use_taxes}{if $priceDisplay == 1} {l s='(tax excl.)'}{else} {l s='(tax incl.)'}{/if}{/if})
{/if}
</p>
<p id="gift_div" class="textarea">
<label for="gift_message">{l s='If you\'d like, you can add a note to the gift:'}</label>
<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
</p>
{/if}
{/if}
{/if}
{if $conditions AND $cms_id}
<h3 class="condition_title">{l s='Terms of service'}</h3>
<p class="checkbox">
<input type="checkbox" name="cgv" id="cgv" value="1" {if $checkedTOS}checked="checked"{/if} />
<label for="cgv">{l s='I agree to the Terms of Service and will adhere to them unconditionally.'}</label> <a href="{$link_conditions}" class="iframe">{l s='(Read the Terms of Service)'}</a>
</p>
<script type="text/javascript">$('a.iframe').fancybox();</script>
{/if}
</div>
{if !$opc}
<fieldset class="cart_navigation submit ui-grid-a">
<input type="hidden" class="hidden" name="step" value="3" />
<input type="hidden" name="back" value="{$back}" />
<div class="ui-block-a"><a href="{$link->getPageLink($back_order_page, true, NULL, "step=1{if $back}&back={$back}{/if}")}" title="{l s='Previous'}" data-role="button" data-icon="back" data-ajax="false">&laquo; {l s='Previous'}</a></div>
<div class="ui-block-b"><input type="submit" name="processCarrier" value="{l s='Next'}" class="exclusive" data-icon="check" data-iconpos="right" data-theme="b" data-ajax="false" /></div>
</fieldset>
</form>
{else}
</div>
{/if}
</div><!-- /content -->
<div id="displayMobileShoppingCartBottom">
{hook h="displayMobileShoppingCartBottom"}
</div>
{/if}
themes/default/mobile/order-detail.tpl
+8 -8
View File
@@ -46,8 +46,8 @@
<ul class="info-order" data-role="listview">
{if $carrier->id}<li><strong>{l s='Carrier:'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}</li>{/if}
<li><strong>{l s='Payment method:'}</strong> <span class="color-myaccount">{$order->payment|escape:'htmlall':'UTF-8'}</span></li>
{if $carrier->id}<li><strong>{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}</li>{/if}
<li><strong>{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'htmlall':'UTF-8'}</span></li>
{if $invoice AND $invoiceAllowed}
<li>
<img src="{$img_dir}icon/pdf.gif" alt="" class="icon" />
@@ -59,7 +59,7 @@
{/if}
{if $order->gift}
<li><img src="{$img_dir}icon/gift.gif" alt="" class="icon" />&nbsp;{l s='You have requested gift wrapping for this order.'}</li>
<li>{l s='Message:'} {$order->gift_message|nl2br}</li>
<li>{l s='Message'} {$order->gift_message|nl2br}</li>
{/if}
</ul><!-- .info-order -->
@@ -103,7 +103,7 @@
{/if}
{if $order->gift}
<p><img src="{$img_dir}icon/gift.gif" alt="" class="icon" />&nbsp;{l s='You have requested gift wrapping for this order.'}</p>
<p>{l s='Message:'} {$order->gift_message|nl2br}</p>
<p>{l s='Message'} {$order->gift_message|nl2br}</p>
{/if}
{* / TO CHECK ==========================*}
@@ -161,7 +161,7 @@
{foreach from=$discounts item=discount}
<li class="item">
<h3>{$discount.name|escape:'htmlall':'UTF-8'}</h3>
<p>{l s='Voucher:'} {$discount.name|escape:'htmlall':'UTF-8'}</p>
<p>{l s='Voucher'} {$discount.name|escape:'htmlall':'UTF-8'}</p>
<p><span class="order_qte_span editable">1</span></p>
<p>&nbsp;</p>
<p>{if $discount.value != 0.00}{l s='-'}{/if}{convertPriceWithCurrency price=$discount.value currency=$currency}</p>
@@ -173,7 +173,7 @@
{* / TO CHECK ==========================*}
{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>
{l s='Total products (tax excl.)'} <span class="price">{displayWtPriceWithCurrency price=$order->getTotalProductsWithoutTaxes() currency=$currency}</span>
</tr>
{/if}
<li data-theme="b" class="item">
@@ -193,7 +193,7 @@
{l s='Total shipping'} {if $use_tax}{l s='(tax incl.)'}{/if}: <span class="price-shipping">{displayWtPriceWithCurrency price=$order->total_shipping currency=$currency}</span>
</li>
<li data-theme="a" class="totalprice item">
{l s='Total:'} <span class="price">{displayWtPriceWithCurrency price=$order->total_paid currency=$currency}</span>
{l s='Total'} <span class="price">{displayWtPriceWithCurrency price=$order->total_paid currency=$currency}</span>
</li>
</ul>
<!-- /order details -->
@@ -274,7 +274,7 @@
{/if}
{* / TO CHECK ==========================*}
<form action="{$link->getPageLink('order-detail', true)}" method="post" class="std" id="sendOrderMessage">
<h3 class="bg">{l s='Add a message:'}</h3>
<h3 class="bg">{l s='Add a message'}</h3>
<p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
<fieldset>
<label for="id_product">{l s='Product'}</label>
themes/default/mobile/order-opc-carrier.tpl
+1 -1
View File
@@ -58,7 +58,7 @@
<h3 class="bg">{l s='Terms of service'}</h3>
<fieldset data-role="fieldcontain" id="cgv_checkbox">
<input type="checkbox" value="1" id="cgv" name="cgv" {if $checkedTOS}checked="checked"{/if} />
<label for="cgv">{l s='I agree to the Terms of Service and will adhere to them unconditionally.'}</label>
<label for="cgv">{l s='I agree to the terms of service and will adhere to them unconditionally.'}</label>
</fieldset>
<p class="lnk_CGV"><a href="{$link_conditions}" data-ajax="false">{l s='(Read Terms of Service)'}</a></p>
</div>
themes/default/mobile/order-payment.tpl
+337
View File
@@ -0,0 +1,337 @@
{if !$opc}
<script type="text/javascript">
// <![CDATA[
var currencySign = '{$currencySign|html_entity_decode:2:"UTF-8"}';
var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}';
var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product' js=1}";
var txtProducts = "{l s='products' js=1}";
// ]]>
</script>
{/if}
{if isset($empty)}
<p class="warning">{l s='Your shopping cart is empty.'}</p>
{elseif $PS_CATALOG_MODE}
<p class="warning">{l s='This store has not accepted your new order.'}</p>
{else}
<div id="displayMobileShoppingCartTop">
{hook h="displayMobileShoppingCartTop"}
</div>
<div data-role="content" id="content" class="cart">
{include file="$tpl_dir./errors.tpl"}
<h2>{l s='Your payment method'}</h2>
{if !$opc}
{assign var='current_step' value='payment'}
{include file="$tpl_dir./errors.tpl"}
{else}
<div id="opc_payment_methods" class="opc-main-block">
<div id="opc_payment_methods-overlay" class="opc-overlay" style="display: none;"></div>
{/if}
<div class="paiement_block">
<div id="HOOK_TOP_PAYMENT">{$HOOK_TOP_PAYMENT}</div>
{if $HOOK_PAYMENT}
{if !$opc}
<div id="order-detail-content" class="table_block">
<table id="cart_summary" class="std ui-responsive table-stroke" data-role="table" data-mode="reflow">
<thead>
<tr>
<th class="cart_product first_item">{l s='Product'}</th>
<th class="cart_description item">{l s='Description'}</th>
<th class="cart_availability item">{l s='Avail.'}</th>
<th class="cart_unit item" style="min-width:100px">{l s='Unit price'}</th>
<th class="cart_quantity item" style="min-width:30px">{l s='Qty'}</th>
<th class="cart_total last_item" style="min-width:100px">{l s='Total'}</th>
</tr>
</thead>
<tfoot>
{if $use_taxes}
{if $priceDisplay}
<tr class="cart_total_price">
<td colspan="5" style="text-align:right;font-weight:bold">{if $display_tax_label}{l s='Total products (tax excl.):'}{else}{l s='Total products:'}{/if}</td>
<td class="price" id="total_product">{displayPrice price=$total_products}</td>
</tr>
{else}
<tr class="cart_total_price">
<td colspan="5" style="text-align:right;font-weight:bold">{if $display_tax_label}{l s='Total products (tax incl.):'}{else}{l s='Total products:'}{/if}</td>
<td class="price" id="total_product">{displayPrice price=$total_products_wt}</td>
</tr>
{/if}
{else}
<tr class="cart_total_price">
<td colspan="5" style="text-align:right;font-weight:bold">{l s='Total products:'}</td>
<td class="price" id="total_product">{displayPrice price=$total_products}</td>
</tr>
{/if}
<tr class="cart_total_voucher" {if $total_wrapping == 0}style="display:none"{/if}>
<td colspan="5" style="text-align:right;font-weight:bold">
{if $use_taxes}
{if $priceDisplay}
{if $display_tax_label}{l s='Total gift wrapping (tax excl.):'}{else}{l s='Total gift wrapping cost:'}{/if}
{else}
{if $display_tax_label}{l s='Total gift-wrapping (tax incl.):'}{else}{l s='Total gift wrapping cost:'}{/if}
{/if}
{else}
{l s='Total gift wrapping cost:'}
{/if}
</td>
<td class="price-discount price" id="total_wrapping">
{if $use_taxes}
{if $priceDisplay}
{displayPrice price=$total_wrapping_tax_exc}
{else}
{displayPrice price=$total_wrapping}
{/if}
{else}
{displayPrice price=$total_wrapping_tax_exc}
{/if}
</td>
</tr>
{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
<tr class="cart_total_delivery">
<td colspan="5" style="text-align:right;font-weight:bold">{l s='Shipping:'}</td>
<td class="price" id="total_shipping">{l s='Free Shipping!'}</td>
</tr>
{else}
{if $use_taxes}
{if $priceDisplay}
<tr class="cart_total_delivery" {if $shippingCost <= 0} style="display:none"{/if}>
<td colspan="5" style="text-align:right;font-weight:bold">{if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if}</td>
<td class="price" id="total_shipping">{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{else}
<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none"{/if}>
<td colspan="5" style="text-align:right;font-weight:bold">{if $display_tax_label}{l s='Total shipping (tax incl.):'}{else}{l s='Total shipping:'}{/if}</td>
<td class="price" id="total_shipping" >{displayPrice price=$shippingCost}</td>
</tr>
{/if}
{else}
<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none"{/if}>
<td colspan="5" style="text-align:right;font-weight:bold">{l s='Total shipping:'}</td>
<td class="price" id="total_shipping" >{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{/if}
{/if}
<tr class="cart_total_voucher" {if $total_discounts == 0}style="display:none"{/if}>
<td colspan="5" style="text-align:right;font-weight:bold">
{if $use_taxes}
{if $priceDisplay}
{if $display_tax_label}{l s='Total vouchers (tax excl.):'}{else}{l s='Total vouchers:'}{/if}
{else}
{if $display_tax_label}{l s='Total vouchers (tax incl.):'}{else}{l s='Total vouchers:'}{/if}
{/if}
{else}
{l s='Total vouchers:'}
{/if}
</td>
<td class="price-discount price" id="total_discount">
{if $use_taxes}
{if $priceDisplay}
{displayPrice price=$total_discounts_tax_exc*-1}
{else}
{displayPrice price=$total_discounts*-1}
{/if}
{else}
{displayPrice price=$total_discounts_tax_exc*-1}
{/if}
</td>
</tr>
{if $use_taxes}
{if $priceDisplay && $total_tax != 0}
<tr class="cart_total_tax">
<td colspan="5">{l s='Total tax:'}</td>
<td class="price" id="total_tax" >{displayPrice price=$total_tax}</td>
</tr>
{/if}
<tr class="cart_total_price">
<td colspan="5" id="cart_voucher" class="cart_voucher" style="text-align:right;font-weight:bold">
{l s='Total:'}
{if $voucherAllowed}
{if isset($errors_discount) && $errors_discount}
<ul class="error">
{foreach from=$errors_discount key=k item=error}
<li>{$error|escape:'htmlall':'UTF-8'}</li>
{/foreach}
</ul>
{/if}
{/if}
</td>
<td class="price total_price_container" id="total_price_container">
<span>{displayPrice price=$total_price}</span>
</td>
</tr>
{else}
<tr class="cart_total_price">
<td colspan="5" id="cart_voucher" class="cart_voucher" style="text-align:right;font-weight:bold">
{l s='Total:'}
{if $voucherAllowed}
<div id="cart_voucher" class="table_block">
{if isset($errors_discount) && $errors_discount}
<ul class="error">
{foreach from=$errors_discount key=k item=error}
<li>{$error|escape:'htmlall':'UTF-8'}</li>
{/foreach}
</ul>
{/if}
{if $voucherAllowed}
<form action="{if $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}" method="post" id="voucher">
<fieldset>
<p class="title_block"><label for="discount_name">{l s='Vouchers'}</label></p>
<p>
<input type="text" id="discount_name" name="discount_name" value="{if isset($discount_name) && $discount_name}{$discount_name}{/if}" />
</p>
<p class="submit"><input type="hidden" name="submitDiscount" /><input type="submit" name="submitAddDiscount" value="{l s='ok'}" class="button" /></p>
{if $displayVouchers}
<p id="title" class="title_offers">{l s='Take advantage of our offers:'}</p>
<div id="display_cart_vouchers">
{foreach from=$displayVouchers item=voucher}
<span onclick="$('#discount_name').val('{$voucher.name}');return false;" class="voucher_name">{$voucher.name}</span> - {$voucher.description} <br />
{/foreach}
</div>
{/if}
</fieldset>
</form>
{/if}
</div>
{/if}
</td>
<td class="price total_price_container" id="total_price_container">
<span id="total_price">{displayPrice price=$total_price_without_tax}</span>
</td>
</tr>
{/if}
</tfoot>
<tbody>
{foreach from=$products item=product name=productLoop}
{assign var='mobile_template_dir' value=$smarty.const._PS_THEME_MOBILE_DIR_}
{assign var='productId' value=$product.id_product}
{assign var='productAttributeId' value=$product.id_product_attribute}
{assign var='quantityDisplayed' value=0}
{assign var='cannotModify' value=1}
{assign var='odd' value=$product@iteration%2}
{assign var='noDeleteButton' value=1}
{* Display the product line *}
{include file="$mobile_template_dir./shopping-cart-product-line.tpl"}
{* Then the customized datas ones*}
{if isset($customizedDatas.$productId.$productAttributeId)}
{foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization'}
<tr id="product_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" class="alternate_item cart_item">
<td colspan="4">
{foreach from=$customization.datas key='type' item='datas'}
{if $type == $CUSTOMIZE_FILE}
<div class="customizationUploaded">
<ul class="customizationUploaded">
{foreach from=$datas item='picture'}
<li>
<img src="{$pic_dir}{$picture.value}_small" alt="" class="customizationUploaded" />
</li>
{/foreach}
</ul>
</div>
{elseif $type == $CUSTOMIZE_TEXTFIELD}
<ul class="typedText">
{foreach from=$datas item='textField' name='typedText'}
<li>
{if $textField.name}
{l s='%s:' sprintf=$textField.name}
{else}
{l s='Text #%s:' sprintf=$smarty.foreach.typedText.index+1}
{/if}
{$textField.value}
</li>
{/foreach}
</ul>
{/if}
{/foreach}
</td>
<td class="cart_quantity">
{if isset($cannotModify) AND $cannotModify == 1}
<span style="float:left">{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}</span>
{else}
<div style="float:right">
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" title="{l s='Delete this customization'}" width="11" height="13" class="icon" /></a>
</div>
<div id="cart_quantity_button" style="float:left">
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br />
{if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1}
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}">
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" />
</a>
{else}
<a class="cart_quantity_down" style="opacity: 0.3;" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}" href="#" title="{l s='Subtract'}">
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" />
</a>
{/if}
</div>
<input type="hidden" value="{$customization.quantity}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_hidden"/>
<input size="2" type="text" value="{$customization.quantity}" class="cart_quantity_input" name="quantity_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"/>
{/if}
</td>
<td class="cart_total"></td>
</tr>
{assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity}
{/foreach}
{* If it exists also some uncustomized products *}
{if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl"}{/if}
{/if}
{/foreach}
{assign var='last_was_odd' value=$product@iteration%2}
{foreach $gift_products as $product}
{assign var='productId' value=$product.id_product}
{assign var='productAttributeId' value=$product.id_product_attribute}
{assign var='quantityDisplayed' value=0}
{assign var='odd' value=($product@iteration+$last_was_odd)%2}
{assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)}
{assign var='cannotModify' value=1}
{* Display the gift product line *}
{include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first}
{/foreach}
</tbody>
{if count($discounts)}
<tbody>
{foreach from=$discounts item=discount name=discountLoop}
<tr class="cart_discount {if $smarty.foreach.discountLoop.last}last_item{elseif $smarty.foreach.discountLoop.first}first_item{else}item{/if}" id="cart_discount_{$discount.id_discount}">
<td class="cart_discount_name" colspan="2">{$discount.name}</td>
<td class="cart_discount_description" colspan="3">{$discount.description}</td>
<td class="cart_discount_price">
<span class="price-discount">
{if $discount.value_real > 0}
{if !$priceDisplay}
{displayPrice price=$discount.value_real*-1}
{else}
{displayPrice price=$discount.value_tax_exc*-1}
{/if}
{/if}
</span>
</td>
</tr>
{/foreach}
</tbody>
{/if}
</table>
</div>
{/if}
{if $opc}<div id="opc_payment_methods-content">{/if}
<div id="HOOK_PAYMENT">{$HOOK_PAYMENT}</div>
{if $opc}</div>{/if}
{else}
<p class="warning">{l s='No payment modules have been installed.'}</p>
{/if}
{if !$opc}
<p class="cart_navigation"><a href="{$link->getPageLink('order', true, NULL, "step=2{if $back}&back={$back}{/if}")}" title="{l s='Previous'}" data-role="button" data-icon="back" data-ajax="false">&laquo; {l s='Previous'}</a></p>
{else}
</div>
{/if}
</div>
</div><!-- /content -->
<div id="displayMobileShoppingCartBottom">
{hook h="displayMobileShoppingCartBottom"}
</div>
{/if}
themes/default/mobile/password.tpl
+1 -1
View File
@@ -35,7 +35,7 @@
<p>{l s='Please enter the email address you used to register. We will then send you a new password. '}</p>
<form action="{$request_uri|escape:'htmlall':'UTF-8'}" method="post" class="std" id="form_forgotpassword">
<fieldset>
<label for="email">{l s='Email:'}</label>
<label for="email">{l s='Email'}</label>
<input type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
<input type="submit" class="button" data-theme="a" value="{l s='Retrieve Password'}" />
</fieldset>
themes/default/mobile/product-attributes.tpl
+2 -2
View File
@@ -34,13 +34,13 @@
{if ($group.group_type == 'select' || $group.group_type == 'color')}
<select name="{$groupName}" id="{$groupName}" class="attribute_select{if ($group.group_type == 'color')} select_color{/if}">
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<option value="{$id_attribute|intval}" title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
<option value="{$id_attribute|intval}" title="{$group_attribute|escape:'htmlall':'UTF-8'}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if}>{$group_attribute|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
{elseif ($group.group_type == 'radio')}
<fieldset data-role="controlgroup">
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<input type="radio" class="attribute_radio" name="{$groupName}" id="{$groupName}_{$id_attribute}" value="{$id_attribute}">
<input type="radio" class="attribute_radio" name="{$groupName}" id="{$groupName}_{$id_attribute}" value="{$id_attribute}" {if ($group.default == $id_attribute)} checked="checked"{/if}>
<label for="{$groupName}_{$id_attribute}">{$group_attribute|escape:'htmlall':'UTF-8'}</label>
{/foreach}
</fieldset>
themes/default/mobile/search.tpl
+1 -1
View File
@@ -24,7 +24,7 @@
*}
{capture assign='page_title'}
{l s='Search:'}
{l s='Search'}
{if $nbProducts > 0}
"{if isset($search_query) && $search_query}{$search_query|escape:'htmlall':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'htmlall':'UTF-8'}{elseif $ref}{$ref|escape:'htmlall':'UTF-8'}{/if}"
{/if}
themes/default/mobile/shopping-cart-product-line.tpl
+104
View File
@@ -0,0 +1,104 @@
{*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<tr id="product_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}" class="{if isset($productLast) && $productLast && (!isset($ignoreProductLast) || !$ignoreProductLast)}last_item{elseif isset($productFirst) && $productFirst}first_item{/if} {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}alternate_item{/if} cart_item address_{$product.id_address_delivery|intval} {if $odd}odd{else}even{/if}">
<td class="cart_product">
<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')}" alt="{$product.name|escape:'htmlall':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a>
</td>
<td class="cart_description">
<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}">{$product.name|escape:'htmlall':'UTF-8'}</a>
{if isset($product.attributes) && $product.attributes}<p style="font-size:.9em"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}">{$product.attributes|escape:'htmlall':'UTF-8'}</a></p>{/if}
</td>
<td class="cart_ref">{if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td>
<td class="cart_unit">
<span class="price" id="product_price_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
{if !empty($product.gift)}
<span class="gift-icon">{l s='Gift!'}</span>
{else}
{if isset($product.is_discounted) && $product.is_discounted}
<span style="text-decoration:line-through;">{convertPrice price=$product.price_without_specific_price}</span><br />
{/if}
{if !$priceDisplay}
{convertPrice price=$product.price_wt}
{else}
{convertPrice price=$product.price}
{/if}
{/if}
</span>
</td>
<td class="cart_quantity"{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0} style="text-align: center;"{/if}>
{if isset($cannotModify) AND $cannotModify == 1}
<span style="float:left">
{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}
{else}
{$product.cart_quantity-$quantityDisplayed}
{/if}
</span>
{else}
{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}
<span id="cart_quantity_custom_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}" >{$product.customizationQuantityTotal}</span>
{/if}
{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
<div class="cart_quantity_button">
<a rel="nofollow" class="cart_quantity_up" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}" title="{l s='Add'}"><img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" /></a><br />
{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1}
<a rel="nofollow" class="cart_quantity_down" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")}" title="{l s='Subtract'}">
<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" />
</a>
{else}
<a class="cart_quantity_down" style="opacity: 0.3;" href="#" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" title="{l s='You must purchase a minimum of %d of this product.' sprintf=$product.minimal_quantity}">
<img src="{$img_dir}icon/quantity_down.gif" width="14" height="9" alt="{l s='Subtract'}" />
</a>
{/if}
</div>
<input type="hidden" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}_hidden" />
<input size="2" type="text" autocomplete="off" class="cart_quantity_input" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}" name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" />
{/if}
{/if}
</td>
<td class="cart_total">
<span class="price" id="total_product_price_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
{if !empty($product.gift)}
<span class="gift-icon">{l s='Gift!'}</span>
{else}
{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}
{if !$priceDisplay}{displayPrice price=$product.total_customization_wt}{else}{displayPrice price=$product.total_customization}{/if}
{else}
{if !$priceDisplay}{displayPrice price=$product.total_wt}{else}{displayPrice price=$product.total}{/if}
{/if}
{/if}
</span>
</td>
{if !isset($noDeleteButton) || !$noDeleteButton}
<td class="cart_delete">
{if (!isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed) > 0 && empty($product.gift)}
<div>
<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}">{l s='Delete'}</a>
</div>
{/if}
</td>
{/if}
</tr>
themes/default/mobile/shopping-cart.tpl
+12 -12
View File
@@ -101,22 +101,22 @@
<div class="ui-bar ui-bar-c">
{if $use_taxes}
{if $priceDisplay}
<h3>{if $display_tax_label}{l s='Total products (tax excl.):'}{else}{l s='Total products:'}{/if}</h3>
<h3>{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}</h3>
<p><span class="price" id="total_product">{displayPrice price=$total_products}</span></p>
{else}
<h3>{if $display_tax_label}{l s='Total products (tax incl.):'}{else}{l s='Total products:'}{/if}</h3>
<h3>{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}</h3>
<p><span class="price" id="total_product">{displayPrice price=$total_products_wt}</span></p>
{/if}
{else}
<h3>{l s='Total products:'}</h3>
<h3>{l s='Total products'}</h3>
<p><span class="price" id="total_product">{displayPrice price=$total_products}</span></p>
{/if}
<div {if $total_discounts == 0}class="hide"{/if}>
{if $use_taxes && $display_tax_label}
<h3>{l s='Total vouchers (tax excl.):'}</h3>
<h3>{l s='Total vouchers (tax excl.)'}</h3>
{else}
<h3>{l s='Total vouchers:'}</h3>
<h3>{l s='Total vouchers'}</h3>
{/if}
{if $use_taxes && !$priceDisplay}
@@ -150,35 +150,35 @@
{if $use_taxes}
{if $total_shipping_tax_exc <= 0 && !isset($virtualCart)}
<h3>{l s='Shipping:'}</h3>
<h3>{l s='Shipping'}</h3>
<p><span class="price" id="total_shipping">{l s='Free Shipping!'}</span></p>
{else}
{if $priceDisplay}
<div {if $total_shipping_tax_exc <= 0}class="hide"{/if}>
<h3>{if $display_tax_label}{l s='Total shipping (tax excl.):'}{else}{l s='Total shipping:'}{/if}</h3>
<h3>{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</h3>
<p><span class="price" id="total_shipping">{displayPrice price=$total_shipping_tax_exc}</span></p>
</div>
{else}
<div {if $total_shipping <= 0}class="hide"{/if}>
<h3>{if $display_tax_label}{l s='Total shipping (tax incl.):'}{else}{l s='Total shipping:'}{/if}</h3>
<h3>{if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if}</h3>
<p><span class="price" id="total_shipping">{displayPrice price=$total_shipping}</span></p>
</div>
{/if}
{/if}
{else}
<div {if $total_shipping_tax_exc <= 0}class="hide"{/if}>
<h3>{l s='Total shipping:'}</h3>
<h3>{l s='Total shipping'}</h3>
<p><span class="price" id="total_shipping">{displayPrice price=$total_shipping_tax_exc}</span></p>
</div>
{/if}
{if $use_taxes}
<h3>{l s='Total (tax excl.):'}</h3>
<h3>{l s='Total (tax excl.)'}</h3>
<p><span class="price" id="total_price_without_tax">{displayPrice price=$total_price_without_tax}</span></p>
<h3>{l s='Total tax:'}</h3>
<h3>{l s='Total tax'}</h3>
<p><span class="price" id="total_tax">{displayPrice price=$total_tax}</span></p>
{/if}
<h3>{l s='Total:'}</h3>
<h3>{l s='Total'}</h3>
{if $use_taxes}
<p><span class="price" id="total_price">{displayPrice price=$total_price}</span></p>
{else}
themes/default/mobile/stores.tpl
+4 -4
View File
@@ -37,10 +37,10 @@
var defaultLong = '{$defaultLong}';
var translation_1 = '{l s='No stores were found. Please try selecting a wider radius.' js=1}';
var translation_2 = '{l s='store found - see details:' js=1}';
var translation_3 = '{l s='stores found - see all results:' js=1}';
var translation_2 = '{l s='store found -- see details:' js=1}';
var translation_3 = '{l s='stores found -- view all results:' js=1}';
var translation_4 = '{l s='Phone:' js=1}';
var translation_5 = '{l s='Get Directions' js=1}';
var translation_5 = '{l s='Get directions' js=1}';
var translation_6 = '{l s='Not found' js=1}';
var hasStoreIcon = '{$hasStoreIcon}';
@@ -68,7 +68,7 @@
<div id="stores_search_block">
<button type="submit" data-theme="a" name="submit" value="submit-value" class="ui-btn-hidden" aria-disabled="false">
{l s='Search:'}
{l s='Search'}
</button>
</div>
themes/default/mobile/test.tpl
-61
View File
@@ -1,61 +0,0 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/afl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div data-role="content" id="content">
<div id="slider">
<img src="img/slider.jpg" width="100%" />
</div>
<!--<ul data-role="listview" data-inset="true" id="category">
<li><a href="category.html" data-ajax="false">Category 1</a></li>
<li><a href="category.html" data-ajax="false">Category 2</a></li>
<li><a href="category.html" data-ajax="false">Category 3</a></li>
<li><a href="category.html" data-ajax="false">Category 4</a></li>
</ul>--><!-- /category -->
<hr width="99%" align="center" size="2" />
<div id="newsletter">
<p>Newsletter</p>
<form action="form.php" method="post">
<div data-role="fieldcontain">
<label for="name">Your email:</label>
<input type="text" name="name" id="name" value="" />
<div data-theme="a" class="ui-btn ui-btn-corner-all ui-shadow ui-btn-up-a" aria-disabled="false">
<span aria-hidden="true" class="ui-btn-inner ui-btn-corner-all"><span class="ui-btn-text">OK</span></span>
</div>
</div>
</form>
</div><!-- /newsletter -->
<hr width="99%" align="center" size="2" />
<ul data-role="listview" data-inset="true" id="category">
<li><a href="index.html" data-ajax="false">Accueil</a></li>
<li><a href="category.html" data-ajax="false">IPod</a></li>
<li><a href="category.html" data-ajax="false">Accessoires</a></li>
<li><a href="my-account.html" data-ajax="false">Mon compte</a></li>
<li><a href="contact.html" data-ajax="false">Contact</a></li>
</ul>
</div><!-- /content -->