ticket 10780 / refonte panier

This commit is contained in:
Nolwenn 2016-11-14 12:47:21 +01:00
parent dd6321e847
commit 9839672763
3 changed files with 60 additions and 21 deletions

View File

@ -29,7 +29,8 @@
</div>
{/if}
<main class="{if $back != 'my-account'}order-process-main{/if}">
<main class="{if $back != 'my-account'}order-process-main{/if} {if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED}
checkoutMain{/if}">
<section>
{include file="$tpl_dir./errors.tpl"}
@ -38,7 +39,18 @@
{if !isset($email_create)}
<div class="row">
<!-- Creation de compte -->
<div class="col-md-6 col-sm-12">
{if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED}
<div class="col-lg-4 col-md-12 blockCheckout">
<div class="desc">
<h2>{l s='Nouveau !'}</h2>
{l s='Commandez en 1 click'}<br/>
</div>
<div class="toggleCheckout">
<a href="#new_account_form" class="btn open-panel">{l s='Instant checkout'}</a>
</div>
</div>
{/if}
<div class="{if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED} col-lg-4 col-md-6 {else} col-md-4 {/if} col-sm-12">
<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="create-account_form" class="box">
<h2 class="page-subheading">{l s='Create an account'}</h2>
<div class="form_content clearfix">
@ -63,7 +75,7 @@
</div>
<!-- Connexion -->
<div class="col-md-6 col-sm-12">
<div class="{if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED} col-lg-4 col-md-6 {else} col-md-4 {/if} col-sm-12">
<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="login_form" class="box">
<h2 class="page-subheading">{l s='Already registered?'}</h2>
<div class="form_content clearfix">
@ -90,12 +102,9 @@
</form>
</div>
</div>
{if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED}
<div class="row">
<div class="toggleCheckout ">
<a href="#new_account_form" class="btn open-panel">{l s='Or Instant checkout'}</a>
</div>
</div>
<div class="row">
<form action="{$link->getPageLink('authentication', true, NULL, "back=$back")|escape:'html':'UTF-8'}" method="post" id="new_account_form" class="animated-full col-sm-12 clearfix">
<h2 class="page-heading bottom-indent">{l s='Or Instant checkout'}</h3>

View File

@ -4474,7 +4474,15 @@ main#categorycms { margin-bottom: 30px }
font-size: 15px;
font-family: 'pt_sans';
}
#shopping-cart #calcul .renfort {
padding: 15px;
background-color: #529bb6;
text-align: center;
color: #fff;
font-size: 18px;
/*font-family: 'vidaloka';*/
font-family: 'pt_sans';
}
#shopping-cart #calcul .shipping-politic .titre {
color: #4d4d4d;
font-family: 'pt_sansbold';
@ -4700,8 +4708,9 @@ main#categorycms { margin-bottom: 30px }
}
#order_step li.step_done div {
background-color: #6ac5bb;
color: #fff;
background-color: #a9cddb;
color: #333333;
font-weight: bold;
}
#order_step li.step_done div a {
@ -4722,7 +4731,7 @@ main#categorycms { margin-bottom: 30px }
line-height: 26px;
}
#order_step li.step_todo div {
background-color: #a9cddb;
}
#order_step h1 {
font-size: inherit;
@ -4742,16 +4751,29 @@ main#categorycms { margin-bottom: 30px }
font-size: 21px;
}
#order_step li.step_todo div{
background: #e4535d;;
color: #fff;
background-color: #a9cddb;;;
color: #333333;
font-weight: bold;
}
#order_step li.step_current div {
color: #4d4d4d;;
color: #e4535d;;
font-weight: bold;
background-color: #fff;
}
#order_step li.step_current div h1 span { font-weight: bold; }
#order #shopping-cart .alert {
margin-top: 15px;
}
#authentication .blockCheckout {
margin-bottom: 50px;
}
#authentication .blockCheckout .desc {
text-align: center;
}
#authentication .blockCheckout .desc h2 {
margin-top: 0;
margin-bottom: 25px;
}
/* / steps */
@ -5272,6 +5294,10 @@ main#categorycms { margin-bottom: 30px }
#auth #create-account_form .form_content {
padding: 30px 100px;
}
.checkoutMain #auth #create-account_form .form_content, .checkoutMain #auth #login_form .form_content {
padding-right: 30px;
padding-left: 30px;
}
#login_form .form_content .submit .btn { float: none;}
#login_form .form_content .submit {
text-align: center;
@ -5282,8 +5308,9 @@ main#categorycms { margin-bottom: 30px }
text-align: center;
}
#auth form .form_content p.text {
margin: 0 0 23px 0;
margin: 0 0 28px 0;
text-align: center;
font-size: 14px;
}
#auth form .lost_password {
color: #b4293c;

View File

@ -209,9 +209,15 @@
{/if}
{/if}
{/if}
<div class="renfort">
{l s='Besoin d\'une astuce?'}<br/>
{l s='Une question sur votre commande?'}<br/>
{l s='Une conseillère Tout Pratique vous accompagnent 0800 500 270'}<br/>
</div>
<div class="shipping-politic">
<div>
<span class="titre">{l s='Notre politique transport :'}</span>
<p>
{l s='Frais de port : 6 € en Colissimo'}<br />
{l s='Pour les petits colis de moins de 500 grammes ne payez que 3 € de frais de port'}<br />
@ -221,10 +227,7 @@
</p>
</div>
</div>
<div class="ask-for-help">
<i class="icon-tel"></i><span>{l s='Besoin d\'aide ?'}</span>
<a class="tel" href="tel:{l s='0800 500 270'}">{l s='0800 500 270'}</a>
</div>
</div>
</div>