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

Merge Pull Request #21 - thanks @Caleydon

Browse Source
This commit is contained in:
vAugagneur
2013-04-23 09:34:24 +02:00
parent 5fb2bb9ee2
commit 5b7da618b5
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/authentication.tpl
+10 -5
View File
@@ -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}
<a href="{$link->getPageLink('authentication', true)}" rel="nofollow" title="{l s='Authentication'}">{l s='Authentication'}</a>
<span class="navigation-pipe">{$navigationPipe}</span>{l s='Create your account'}
{/if}
{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<script type="text/javascript">
// <![CDATA[
@@ -69,7 +74,7 @@ $(document).ready(function() {
{/literal}
</script>
<h1>{if !isset($email_create)}{l s='Log in'}{else}{l s='Create an account'}{/if}</h1>
<h1>{if !isset($email_create)}{l s='Authentication'}{else}{l s='Create an account'}{/if}</h1>
{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() {
<label for="passwd">{l s='Password'}</label>
<span><input type="password" id="passwd" name="passwd" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|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="lost_password"><a href="{$link->getPageLink('password')}" title="{l s='Recover your forgotten password'}" rel="nofollow">{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'}" />
<input type="submit" id="SubmitLogin" name="SubmitLogin" class="button" value="{l s='Authentication'}" />
</p>
</div>
</fieldset>
themes/default/mobile/authentication.tpl
+1 -1
View File
@@ -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"}
themes/default/mobile/header.tpl
+1 -1
View File
@@ -74,7 +74,7 @@
{if $logged}
<a href="{$link->getPageLink('my-account', true)}" class="link_account" data-ajax="false">{l s='My account'}</a>
{else}
<a href="{$link->getPageLink('authentication', true)}" class="link_account" data-ajax="false">{l s='Log in'}</a>
<a href="{$link->getPageLink('authentication', true)}" class="link_account" data-ajax="false">{l s='Authentication'}</a>
{/if}
</div>
{hook h="displayMobileTop"}