Skip to content
Browse files

Theme Reset. New files/syntax included in Prestashop 1.5 RC1 'default…

…' theme
  • Loading branch information...
1 parent cc9c29d commit f4c64c6f25d8d92a6720e307cd1324779956de32 @heskethm committed
Showing with 8,513 additions and 5,164 deletions.
  1. +20 −22 404.tpl
  2. +31 −68 address.tpl
  3. +18 −16 addresses.tpl
  4. +279 −207 authentication.tpl
  5. +4 −2 best-sales.tpl
  6. +11 −3 breadcrumb.tpl
  7. +3 −3 cache/index.php
  8. +2 −2 category-cms-tree-branch.tpl
  9. +10 −7 category-count.tpl
  10. +2 −2 category-tree-branch.tpl
  11. +58 −32 category.tpl
  12. +6 −6 cms.tpl
  13. +6 −6 contact-form.tpl
  14. +103 −0 css/addresses.css
  15. +82 −0 css/authentication.css
  16. +64 −0 css/category.css
  17. 0 css/cms.css
  18. +95 −0 css/comparator.css
  19. +51 −0 css/contact-form.css
  20. +1,849 −9 css/global.css
  21. +0 −84 css/global.less
  22. +138 −0 css/grid_prestashop.css
  23. +83 −0 css/history.css
  24. +82 −0 css/identity.css
  25. +0 −17 css/less/common.less
  26. +0 −16 css/less/grid.less
  27. +0 −506 css/less/normalize.less
  28. +0 −15 css/less/print.less
  29. +0 −123 css/less/typography.less
  30. +12 −0 css/maintenance.css
  31. +21 −0 css/my-account.css
  32. +82 −0 css/order-opc.css
  33. +381 −0 css/product.css
  34. +146 −0 css/product_list.css
  35. 0 css/restricted-country.css
  36. +148 −0 css/scenes.css
  37. +38 −0 css/sitemap.css
  38. +43 −0 css/stores.css
  39. +16 −17 discount.tpl
  40. +5 −5 errors.tpl
  41. +4 −4 footer.tpl
  42. +26 −22 guest-tracking.tpl
  43. +86 −108 header.tpl
  44. +18 −14 history.tpl
  45. +24 −24 identity.tpl
  46. BIN img/address_alias_full_width.gif
  47. BIN img/address_alias_left.gif
  48. BIN img/address_alias_right.gif
  49. BIN img/ajax-loader.gif
  50. BIN img/arrow_right_1.png
  51. BIN img/arrow_right_2.png
  52. BIN img/arrow_rotate_anticlockwise.png
  53. BIN img/bg_404.png
  54. BIN img/bg_account.jpg
  55. BIN img/bg_address_title.png
  56. BIN img/bg_bt.gif
  57. BIN img/bg_bt_2.gif
  58. BIN img/bg_bt_compare.gif
  59. BIN img/bg_bt_newsletter_ok.png
  60. BIN img/bg_cart_voucher_submit.png
  61. BIN img/bg_discount_name.png
  62. BIN img/bg_form_h3.png
  63. BIN img/bg_input.png
  64. BIN img/bg_li_idTabs.png
  65. BIN img/bg_maintenance.png
  66. BIN img/bg_reduction.png
  67. BIN img/bg_search_input.png
  68. BIN img/bg_search_submit.png
  69. BIN img/bg_table_th.png
  70. BIN img/block_bg.jpg
  71. BIN img/block_bg_myaccount.jpg
  72. BIN img/block_category_item_bg.jpg
  73. BIN img/block_exclusive_bg.jpg
  74. BIN img/block_exclusive_footer.jpg
  75. BIN img/block_footer.gif
  76. BIN img/block_footer.png
  77. BIN img/block_footer_myaccount.jpg
  78. BIN img/block_footer_page.gif
  79. BIN img/block_footer_page_footer.png
  80. BIN img/block_header.gif
  81. BIN img/block_header.png
  82. BIN img/block_header_exclusive.gif
  83. BIN img/block_header_exclusive.png
  84. BIN img/block_header_exclusive_cart.gif
  85. BIN img/block_header_exclusive_cart.png
  86. BIN img/block_header_large.gif
  87. BIN img/block_header_large.png
  88. BIN img/block_header_myaccount.jpg
  89. BIN img/block_languages_top_p_bg.png
  90. BIN img/block_myaccount_header_large.gif
  91. BIN img/block_search_bg.jpg
  92. BIN img/bullet.gif
  93. BIN img/bullet_alt.jpg
  94. BIN img/bullet_myaccount.gif
  95. BIN img/bullet_price.gif
  96. BIN img/button-account-large.gif
  97. BIN img/button-account-mini.gif
  98. BIN img/button-account-small.gif
  99. BIN img/button-account.gif
  100. BIN img/button-large.gif
  101. BIN img/button-large.png
  102. BIN img/button-large_exclusive.gif
  103. BIN img/button-medium.gif
  104. BIN img/button-medium.png
  105. BIN img/button-medium_exclusive.gif
  106. BIN img/button-medium_exclusive.png
  107. BIN img/button-mini.gif
  108. BIN img/button-mini.png
  109. BIN img/button-mini_exclusive.gif
  110. BIN img/button-small.gif
  111. BIN img/button-small.png
  112. BIN img/button-small_exclusive.gif
  113. BIN img/flag_new_bg.jpg
  114. BIN img/footer_account.gif
  115. BIN img/form-input-bg.gif
  116. BIN img/form_bg.jpg
  117. BIN img/header_account.gif
  118. BIN img/icon/add.gif
  119. BIN img/icon/addrbook.gif
  120. BIN img/icon/available.gif
  121. BIN img/icon/bg_header_user_info_a.gif
  122. BIN img/icon/cancel.gif
  123. BIN img/icon/cancel_11x13.gif
  124. BIN img/icon/cancel_16x18.gif
  125. BIN img/icon/cart.gif
  126. BIN img/icon/cible.gif
  127. BIN img/icon/contact.gif
  128. BIN img/icon/delete.gif
  129. BIN img/icon/download_product.gif
  130. BIN img/icon/error.gif
  131. BIN img/icon/gift.gif
  132. BIN img/icon/home.gif
  133. +3 −3 {js/tools → img/icon}/index.php
  134. BIN img/icon/info.png
  135. BIN img/icon/infos.gif
  136. BIN img/icon/less.gif
  137. BIN img/icon/login.gif
  138. BIN img/icon/logo.gif
  139. BIN img/icon/logout.png
  140. BIN img/icon/magnify.gif
  141. BIN img/icon/more.gif
  142. BIN img/icon/my-account.gif
  143. BIN img/icon/newsletter.png
  144. BIN img/icon/next.gif
  145. BIN img/icon/no.gif
  146. BIN img/icon/order.gif
  147. BIN img/icon/pdf.gif
  148. BIN img/icon/pict_add_cart.png
  149. BIN img/icon/pict_add_wishlist.png
  150. BIN img/icon/picto_fb.png
  151. BIN img/icon/previous.gif
  152. BIN img/icon/print.gif
  153. BIN img/icon/quantity_down.gif
  154. BIN img/icon/quantity_down_off.gif
  155. BIN img/icon/quantity_up.gif
  156. BIN img/icon/recyclable.gif
  157. BIN img/icon/return.gif
  158. BIN img/icon/search.gif
  159. BIN img/icon/send_friend.gif
  160. BIN img/icon/serial_scroll_left.gif
  161. BIN img/icon/serial_scroll_right.gif
  162. BIN img/icon/sitemap.gif
  163. BIN img/icon/slip.gif
  164. BIN img/icon/sort_asc.gif
  165. BIN img/icon/sort_asc_disabled.gif
  166. BIN img/icon/sort_asc_white.gif
  167. BIN img/icon/sort_asc_white.png
  168. BIN img/icon/sort_desc.gif
  169. BIN img/icon/sort_desc_disabled.gif
  170. BIN img/icon/sort_desc_white.gif
  171. BIN img/icon/sort_desc_white.png
  172. BIN img/icon/star.gif
  173. BIN img/icon/unavailable.gif
  174. BIN img/icon/up.gif
  175. BIN img/icon/update.gif
  176. BIN img/icon/userinfo.gif
  177. BIN img/icon/voucher.gif
  178. BIN img/icon/yes.gif
  179. BIN img/icon/zoom.png
  180. +3 −3 {css → img}/index.php
  181. +3 −3 {js → img/jquery}/index.php
  182. BIN img/jquery/macFFBgHack.png
  183. BIN img/logo_paiement_mastercard.jpg
  184. BIN img/logo_paiement_paypal.jpg
  185. BIN img/logo_paiement_visa.jpg
  186. BIN img/nav-logout.gif
  187. BIN img/onsale_en.gif
  188. BIN img/onsale_es.gif
  189. BIN img/onsale_fr.gif
  190. BIN img/pagination-bg-current.gif
  191. BIN img/pagination-next-border.gif
  192. BIN img/pagination-prev-border.gif
  193. BIN img/pagination-prevnext-bg.gif
  194. BIN img/pagination_bg.gif
  195. BIN img/pict_cart_block_h4.png
  196. BIN img/product-buy-bg.gif
  197. BIN img/product-short-desc-bg.gif
  198. BIN img/rss.gif
  199. BIN img/sitemap-horizontal.gif
  200. BIN img/sitemap-horizontal.png
  201. BIN img/sitemap-last.gif
  202. BIN img/sitemap-top.gif
  203. BIN img/sitemap_long.gif
  204. BIN img/step_current.gif
  205. BIN img/step_current_span.gif
  206. BIN img/step_done.gif
  207. BIN img/step_end.gif
  208. BIN img/step_end_current.gif
  209. BIN img/step_standard.gif
  210. BIN img/step_start.gif
  211. BIN img/tab_bg.jpg
  212. BIN img/tab_bg_selected.jpg
  213. BIN img/tab_bg_selected_short.jpg
  214. BIN img/tab_bg_short.jpg
  215. BIN img/table_footer.gif
  216. BIN img/table_header.gif
  217. BIN img/thumbs_left.gif
  218. BIN img/thumbs_right.gif
  219. BIN img/title_bg.gif
  220. BIN img/title_bg.png
  221. BIN img/title_bg_large.gif
  222. +3 −3 index.php
  223. +3 −3 index.tpl
  224. +541 −145 js/cart-summary.js
  225. +2 −2 js/cms.js
  226. +12 −16 js/history.js
  227. +0 −9 js/less-1.3.0.min.js
  228. +0 −36 js/modules/index.php
  229. +41 −34 js/order-address.js
  230. +310 −212 js/order-opc.js
  231. +259 −71 js/product.js
  232. +14 −14 js/products-comparison.js
  233. +5 −5 js/scenes.js
  234. +10 −10 js/stores.js
  235. +26 −2 js/tools.js
  236. +526 −516 lang/de.php
  237. +1 −734 lang/en.php
  238. +613 −561 lang/es.php
  239. +589 −541 lang/fr.php
  240. +3 −3 lang/index.php
  241. +526 −515 lang/it.php
  242. +21 −19 css/modules/index.php → layout.tpl
  243. +5 −4 maintenance.tpl
  244. +15 −14 manufacturer-list.tpl
  245. +19 −6 manufacturer.tpl
  246. +19 −11 my-account.tpl
  247. +70 −0 nbr-product-page.tpl
  248. +7 −5 new-products.tpl
  249. +55 −0 order-address-multishipping-products.tpl
  250. +212 −0 order-address-multishipping.tpl
  251. +82 −0 order-address-product-line.tpl
  252. +81 −44 order-address.tpl
  253. +172 −79 order-carrier.tpl
  254. +8 −8 order-confirmation.tpl
  255. +149 −96 order-detail.tpl
  256. +11 −11 order-follow.tpl
  257. +47 −86 order-opc-new-account.tpl
