From 5b7da618b56e02355e9e90eafac896ca521a4b9c Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 23 Apr 2013 09:34:24 +0200 Subject: [PATCH] Merge Pull Request #21 - thanks @Caleydon --- themes/default/authentication.tpl | 15 ++++++++++----- themes/default/mobile/authentication.tpl | 2 +- themes/default/mobile/header.tpl | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl index 6658fef36..033c2cd72 100644 --- a/themes/default/authentication.tpl +++ b/themes/default/authentication.tpl @@ -23,8 +23,13 @@ * International Registered Trademark & Property of PrestaShop SA *} -{capture name=path}{l s='Login'}{/capture} -{include file="$tpl_dir./breadcrumb.tpl"} +{capture name=path} + {if !isset($email_create)}{l s='Authentication'}{else} + {l s='Authentication'} + {$navigationPipe}{l s='Create your account'} + {/if} +{/capture} + {include file="$tpl_dir./breadcrumb.tpl"} -

{if !isset($email_create)}{l s='Log in'}{else}{l s='Create an account'}{/if}

+

{if !isset($email_create)}{l s='Authentication'}{else}{l s='Create an account'}{/if}

{if !isset($back) || $back != 'my-account'}{assign var='current_step' value='login'}{include file="$tpl_dir./order-steps.tpl"}{/if} {include file="$tpl_dir./errors.tpl"} {assign var='stateExist' value=false} @@ -181,10 +186,10 @@ $(document).ready(function() {

-

{l s='Forgot your password?'}

+

{l s='Forgot your password?'}

{if isset($back)}{/if} - +

diff --git a/themes/default/mobile/authentication.tpl b/themes/default/mobile/authentication.tpl index ebad48543..5c968928c 100644 --- a/themes/default/mobile/authentication.tpl +++ b/themes/default/mobile/authentication.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} -{capture assign='page_title'}{if !isset($email_create)}{l s='Log in'}{else}{l s='Create an account'}{/if}{/capture} +{capture assign='page_title'}{if !isset($email_create)}{l s='Authentication'}{else}{l s='Create an account'}{/if}{/capture} {include file='./page-title.tpl'} {include file="./errors.tpl"} diff --git a/themes/default/mobile/header.tpl b/themes/default/mobile/header.tpl index 34752abba..cdc61a16e 100644 --- a/themes/default/mobile/header.tpl +++ b/themes/default/mobile/header.tpl @@ -74,7 +74,7 @@ {if $logged} {l s='My account'} {else} - {l s='Log in'} + {l s='Authentication'} {/if} {hook h="displayMobileTop"}