antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

Browse Source
This commit is contained in:
Christophe Latour 2017-11-22 12:54:51 +01:00
commit b3caa027b4
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/blockuserinfo/blockuserinfo.php
View File

@ -122,7 +122,7 @@ class BlockUserInfo extends Module
}
$smarty->assign(array(
'onlyForm' => !$this->useTopUpper,
'onlyForm' => $this->useTopUpper,
'display_credits' => $display_credits,
'loyalties' => ($loyalties)?$loyalties:0,
'cart' => $cart,

1
themes/site/css/style.css
View File

@ -1760,6 +1760,7 @@ body#page-404 .footer_links {
}
#header > .content > .top {
clear: both;
background: #fff;
}
#header > .content > .top .block ul li {
margin: 5px 0 0 0;

40
themes/site/modules/blockuserinfo/blockuserinfo.tpl
View File

@ -25,9 +25,9 @@
*}
{if $page_name != 'authentication'}
<!-- Block user information module HEADER -->
{if $cookie->isLogged()}
{if $onlyForm == false}
{if $onlyForm == false}
<!-- Block user information module HEADER -->
<div id="header_user">
<div id="header_nav">
<div class="inner">{l s='Bonjour' mod='blockuserinfo'}
@ -83,26 +83,28 @@
{* {/if} *}
</div>
</div>
<!-- /Block user information module HEADER -->
{/if}
{else}
<!-- Block user information module HEADER -->
<div id="header_user">
<form id="login_form_top" method="post" action="{$link->getPageLink('authentication.php')}">
<fieldset>
<p class="title">{l s='Accès membre' mod='blockuserinfo'}</p>
<p class="text">
<input type="text" class="account_input_top" value="" name="email" id="email_top" placeholder="{l s='Email' mod='blockuserinfo'}" />
</p>
<p class="text">
<input type="password" class="account_input_top" value="" name="passwd" id="passwd_top" placeholder="{l s='Mot de passe' mod='blockuserinfo'}" />
</p>
<p class="submit">
<input type="hidden" value="/" name="back" class="hidden">
<input type="submit" value="{l s='Connexion' mod='blockuserinfo'}" class="button" name="SubmitLogin">
</p>
<a class="forgot" href="{$link->getPageLink('password.php')}">{l s='Mot de passe oublié ?' mod='blockuserinfo'}</a>
</fieldset>
</form>
<form id="login_form_top" method="post" action="{$link->getPageLink('authentication.php')}">
<fieldset>
<p class="title">{l s='Accès membre' mod='blockuserinfo'}</p>
<p class="text">
<input type="text" class="account_input_top" value="" name="email" id="email_top" placeholder="{l s='Email' mod='blockuserinfo'}" />
</p>
<p class="text">
<input type="password" class="account_input_top" value="" name="passwd" id="passwd_top" placeholder="{l s='Mot de passe' mod='blockuserinfo'}" />
</p>
<p class="submit">
<input type="hidden" value="/" name="back" class="hidden">
<input type="submit" value="{l s='Connexion' mod='blockuserinfo'}" class="button" name="SubmitLogin">
</p>
<a class="forgot" href="{$link->getPageLink('password.php')}">{l s='Mot de passe oublié ?' mod='blockuserinfo'}</a>
</fieldset>
</form>
</div>
<!-- /Block user information module HEADER -->
{/if}
<!-- /Block user information module HEADER -->
{/if}