Sorry, we could not display the entire diff because it was too big.
View
42 404.tpl
@@ -1,5 +1,5 @@
{*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -18,30 +18,28 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2011 PrestaShop SA
-* @version Release: $Revision: 9100 $
+* @copyright 2007-2012 PrestaShop SA
+* @version Release: $Revision: 6594 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
+<div class="pagenotfound">
+ <h1>{l s='Page not available'}</h1>
-<h1>{l s='Page not available'}</h1>
+ <p>
+ {l s='We\'re sorry, but the Web address you entered is no longer available'}
+ </p>
-<p class="error">
- <img src="{$img_dir}icon/error.gif" alt="{l s='Error'}" class="middle" />
- {l s='We\'re sorry, but the Web address you entered is no longer available'}
-</p>
+ <h3>{l s='To find a product, please type its name in the field below'}</h3>
+ <form action="{$link->getPageLink('search.php')}" method="post" class="std">
+ <fieldset>
+ <p>
+ <label for="search">{l s='Search our product catalog:'}</label>
+ <input id="search_query" name="search_query" type="text" />
+ <input type="submit" name="Submit" value="OK" class="button_small" />
+ </p>
+ </fieldset>
+ </form>
-<h3>{l s='To find a product, please type its name in the field below'}</h3>
-
-<form action="{$link->getPageLink('search.php')}" method="get" class="std">
- <fieldset>
- <p>
- <label for="search">{l s='Search our product catalog:'}</label>
- <input id="search_query" class="page404_input" name="search_query" type="text" />
- <input type="submit" name="Submit" value="{l s='Search'}" class="page404_input button_small" />
- </p>
- </fieldset>
- <div class="clear"></div>
-</form>
-
-<p><a href="{$base_dir}" title="{l s='Home'}"><img src="{$img_dir}icon/home.gif" alt="{l s='Home'}" class="icon" /></a><a href="{$base_dir}" title="{l s='Home'}">{l s='Home'}</a></p>
+ <p><a href="{$base_dir}" title="{l s='Home'}"><img src="{$img_dir}icon/home.gif" alt="{l s='Home'}" class="icon" /> {l s='Home'}</a></p>
+</div>
View
99 address.tpl
@@ -1,5 +1,5 @@
{*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -18,40 +18,12 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2011 PrestaShop SA
-* @version Release: $Revision: 8673 $
+* @copyright 2007-2012 PrestaShop SA
+* @version Release: $Revision: 6753 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
-{*
-** Compatibility code for Prestashop older than 1.4.2 using a recent theme
-** Ignore list isn't require here
-** $address exist in every PrestaShop version
-*}
-
-{* Will be deleted for 1.5 version and more *}
-{* If ordered_adr_fields doesn't exist, it's a PrestaShop older than 1.4.2 *}
-{if !isset($ordered_adr_fields)}
- {if isset($address)}
- {counter start=0 skip=1 assign=address_key_number}
- {foreach from=$address key=address_key item=address_value}
- {$ordered_adr_fields.$address_key_number = $address_key}
- {counter}
- {/foreach}
- {else}
- {$ordered_adr_fields.0 = 'company'}
- {$ordered_adr_fields.1 = 'firstname'}
- {$ordered_adr_fields.2 = 'lastname'}
- {$ordered_adr_fields.3 = 'address1'}
- {$ordered_adr_fields.4 = 'address2'}
- {$ordered_adr_fields.5 = 'postcode'}
- {$ordered_adr_fields.6 = 'city'}
- {$ordered_adr_fields.7 = 'country'}
- {$ordered_adr_fields.8 = 'state'}
- {/if}
-{/if}
-
<script type="text/javascript">
// <![CDATA[
idSelectedCountry = {if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address->id_state)}{$address->id_state|intval}{else}false{/if}{/if};
@@ -73,7 +45,7 @@ countriesNeedZipCode = new Array();
{/if}
{/foreach}
$(function(){ldelim}
- $('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state}{else}{if isset($address->id_state)}{$address->id_state|escape:'htmlall':'UTF-8'}{/if}{/if}]').attr('selected', 'selected');
+ $('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state}{else}{if isset($address->id_state)}{$address->id_state|escape:'htmlall':'UTF-8'}{/if}{/if}]').attr('selected', true);
{rdelim});
{if $vat_management}
{literal}
@@ -102,7 +74,7 @@ $(function(){ldelim}
<h3>
{if isset($id_address) && (isset($smarty.post.alias) || isset($address->alias))}
- {l s='Modify address'}
+ {l s='Modify address'}
{if isset($smarty.post.alias)}
"{$smarty.post.alias}"
{else}
@@ -115,7 +87,9 @@ $(function(){ldelim}
{include file="$tpl_dir./errors.tpl"}
-<form action="{$link->getPageLink('address.php', true)}" method="post" class="std">
+<p class="required"><sup>*</sup> {l s='Required field'}</p>
+
+<form action="{$link->getPageLink('address', true)}" method="post" class="std" id="add_adress">
<fieldset>
<h3>{if isset($id_address)}{l s='Your address'}{else}{l s='New address'}{/if}</h3>
<p class="required text dni">
@@ -138,33 +112,31 @@ $(function(){ldelim}
</p>
</div>
</div>
- {assign var="stateExist" value="false"}
- {foreach from=$ordered_adr_fields item=field_name}
+ {assign var="stateExist" value="false"}
+ {foreach from=$ordered_adr_fields item=field_name}
{if $field_name eq 'company'}
- <p class="text">
+ <p class="text">
+ <input type="hidden" name="token" value="{$token}" />
<label for="company">{l s='Company'}</label>
<input type="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{else}{if isset($address->company)}{$address->company|escape:'htmlall':'UTF-8'}{/if}{/if}" />
</p>
{/if}
{if $field_name eq 'firstname'}
<p class="required text">
- <label for="firstname">{l s='First name'}</label>
+ <label for="firstname">{l s='First name'} <sup>*</sup></label>
<input type="text" name="firstname" id="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{else}{if isset($address->firstname)}{$address->firstname|escape:'htmlall':'UTF-8'}{/if}{/if}" />
- <sup>*</sup>
</p>
{/if}
{if $field_name eq 'lastname'}
<p class="required text">
- <label for="lastname">{l s='Last name'}</label>
+ <label for="lastname">{l s='Last name'} <sup>*</sup></label>
<input type="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{else}{if isset($address->lastname)}{$address->lastname|escape:'htmlall':'UTF-8'}{/if}{/if}" />
- <sup>*</sup>
</p>
{/if}
{if $field_name eq 'address1'}
<p class="required text">
- <label for="address1">{l s='Address'}</label>
+ <label for="address1">{l s='Address'} <sup>*</sup></label>
<input type="text" id="address1" name="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{else}{if isset($address->address1)}{$address->address1|escape:'htmlall':'UTF-8'}{/if}{/if}" />
- <sup>*</sup>
</p>
{/if}
{if $field_name eq 'address2'}
@@ -175,26 +147,26 @@ $(function(){ldelim}
{/if}
{if $field_name eq 'postcode'}
<p class="required postcode text">
- <label for="postcode">{l s='Zip / Postal Code'}</label>
+ <label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'htmlall':'UTF-8'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
- <sup>*</sup>
</p>
{/if}
{if $field_name eq 'city'}
<p class="required text">
- <label for="city">{l s='City'}</label>
+ <label for="city">{l s='City'} <sup>*</sup></label>
<input type="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{else}{if isset($address->city)}{$address->city|escape:'htmlall':'UTF-8'}{/if}{/if}" maxlength="64" />
- <sup>*</sup>
</p>
- <!-- If the merchant has not updated his layout address, country has to be verified - however it's deprecated -->
+ {*
+ if customer hasn't update his layout address, country has to be verified
+ but it's deprecated
+ *}
{/if}
{if $field_name eq 'Country:name' || $field_name eq 'country'}
<p class="required select">
- <label for="id_country">{l s='Country'}</label>
+ <label for="id_country">{l s='Country'} <sup>*</sup></label>
<select id="id_country" name="id_country">{$countries_list}</select>
- <sup>*</sup>
</p>
- {if isset($vatnumber_ajax_call) && $vatnumber_ajax_call}
+ {if $vatnumber_ajax_call}
<script type="text/javascript">
var ajaxurl = '{$ajaxurl}';
{literal}
@@ -216,38 +188,34 @@ $(function(){ldelim}
}
});
});
-
});
{/literal}
</script>
{/if}
{/if}
- {if $field_name eq 'State:name' || $field_name eq 'state'}
+ {if $field_name eq 'State:name'}
{assign var="stateExist" value="true"}
<p class="required id_state select">
- <label for="id_state">{l s='State'}</label>
+ <label for="id_state">{l s='State'} <sup>*</sup></label>
<select name="id_state" id="id_state">
<option value="">-</option>
</select>
- <sup>*</sup>
</p>
{/if}
{/foreach}
- <p><input type="hidden" name="token" value="{$token}" /></p>
{if $stateExist eq "false"}
<p class="required id_state select">
- <label for="id_state">{l s='State'}</label>
+ <label for="id_state">{l s='State'} <sup>*</sup></label>
<select name="id_state" id="id_state">
<option value="">-</option>
</select>
- <sup>*</sup>
</p>
{/if}
<p class="textarea">
<label for="other">{l s='Additional information'}</label>
<textarea id="other" name="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other|escape:'htmlall':'UTF-8'}{/if}{/if}</textarea>
</p>
- <p style="margin-left:50px;">{l s='You must register at least one phone number'} <sup style="color:red;">*</sup></p>
+ <p class="inline-infos required">{l s='You must register at least one phone number'} <sup class="required">*</sup></p>
<p class="text">
<label for="phone">{l s='Home phone'}</label>
<input type="text" id="phone" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone|escape:'htmlall':'UTF-8'}{/if}{/if}" />
@@ -256,21 +224,16 @@ $(function(){ldelim}
<label for="phone_mobile">{l s='Mobile phone'}</label>
<input type="text" id="phone_mobile" name="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{else}{if isset($address->phone_mobile)}{$address->phone_mobile|escape:'htmlall':'UTF-8'}{/if}{/if}" />
</p>
- <p class="required text" id="address_alias">
- <label for="alias">{l s='Assign an address title for future reference'}</label>
- <input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else}{if isset($address->alias)}{$address->alias|escape:'htmlall':'UTF-8'}{/if}{if isset($select_address)}{else}{l s='My address'}{/if}{/if}" />
- <sup>*</sup>
+ <p class="required text" id="adress_alias">
+ <label for="alias">{l s='Assign an address title for future reference'} <sup>*</sup></label>
+ <input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias|escape:'htmlall':'UTF-8'}{else if isset($select_address)}{l s='My address'}{/if}" />
</p>
</fieldset>
- <p class="submit2 address_navigation" style="padding:0">
+ <p class="submit2">
{if isset($id_address)}<input type="hidden" name="id_address" value="{$id_address|intval}" />{/if}
{if isset($back)}<input type="hidden" name="back" value="{$back}" />{/if}
{if isset($mod)}<input type="hidden" name="mod" value="{$mod}" />{/if}
{if isset($select_address)}<input type="hidden" name="select_address" value="{$select_address|intval}" />{/if}
- <a class="button" href="{$link->getPageLink('addresses.php', true)}" title="{l s='Previous'}">&laquo; {l s='Previous'}</a>
<input type="submit" name="submitAddress" id="submitAddress" value="{l s='Save'}" class="button" />
- <br class="clear"/>
</p>
- <p class="required"><sup>*</sup>{l s='Required field'}</p>
</form>
-
View
34 addresses.tpl
@@ -1,5 +1,5 @@
{*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -18,8 +18,8 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2011 PrestaShop SA
-* @version Release: $Revision: 8088 $
+* @copyright 2007-2012 PrestaShop SA
+* @version Release: $Revision: 6664 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
@@ -40,8 +40,8 @@
{$ignoreList.6 = "date_add"}
{$ignoreList.7 = "date_upd"}
{$ignoreList.8 = "active"}
- {$ignoreList.9 = "deleted"}
-
+ {$ignoreList.9 = "deleted"}
+
{* PrestaShop < 1.4.2 compatibility *}
{if isset($addresses)}
{$address_number = 0}
@@ -81,23 +81,24 @@
{literal}
$(document).ready(function()
{
- resizeAddressesBox();
+ resizeAddressesBox();
});
{/literal}
//]]>
</script>
-{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My addresses'}{/capture}
+{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My addresses'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h1>{l s='My addresses'}</h1>
-<p>{l s='Please configure the desired billing and delivery addresses to be preselected when placing an order. You may also add additional addresses, useful for sending gifts or receiving your order at the office.'}</p>
+<p>{l s='Please configure your default billing and delivery addresses when placing an order. You may also add additional addresses, which can be useful for sending gifts or receiving an order at your office.'}</p>
{if isset($multipleAddresses) && $multipleAddresses}
<div class="addresses">
<h3>{l s='Your addresses are listed below.'}</h3>
<p>{l s='Be sure to update them if they have changed.'}</p>
{assign var="adrs_style" value=$addresses_style}
+ <div class="bloc_adresses clearfix">
{foreach from=$multipleAddresses item=address name=myLoop}
<ul class="address {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{else}item{/if}">
<li class="address_title">{$address.object.alias}</li>
@@ -105,25 +106,26 @@
{assign var=addressKey value=" "|explode:$pattern}
<li>
{foreach from=$addressKey item=key name="word_loop"}
- <span class="{if isset($addresses_style[$key])}{$addresses_style[$key]}{/if}">
- {$address.formated[$key]|escape:'htmlall':'UTF-8'}
+ <span{if isset($addresses_style[$key])} class="{$addresses_style[$key]}"{/if}>
+ {$address.formated[$key|replace:',':'']|escape:'htmlall':'UTF-8'}
</span>
{/foreach}
</li>
{/foreach}
- <li class="address_update"><a href="{$link->getPageLink('address.php', true)}?id_address={$address.object.id|intval}" title="{l s='Update'}">{l s='Update'}</a></li>
- <li class="address_delete"><a href="{$link->getPageLink('address.php', true)}?id_address={$address.object.id|intval}&amp;delete" onclick="return confirm('{l s='Are you sure?'}');" title="{l s='Delete'}">{l s='Delete'}</a></li>
+ <li class="address_update"><a href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}")}" title="{l s='Update'}">&raquo; {l s='Update'}</a></li>
+ <li class="address_delete"><a href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}&delete")}" onclick="return confirm('{l s='Are you sure?'}');" title="{l s='Delete'}">&raquo; {l s='Delete'}</a></li>
</ul>
{/foreach}
+ </div>
<p class="clear" />
</div>
{else}
- <p class="warning">{l s='No addresses available.'}&nbsp;<a href="{$link->getPageLink('address.php', true)}">{l s='Add new address'}</a></p>
+ <p class="warning">{l s='No addresses available.'}&nbsp;<a href="{$link->getPageLink('address', true)}">{l s='Add new address'}</a></p>
{/if}
-<div class="clear address_add"><a href="{$link->getPageLink('address.php', true)}" title="{l s='Add an address'}" class="button_large">{l s='Add an address'}</a></div>
+<div class="clear address_add"><a href="{$link->getPageLink('address', true)}" title="{l s='Add an address'}" class="button_large">{l s='Add an address'}</a></div>
<ul class="footer_links">
- <li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account'}</a></li>
- <li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir}">{l s='Home'}</a></li>
+ <li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /> {l s='Back to your account'}</a></li>
+ <li class="f_right"><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /> {l s='Home'}</a></li>
</ul>
View
486 authentication.tpl
@@ -1,5 +1,5 @@
{*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -18,33 +18,12 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2011 PrestaShop SA
-* @version Release: $Revision: 9376 $
+* @copyright 2007-2012 PrestaShop SA
+* @version Release: $Revision: 6594 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
-{*
-** Compatibility code for Prestashop older than 1.4.2 using a recent theme
-** Ignore list isn't require here
-** $address exist in every PrestaShop version
-*}
-
-{* Will be deleted for 1.5 version and more *}
-{* Smarty code compatibility v2 *}
-{* If ordered_adr_fields doesn't exist, it's a PrestaShop older than 1.4.2 *}
-{if !isset($dlv_all_fields)}
- {$dlv_all_fields.0 = 'company'}
- {$dlv_all_fields.1 = 'firstname'}
- {$dlv_all_fields.2 = 'lastname'}
- {$dlv_all_fields.3 = 'address1'}
- {$dlv_all_fields.4 = 'address2'}
- {$dlv_all_fields.5 = 'postcode'}
- {$dlv_all_fields.6 = 'city'}
- {$dlv_all_fields.7 = 'country'}
- {$dlv_all_fields.8 = 'state'}
-{/if}
-
{capture name=path}{l s='Login'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
@@ -71,7 +50,7 @@ countriesNeedZipCode = new Array();
{/foreach}
{/if}
$(function(){ldelim}
- $('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state}{else}{if isset($address)}{$address->id_state|escape:'htmlall':'UTF-8'}{/if}{/if}]').attr('selected', 'selected');
+ $('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state}{else}{if isset($address)}{$address->id_state|escape:'htmlall':'UTF-8'}{/if}{/if}]').attr('selected', true);
{rdelim});
//]]>
{if $vat_management}
@@ -92,6 +71,7 @@ $(function(){ldelim}
{/literal}
{/if}
</script>
+
<h1>{if !isset($email_create)}{l s='Log in'}{else}{l s='Create your account'}{/if}</h1>
{assign var='current_step' value='login'}
{include file="$tpl_dir./order-steps.tpl"}
@@ -99,117 +79,195 @@ $(function(){ldelim}
{include file="$tpl_dir./errors.tpl"}
{assign var='stateExist' value=false}
{if !isset($email_create)}
- <form action="{$link->getPageLink('authentication.php', true)}" method="post" id="create-account_form" class="std">
+ <script type="text/javascript">
+ {literal}
+ $(document).ready(function(){
+ $('#create-account_form').submit(function(){
+ submitFunction();
+ return false;
+ });
+ $('#SubmitCreate').click(function(){
+ submitFunction();
+ });
+ });
+ function submitFunction()
+ {
+ $('#create_account_error').html('').hide();
+ //send the ajax request to the server
+ $.ajax({
+ type: 'POST',
+ url: baseDir + 'index.php',
+ async: true,
+ cache: false,
+ dataType : "json",
+ data: {
+ controller: 'authentication',
+ SubmitCreate: 1,
+ ajax: true,
+ email_create: $('#email_create').val(),
+ token: token
+ },
+ success: function(jsonData)
+ {
+ if (jsonData.hasError)
+ {
+ var errors = '';
+ for(error in jsonData.errors)
+ //IE6 bug fix
+ if(error != 'indexOf')
+ errors += '<li>'+jsonData.errors[error]+'</li>';
+ $('#create_account_error').html('<ol>'+errors+'</ol>').show();
+ }
+ else
+ {
+ // adding a div to display a transition
+ $('#center_column').html('<div id="noSlide">'+$('#center_column').html()+'</div>');
+ $('#noSlide').fadeOut('slow', function(){
+ $('#noSlide').html(jsonData.page);
+ // update the state (when this file is called from AJAX you still need to update the state)
+ updateState();
+ });
+ $('#noSlide').fadeIn('slow');
+ document.location = '#account-creation';
+ }
+ },
+ error: function(XMLHttpRequest, textStatus, errorThrown)
+ {
+ alert("TECHNICAL ERROR: unable to load form.\n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
+ }
+ });
+ }
+ {/literal}
+ </script>
+ <!--{if isset($authentification_error)}
+ <div class="error">
+ {if {$authentification_error|@count} == 1}
+ <p>{l s='There is one error'} :</p>
+ {else}
+ <p>{l s='There are %s errors' sprintf=[$account_error|@count]} :</p>
+ {/if}
+ <ol>
+ {foreach from=$authentification_error item=v}
+ <li>{$v}</li>
+ {/foreach}
+ </ol>
+ </div>
+ {/if}-->
+ <form action="{$link->getPageLink('authentication', true)}" method="post" id="create-account_form" class="std">
<fieldset>
<h3>{l s='Create your account'}</h3>
- <h4>{l s='Enter your e-mail address to create an account'}.</h4>
- <p class="text">
- <label for="email_create">{l s='E-mail address'}</label>
- <span><input type="text" id="email_create" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" /></span>
- </p>
- <p class="submit">
- {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
- <input type="submit" id="SubmitCreate" name="SubmitCreate" class="button_large" value="{l s='Create your account'}" />
- <input type="hidden" class="hidden" name="SubmitCreate" value="{l s='Create your account'}" />
- </p>
+ <div class="form_content clearfix">
+ <h4>{l s='Enter your e-mail address to create an account'}.</h4>
+ <div class="error" id="create_account_error" style="display:none"></div>
+ <p class="text">
+ <label for="email_create">{l s='E-mail address'}</label>
+ <span><input type="text" id="email_create" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" /></span>
+ </p>
+ <p class="submit">
+ {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+ <input type="button" id="SubmitCreate" name="SubmitCreate" class="button_large" value="{l s='Create your account'}" />
+ <input type="hidden" class="hidden" name="SubmitCreate" value="{l s='Create your account'}" />
+ </p>
+ </div>
</fieldset>
</form>
- <form action="{$link->getPageLink('authentication.php', true)}" method="post" id="login_form" class="std">
+
+ <form action="{$link->getPageLink('authentication', true)}" method="post" id="login_form" class="std">
<fieldset>
- <h3>{l s='Already registered ?'}</h3>
- <p class="text">
- <label for="email">{l s='E-mail address'}</label>
- <span><input type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" /></span>
- </p>
- <p class="text">
- <label for="passwd">{l s='Password'}</label>
- <span><input type="password" id="passwd" name="passwd" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" /></span>
- </p>
- <p class="submit">
- {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
- <input type="submit" id="SubmitLogin" name="SubmitLogin" class="button" value="{l s='Log in'}" />
- </p>
- <p class="lost_password"><a href="{$link->getPageLink('password.php')}">{l s='Forgot your password?'}</a></p>
+ <h3>{l s='Already registered?'}</h3>
+ <div class="form_content clearfix">
+ <p class="text">
+ <label for="email">{l s='E-mail address'}</label>
+ <span><input type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" /></span>
+ </p>
+ <p class="text">
+ <label for="passwd">{l s='Password'}</label>
+ <span><input type="password" id="passwd" name="passwd" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" /></span>
+ </p>
+ <p class="lost_password"><a href="{$link->getPageLink('password')}">{l s='Forgot your password?'}</a></p>
+ <p class="submit">
+ {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+ <input type="submit" id="SubmitLogin" name="SubmitLogin" class="button" value="{l s='Log in'}" />
+ </p>
+ </div>
</fieldset>
</form>
+
{if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED}
- <form action="{$link->getPageLink('authentication.php', true)}?back={$back}" method="post" id="new_account_form" class="std">
- <fieldset>
- <h3>{l s='Instant Checkout'}</h3>
- <div id="opc_account_form" style="display: block; ">
- <!-- Account -->
- <p class="required text">
- <label for="guest_email">{l s='E-mail address'}</label>
- <input type="text" class="text" id="guest_email" name="guest_email" value="{if isset($smarty.post.guest_email)}{$smarty.post.guest_email}{/if}">
- <sup>*</sup>
- </p>
- <p class="radio required">
- <span>{l s='Title'}</span>
- <input type="radio" name="id_gender" id="id_gender1" value="1" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == '1'}checked="checked"{/if}>
- <label for="id_gender1" class="top">{l s='Mr.'}</label>
- <input type="radio" name="id_gender" id="id_gender2" value="2" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == '2'}checked="checked"{/if}>
- <label for="id_gender2" class="top">{l s='Ms.'}</label>
- </p>
- <p class="required text">
- <label for="firstname">{l s='First name'}</label>
- <input type="text" class="text" id="firstname" name="firstname" onblur="$('#customer_firstname').val($(this).val());" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}">
- <input type="hidden" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}">
- <sup>*</sup>
- </p>
- <p class="required text">
- <label for="lastname">{l s='Last name'}</label>
- <input type="text" class="text" id="lastname" name="lastname" onblur="$('#customer_lastname').val($(this).val());" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}">
- <input type="hidden" class="text" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}">
- <sup>*</sup>
+ <form action="{$link->getPageLink('authentication', true, NULL, "back=$back")}" method="post" id="new_account_form" class="std clearfix">
+ <fieldset>
+ <h3>{l s='Instant Checkout'}</h3>
+ <div id="opc_account_form" style="display: block; ">
+ <!-- Account -->
+ <p class="required text">
+ <label for="guest_email">{l s='E-mail address'} <sup>*</sup></label>
+ <input type="text" class="text" id="guest_email" name="guest_email" value="{if isset($smarty.post.guest_email)}{$smarty.post.guest_email}{/if}">
+ </p>
+ <p class="radio required">
+ <span>{l s='Title'}</span>
+ {foreach from=$genders key=k item=gender}
+ <input type="radio" name="id_gender" id="id_gender{$gender->id}" value="{$gender->id}" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == $gender->id}checked="checked"{/if} />
+ <label for="id_gender{$gender->id}" class="top">{$gender->name}</label>
+ {/foreach}
+ </p>
+ <p class="required text">
+ <label for="firstname">{l s='First name'} <sup>*</sup></label>
+ <input type="text" class="text" id="firstname" name="firstname" onblur="$('#customer_firstname').val($(this).val());" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}">
+ <input type="hidden" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}">
+ </p>
+ <p class="required text">
+ <label for="lastname">{l s='Last name'} <sup>*</sup></label>
+ <input type="text" class="text" id="lastname" name="lastname" onblur="$('#customer_lastname').val($(this).val());" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}">
+ <input type="hidden" class="text" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}">
+ </p>
+ <p class="select">
+ <span>{l s='Date of Birth'}</span>
+ <select id="days" name="days">
+ <option value="">-</option>
+ {foreach from=$days item=day}
+ <option value="{$day|escape:'htmlall':'UTF-8'}" {if ($sl_day == $day)} selected="selected"{/if}>{$day|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+ {/foreach}
+ </select>
+ {*
+ {l s='January'}
+ {l s='February'}
+ {l s='March'}
+ {l s='April'}
+ {l s='May'}
+ {l s='June'}
+ {l s='July'}
+ {l s='August'}
+ {l s='September'}
+ {l s='October'}
+ {l s='November'}
+ {l s='December'}
+ *}
+ <select id="months" name="months">
+ <option value="">-</option>
+ {foreach from=$months key=k item=month}
+ <option value="{$k|escape:'htmlall':'UTF-8'}" {if ($sl_month == $k)} selected="selected"{/if}>{l s=$month}&nbsp;</option>
+ {/foreach}
+ </select>
+ <select id="years" name="years">
+ <option value="">-</option>
+ {foreach from=$years item=year}
+ <option value="{$year|escape:'htmlall':'UTF-8'}" {if ($sl_year == $year)} selected="selected"{/if}>{$year|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+ {/foreach}
+ </select>
+ </p>
+ {if isset($newsletter) && $newsletter}
+ <p class="checkbox">
+ <input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) && $smarty.post.newsletter == '1'}checked="checked"{/if}>
+ <label for="newsletter">{l s='Sign up for our newsletter'}</label>
</p>
- <p class="select">
- <span>{l s='Date of Birth'}</span>
- <select id="days" name="days">
- <option value="">-</option>
- {foreach from=$days item=day}
- <option value="{$day|escape:'htmlall':'UTF-8'}" {if ($sl_day == $day)} selected="selected"{/if}>{$day|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
- {/foreach}
- </select>
- {*
- {l s='January'}
- {l s='February'}
- {l s='March'}
- {l s='April'}
- {l s='May'}
- {l s='June'}
- {l s='July'}
- {l s='August'}
- {l s='September'}
- {l s='October'}
- {l s='November'}
- {l s='December'}
- *}
- <select id="months" name="months">
- <option value="">-</option>
- {foreach from=$months key=k item=month}
- <option value="{$k|escape:'htmlall':'UTF-8'}" {if ($sl_month == $k)} selected="selected"{/if}>{l s="$month"}&nbsp;</option>
- {/foreach}
- </select>
- <select id="years" name="years">
- <option value="">-</option>
- {foreach from=$years item=year}
- <option value="{$year|escape:'htmlall':'UTF-8'}" {if ($sl_year == $year)} selected="selected"{/if}>{$year|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
- {/foreach}
- </select>
+ <p class="checkbox">
+ <input type="checkbox" name="optin" id="optin" value="1" {if isset($smarty.post.optin) && $smarty.post.optin == '1'}checked="checked"{/if}>
+ <label for="optin">{l s='Receive special offers from our partners'}</label>
</p>
- {if isset($newsletter) && $newsletter}
- <p class="checkbox">
- <input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) && $smarty.post.newsletter == '1'}checked="checked"{/if}>
- <label for="newsletter">{l s='Sign up for our newsletter'}</label>
- </p>
- <p class="checkbox">
- <input type="checkbox" name="optin" id="optin" value="1" {if isset($smarty.post.optin) && $smarty.post.optin == '1'}checked="checked"{/if}>
- <label for="optin">{l s='Receive special offers from our partners'}</label>
- </p>
- {/if}
- <h3>{l s='Delivery address'}</h3>
- {foreach from=$dlv_all_fields item=field_name}
- {if $field_name eq "company"}
+ {/if}
+ <h3>{l s='Delivery address'}</h3>
+ {foreach from=$dlv_all_fields item=field_name}
+ {if $field_name eq "company"}
<p class="text">
<label for="company">{l s='Company'}</label>
<input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />
@@ -223,115 +281,118 @@ $(function(){ldelim}
</div>
{elseif $field_name eq "address1"}
<p class="required text">
- <label for="address1">{l s='Address'}</label>
+ <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}">
- <sup>*</sup>
</p>
{elseif $field_name eq "postcode"}
<p class="required postcode text">
- <label for="postcode">{l s='Zip / Postal Code'}</label>
+ <label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
<input type="text" class="text" name="postcode" id="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{/if}" onblur="$('#postcode').val($('#postcode').val().toUpperCase());">
- <sup>*</sup>
</p>
{elseif $field_name eq "city"}
<p class="required text">
- <label for="city">{l s='City'}</label>
+ <label for="city">{l s='City'} <sup>*</sup></label>
<input type="text" class="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}">
- <sup>*</sup>
</p>
- <!--
- if customer hasn't update his layout address, country has to be verified
- but it's deprecated
- -->
+ <!--
+ if customer hasn't update his layout address, country has to be verified
+ but it's deprecated
+ -->
{elseif $field_name eq "Country:name" || $field_name eq "country"}
<p class="required select">
- <label for="id_country">{l s='Country'}</label>
+ <label for="id_country">{l s='Country'} <sup>*</sup></label>
<select name="id_country" id="id_country">
<option value="">-</option>
{foreach from=$countries item=v}
- <option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
+ <option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
- <sup>*</sup>
</p>
- {elseif $field_name eq "State:name" || $field_name eq 'state'}
+ {elseif $field_name eq "State:name"}
{assign var='stateExist' value=true}
<p class="required id_state select">
- <label for="id_state">{l s='State'}</label>
+ <label for="id_state">{l s='State'} <sup>*</sup></label>
<select name="id_state" id="id_state">
<option value="">-</option>
</select>
- <sup>*</sup>
</p>
{elseif $field_name eq "phone"}
- <p class="text">
- <label for="phone">{l s='Phone'}</label>
- <input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}"> <sup style="color:red;">*</sup>
+ <p class="required text">
+ <label for="phone">{l s='Phone'} <sup>*</sup></label>
+ <input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}">
</p>
- {/if}
- {/foreach}
- {if $stateExist eq false}
+ {/if}
+ {/foreach}
+ {if $stateExist eq false}
<p class="required id_state select">
- <label for="id_state">{l s='State'}</label>
+ <label for="id_state">{l s='State'} <sup>*</sup></label>
<select name="id_state" id="id_state">
<option value="">-</option>
</select>
- <sup>*</sup>
</p>
- {/if}
- <input type="hidden" name="alias" id="alias" value="{l s='My address'}">
- <input type="hidden" name="is_new_customer" id="is_new_customer" value="0">
- <!-- END Account -->
- </div>
- </fieldset>
- <fieldset class="account_creation dni">
- <h3>{l s='Tax identification'}</h3>
+ {/if}
+ <input type="hidden" name="alias" id="alias" value="{l s='My address'}">
+ <input type="hidden" name="is_new_customer" id="is_new_customer" value="0">
+ <!-- END Account -->
+ </div>
+ </fieldset>
+ <fieldset class="account_creation dni">
+ <h3>{l s='Tax identification'}</h3>
- <p class="required text">
- <label for="dni">{l s='Identification number'}</label>
- <input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
- <span class="form_info">{l s='DNI / NIF / NIE'}</span>
- <sup>*</sup>
- </p>
- </fieldset>
- <p class="cart_navigation required submit">
- <span><sup>*</sup>{l s='Required field'}</span>
- <input type="submit" class="button" name="submitGuestAccount" id="submitGuestAccount" style="float:right" value="{l s='Continue'}">
+ <p class="required text">
+ <label for="dni">{l s='Identification number'}</label>
+ <input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
+ <span class="form_info">{l s='DNI / NIF / NIE'}</span>
</p>
- </form>
+ </fieldset>
+ <p class="cart_navigation required submit">
+ <span><sup>*</sup>{l s='Required field'}</span>
+ <input type="submit" class="exclusive" name="submitGuestAccount" id="submitGuestAccount" value="{l s='Continue'}">
+ </p>
+ </form>
{/if}
{else}
-<form action="{$link->getPageLink('authentication.php', true)}" method="post" id="account-creation_form" class="std">
+ <!--{if isset($account_error)}
+ <div class="error">
+ {if {$account_error|@count} == 1}
+ <p>{l s='There is one error'} :</p>
+ {else}
+ <p>{l s='There are %s errors' sprintf=[$account_error|@count]} :</p>
+ {/if}
+ <ol>
+ {foreach from=$account_error item=v}
+ <li>{$v}</li>
+ {/foreach}
+ </ol>
+ </div>
+ {/if}-->
+<form action="{$link->getPageLink('authentication', true)}" method="post" id="account-creation_form" class="std">
{$HOOK_CREATE_ACCOUNT_TOP}
<fieldset class="account_creation">
<h3>{l s='Your personal information'}</h3>
<p class="radio required">
<span>{l s='Title'}</span>
- <input type="radio" name="id_gender" id="id_gender1" value="1" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == 1}checked="checked"{/if} />
- <label for="id_gender1" class="top">{l s='Mr.'}</label>
- <input type="radio" name="id_gender" id="id_gender2" value="2" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == 2}checked="checked"{/if} />
- <label for="id_gender2" class="top">{l s='Ms.'}</label>
+ {foreach from=$genders key=k item=gender}
+ <input type="radio" name="id_gender" id="id_gender{$gender->id}" value="{$gender->id}" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == $gender->id}checked="checked"{/if} />
+ <label for="id_gender{$gender->id}" class="top">{$gender->name}</label>
+ {/foreach}
</p>
<p class="required text">
- <label for="customer_firstname">{l s='First name'}</label>
+ <label for="customer_firstname">{l s='First name'} <sup>*</sup></label>
<input onkeyup="$('#firstname').val(this.value);" type="text" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.post.customer_firstname)}{$smarty.post.customer_firstname}{/if}" />
- <sup>*</sup>
</p>
<p class="required text">
- <label for="customer_lastname">{l s='Last name'}</label>
+ <label for="customer_lastname">{l s='Last name'} <sup>*</sup></label>
<input onkeyup="$('#lastname').val(this.value);" type="text" class="text" id="customer_lastname" name="customer_lastname" value="{if isset($smarty.post.customer_lastname)}{$smarty.post.customer_lastname}{/if}" />
- <sup>*</sup>
</p>
<p class="required text">
- <label for="email">{l s='E-mail'}</label>
+ <label for="email">{l s='E-mail'} <sup>*</sup></label>
<input type="text" class="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email}{/if}" />
- <sup>*</sup>
</p>
<p class="required password">
- <label for="passwd">{l s='Password'}</label>
+ <label for="passwd">{l s='Password'} <sup>*</sup></label>
<input type="password" class="text" name="passwd" id="passwd" />
- <sup>*</sup>
<span class="form_info">{l s='(5 characters min.)'}</span>
</p>
<p class="select">
@@ -359,7 +420,7 @@ $(function(){ldelim}
<select id="months" name="months">
<option value="">-</option>
{foreach from=$months key=k item=month}
- <option value="{$k|escape:'htmlall':'UTF-8'}" {if ($sl_month == $k)} selected="selected"{/if}>{l s="$month"}&nbsp;</option>
+ <option value="{$k|escape:'htmlall':'UTF-8'}" {if ($sl_month == $k)} selected="selected"{/if}>{l s=$month}&nbsp;</option>
{/foreach}
</select>
<select id="years" name="years">
@@ -369,7 +430,7 @@ $(function(){ldelim}
{/foreach}
</select>
</p>
- {if isset($newsletter) && $newsletter}
+ {if $newsletter}
<p class="checkbox" >
<input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) AND $smarty.post.newsletter == 1} checked="checked"{/if} />
<label for="newsletter">{l s='Sign up for our newsletter'}</label>
@@ -380,6 +441,28 @@ $(function(){ldelim}
</p>
{/if}
</fieldset>
+ {if $b2b_enable}
+ <fieldset class="account_creation">
+ <h3>{l s='Your company information'}</h3>
+ <p class="text">
+ <label for="">{l s='Company'}</label>
+ <input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />
+ </p>
+ <p class="text">
+ <label for="siret">{l s='SIRET'}</label>
+ <input type="text" class="text" id="siret" name="siret" value="{if isset($smarty.post.siret)}{$smarty.post.siret}{/if}" />
+ </p>
+ <p class="text">
+ <label for="ape">{l s='APE'}</label>
+ <input type="text" class="text" id="ape" name="ape" value="{if isset($smarty.post.ape)}{$smarty.post.ape}{/if}" />
+ </p>
+ <p class="text">
+ <label for="website">{l s='Website'}</label>
+ <input type="text" class="text" id="website" name="website" value="{if isset($smarty.post.website)}{$smarty.post.website}{/if}" />
+ </p>
+ </fieldset>
+ {/if}
+ {if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE}
<fieldset class="account_creation">
<h3>{l s='Your address'}</h3>
{foreach from=$dlv_all_fields item=field_name}
@@ -397,21 +480,18 @@ $(function(){ldelim}
</div>
{elseif $field_name eq "firstname"}
<p class="required text">
- <label for="firstname">{l s='First name'}</label>
+ <label for="firstname">{l s='First name'} <sup>*</sup></label>
<input type="text" class="text" id="firstname" name="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}" />
- <sup>*</sup>
</p>
{elseif $field_name eq "lastname"}
<p class="required text">
- <label for="lastname">{l s='Last name'}</label>
+ <label for="lastname">{l s='Last name'} <sup>*</sup></label>
<input type="text" class="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}" />
- <sup>*</sup>
</p>
{elseif $field_name eq "address1"}
<p class="required text">
- <label for="address1">{l s='Address'}</label>
+ <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}" />
- <sup>*</sup>
<span class="inline-infos">{l s='Street address, P.O. box, company name, c/o'}</span>
</p>
{elseif $field_name eq "address2"}
@@ -422,15 +502,13 @@ $(function(){ldelim}
</p>
{elseif $field_name eq "postcode"}
<p class="required postcode text">
- <label for="postcode">{l s='Zip / Postal Code'}</label>
+ <label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
<input type="text" class="text" name="postcode" id="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
- <sup>*</sup>
</p>
{elseif $field_name eq "city"}
<p class="required text">
- <label for="city">{l s='City'}</label>
+ <label for="city">{l s='City'} <sup>*</sup></label>
<input type="text" class="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" />
- <sup>*</sup>
</p>
<!--
if customer hasn't update his layout address, country has to be verified
@@ -438,64 +516,59 @@ $(function(){ldelim}
-->
{elseif $field_name eq "Country:name" || $field_name eq "country"}
<p class="required select">
- <label for="id_country">{l s='Country'}</label>
+ <label for="id_country">{l s='Country'} <sup>*</sup></label>
<select name="id_country" id="id_country">
<option value="">-</option>
{foreach from=$countries item=v}
<option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
- <sup>*</sup>
</p>
{elseif $field_name eq "State:name" || $field_name eq 'state'}
{assign var='stateExist' value=true}
<p class="required id_state select">
- <label for="id_state">{l s='State'}</label>
+ <label for="id_state">{l s='State'} <sup>*</sup></label>
<select name="id_state" id="id_state">
<option value="">-</option>
</select>
- <sup>*</sup>
</p>
{/if}
{/foreach}
{if $stateExist eq false}
<p class="required id_state select">
- <label for="id_state">{l s='State'}</label>
+ <label for="id_state">{l s='State'} <sup>*</sup></label>
<select name="id_state" id="id_state">
<option value="">-</option>
</select>
- <sup>*</sup>
</p>
{/if}
<p class="textarea">
<label for="other">{l s='Additional information'}</label>
<textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea>
</p>
- <p style="margin-left:50px;">{l s='You must register at least one phone number'} <sup style="color:red;">*</sup></p>
+ <p class="inline-infos">{l s='You must register at least one phone number'}</p>
<p class="text">
<label for="phone">{l s='Home phone'}</label>
<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}" />
</p>
<p class="text">
- <label for="phone_mobile">{l s='Mobile phone'}</label>
+ <label for="phone_mobile">{l s='Mobile phone'} <sup>*</sup></label>
<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
</p>
<p class="required text" id="address_alias">
- <label for="alias">{l s='Assign an address title for future reference'} </label>
+ <label for="alias">{l s='Assign an address alias for future reference'} <sup>*</sup></label>
<input type="text" class="text" name="alias" id="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else}{l s='My address'}{/if}" />
- <sup>*</sup>
</p>
</fieldset>
<fieldset class="account_creation dni">
<h3>{l s='Tax identification'}</h3>
-
<p class="required text">
<label for="dni">{l s='Identification number'}</label>
<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
- <sup>*</sup>
</p>
</fieldset>
+ {/if}
{$HOOK_CREATE_ACCOUNT_FORM}
<p class="cart_navigation required submit">
<input type="hidden" name="email_create" value="1" />
@@ -507,4 +580,3 @@ $(function(){ldelim}
</form>
{/if}
-
View
6 best-sales.tpl
@@ -1,5 +1,5 @@
{*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -18,7 +18,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2011 PrestaShop SA
+* @copyright 2007-2012 PrestaShop SA
* @version Release: $Revision: 6594 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
@@ -30,7 +30,9 @@
<h1>{l s='Top sellers'}</h1>
{if $products}
+ <div class="sortPagiBar clearfix">
{include file="$tpl_dir./product-sort.tpl"}
+ </div>
{include file="$tpl_dir./product-list.tpl" products=$products}
{include file="$tpl_dir./pagination.tpl"}
{else}
View
14 breadcrumb.tpl
@@ -1,5 +1,5 @@
{*
-* 2007-2011 PrestaShop
+* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -18,7 +18,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
-* @copyright 2007-2011 PrestaShop SA
+* @copyright 2007-2012 PrestaShop SA
* @version Release: $Revision: 6594 $
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
@@ -27,6 +27,14 @@
<!-- Breadcrumb -->
{if isset($smarty.capture.path)}{assign var='path' value=$smarty.capture.path}{/if}
<div class="breadcrumb">
- <a href="{$base_dir}" title="{l s='return to'}