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

// Merge -> revision 8720

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-22 15:45:10 +00:00
parent 69db63f26c
commit 4f2a090e24
87 changed files with 1591 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/prestashop/address.tpl
+2 -5
View File
@@ -142,7 +142,6 @@ $(function(){ldelim}
{foreach from=$ordered_adr_fields item=field_name}
{if $field_name eq 'company'}
<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>
@@ -187,10 +186,7 @@ $(function(){ldelim}
<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 customer hasn't update his layout address, country has to be verified
but it's deprecated
-->
<!-- If the merchant has not updated his layout address, country has to be verified - however it's deprecated -->
{/if}
{if $field_name eq 'Country:name' || $field_name eq 'country'}
<p class="required select">
@@ -237,6 +233,7 @@ $(function(){ldelim}
</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>
themes/prestashop/css/global.css
+3
View File
@@ -1175,6 +1175,9 @@ tr.cart_total_price { font-weight: bold }
margin: 1em 0
}
#guest-tracking p.center { width: 100%; text-align: center; }
#guest-tracking p.center input.exclusive_large { display: inline; }
/* views block */
#views_block {
margin: 0 auto;
themes/prestashop/guest-tracking.tpl
+19 -16
View File
@@ -1,5 +1,5 @@
{*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -24,10 +24,10 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{capture name=path}{l s='Guest tracking'}{/capture}
{capture name=path}{l s='Guests: Track your order'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h1>{l s='Guest Tracking'}</h1>
<h1>{l s='Guests: Track your order'}</h1>
{if isset($order)}
<div id="block-history">
@@ -35,36 +35,39 @@
{include file="$tpl_dir./order-detail.tpl"}
</div>
</div>
<h2 id="guestToCustomer">{l s='For more advantages...'}</h2>
<h2 id="guestToCustomer">{l s='Create your customer account'}</h2>
{include file="$tpl_dir./errors.tpl"}
{if isset($transformSuccess)}
<p class="success">{l s='Your guest account has been successfully transformed into a customer account. You can now log in on this'} <a href="{$link->getPageLink('authentication', true)}">{l s='page'}</a></p>
{else}
<form method="post" action="{$action|escape:'htmlall':'UTF-8'}#guestToCustomer" class="std">
<fieldset>
<p class="bold">{l s='Transform your guest account to a customer account and enjoy :'}</p>
<p class="bold">{l s='Transform your guest account into a customer account and enjoy:'}</p>
<ul class="bullet">
<li>{l s='Personalized and secure access'}</li>
<li>{l s='Fast and easy check out'}</li>
<li>{l s='Personal and secure access'}</li>
<li>{l s='Quick and easy check out'}</li>
<li>{l s='Easier merchandise return'}</li>
</ul>
<p class="text">
<label>{l s='Define your password:'}</label>
<input type="password" name="password" />
</p>
<input type="hidden" name="id_order" value="{if isset($smarty.get.id_order)}{$smarty.get.id_order|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|escape:'htmlall':'UTF-8'}{/if}{/if}" />
<input type="hidden" name="email" value="{if isset($smarty.get.email)}{$smarty.get.email|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'}{/if}{/if}" />
<p class="center"><input type="submit" class="exclusive_large" name="submitTransformGuestToCustomer" value="{l s='Send'}" /></p>
<p class="center"><input type="submit" class="exclusive_large" name="submitTransformGuestToCustomer" value="{l s='Submit'}" /></p>
</fieldset>
</form>
{/if}
{else}
{include file="$tpl_dir./errors.tpl"}
{if isset($show_login_link) && $show_login_link}
<p><img src="{$img_dir}icon/userinfo.gif" alt="{l s='Information'}" class="icon" /><a href="{$link->getPageLink('my-account.php', true)}">{l s='Click here to log-in to your customer account'}</a><br /><br /></p>
{/if}
<form method="post" action="{$action|escape:'htmlall':'UTF-8'}" class="std">
<fieldset>
<p>{l s='To track your order, please enter the following information:'}</p>
@@ -73,13 +76,13 @@
<input type="text" name="id_order" value="{if isset($smarty.get.id_order)}{$smarty.get.id_order|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|escape:'htmlall':'UTF-8'}{/if}{/if}" size="8" />
<i>{l s='For example: 010123'}</i>
</p>
<p class="text">
<label>{l s='E-mail:'}</label>
<input type="text" name="email" value="{if isset($smarty.get.email)}{$smarty.get.email|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'}{/if}{/if}" />
</p>
<p class="center"><input type="submit" class="button" name="submitGuestTracking" value="{l s='Send'}" /></p>
<p class="center"><input type="submit" class="exclusive_large" name="submitGuestTracking" value="{l s='View my order'}" /></p>
</fieldset>
</form>
{/if}
themes/prestashop/order-opc-new-account.tpl
+3 -3
View File
@@ -263,9 +263,9 @@
</div>
{elseif $field_name eq "state" || $field_name eq 'State:name'}
{$stateExist = true}
<p class="required id_state_invoice select" style="display:none;">
<label for="id_state_invoice">{l s='State'}</label>
<select name="id_state_invoice" id="id_state_invoice">
<p class="required id_state select" style="display:none;">
<label for="id_state">{l s='State'}</label>
<select name="id_state" id="id_state">
<option value="">-</option>
</select>
<sup>*</sup>
themes/prestashop/pagination.tpl
+14 -4
View File
@@ -24,9 +24,19 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{if isset($no_follow) AND $no_follow}
{assign var='no_follow_text' value='rel="nofollow"'}
{else}
{assign var='no_follow_text' value=''}
{/if}
{if isset($p) AND $p}
{if isset($smarty.get.id_category) && $smarty.get.id_category && isset($category)}
{if !isset($current_url)}
{assign var='requestPage' value=$link->getPaginationLink('category', $category, false, false, true, false)}
{else}
{assign var='requestPage' value=$current_url}
{/if}
{assign var='requestNb' value=$link->getPaginationLink('category', $category, true, false, false, true)}
{elseif isset($smarty.get.id_manufacturer) && $smarty.get.id_manufacturer && isset($manufacturer)}
{assign var='requestPage' value=$link->getPaginationLink('manufacturer', $manufacturer, false, false, true, false)}
@@ -44,19 +54,19 @@
<ul class="pagination">
{if $p != 1}
{assign var='p_previous' value=$p-1}
<li id="pagination_previous"><a href="{$link->goPage($requestPage, $p_previous)}">&laquo;&nbsp;{l s='Previous'}</a></li>
<li id="pagination_previous"><a {$no_follow_text} href="{$link->goPage($requestPage, $p_previous)}">&laquo;&nbsp;{l s='Previous'}</a></li>
{else}
<li id="pagination_previous" class="disabled"><span>&laquo;&nbsp;{l s='Previous'}</span></li>
{/if}
{if $start>3}
<li><a href="{$link->goPage($requestPage, 1)}">1</a></li>
<li><a {$no_follow_text} href="{$link->goPage($requestPage, 1)}">1</a></li>
<li class="truncate">...</li>
{/if}
{section name=pagination start=$start loop=$stop+1 step=1}
{if $p == $smarty.section.pagination.index}
<li class="current"><span>{$p|escape:'htmlall':'UTF-8'}</span></li>
{else}
<li><a href="{$link->goPage($requestPage, $smarty.section.pagination.index)}">{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</a></li>
<li><a {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)}">{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</a></li>
{/if}
{/section}
{if $pages_nb>$stop+2}
@@ -65,7 +75,7 @@
{/if}
{if $pages_nb > 1 AND $p != $pages_nb}
{assign var='p_next' value=$p+1}
<li id="pagination_next"><a href="{$link->goPage($requestPage, $p_next)}">{l s='Next'}&nbsp;&raquo;</a></li>
<li id="pagination_next"><a {$no_follow_text} href="{$link->goPage($requestPage, $p_next)}">{l s='Next'}&nbsp;&raquo;</a></li>
{else}
<li id="pagination_next" class="disabled"><span>{l s='Next'}&nbsp;&raquo;</span></li>
{/if}