Merge branch 'master' into template
Conflicts: templates/admin/default/customers.html templates/default/register.html
This commit is contained in:
Manuel Raynaud
@@ -17,8 +17,8 @@
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
<a class="left carousel-control" href="#carousel" data-slide="prev"><i class="icon-prev"></i></a>
|
||||
<a class="right carousel-control" href="#carousel" data-slide="next"><i class="icon-next"></i></a>
|
||||
<a class="left carousel-control" href="#carousel" data-slide="prev"><span class="icon-prev"></span></a>
|
||||
<a class="right carousel-control" href="#carousel" data-slide="next"><span class="icon-next"></span></a>
|
||||
</div>
|
||||
</section><!-- #carousel -->
|
||||
|
||||
@@ -39,23 +39,23 @@
|
||||
<meta itemprop="condition" content="new"> <!-- List of condition : new, used, refurbished -->
|
||||
<meta itemprop="identifier" content="mpn:925872"> <!-- List of identifier : asin, isbn, mpn, upc, sku -->
|
||||
|
||||
<a href="#URL" itemprop="url" tabindex="-1" class="product-image">
|
||||
<a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
|
||||
{ifloop rel="image_product_new" }
|
||||
<img itemprop="image"
|
||||
{loop name="image_product_new" type="image" limit="1" product="{#ID}"}
|
||||
src="{#IMAGE_URL}"
|
||||
{loop name="image_product_new" type="image" limit="1" product="{$ID}"}
|
||||
src="{$IMAGE_URL}"
|
||||
{/loop}
|
||||
alt="Product #{#LOOP_COUNT}" >
|
||||
alt="Product #{$LOOP_COUNT}" >
|
||||
{/ifloop}
|
||||
{elseloop rel="image_product_new"}
|
||||
{images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{#LOOP_COUNT}">{/images}
|
||||
{images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
|
||||
{/elseloop}
|
||||
<span class="mask"></span>
|
||||
</a>
|
||||
|
||||
<a href="{#URL}" class="product-info">
|
||||
<h3 class="name"><span itemprop="name">{#TITLE}</span></h3>
|
||||
<div class="short-description" itemprop="description">{#CHAPO}</div>
|
||||
<a href="{$URL}" class="product-info">
|
||||
<h3 class="name"><span itemprop="name">{$TITLE}</span></h3>
|
||||
<div class="short-description" itemprop="description">{$CHAPO}</div>
|
||||
|
||||
<div class="product-price">
|
||||
<div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
|
||||
@@ -68,7 +68,7 @@
|
||||
preorder : http://schema.org/PreOrder
|
||||
online_only : http://schema.org/OnlineOnly
|
||||
-->
|
||||
<span class="regular-price"><span itemprop="price" class="price">{currency attr="symbol"} {format_number number="{#BEST_TAXED_PRICE}"}
|
||||
<span class="regular-price"><span itemprop="price" class="price">{currency attr="symbol"} {format_number number="{$BEST_TAXED_PRICE}"}
|
||||
</span></span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -97,22 +97,22 @@
|
||||
<meta itemprop="condition" content="new"> <!-- List of condition : new, used, refurbished -->
|
||||
<meta itemprop="identifier" content="mpn:925872"> <!-- List of identifier : asin, isbn, mpn, upc, sku -->
|
||||
|
||||
<a href="{#URL}" itemprop="url" tabindex="-1" class="product-image">
|
||||
<a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
|
||||
{ifloop rel="image_product_promo" }
|
||||
<img itemprop="image"
|
||||
{loop name="image_product_promo" type="image" limit="1" product="{#ID}"}
|
||||
src="{#IMAGE_URL}"
|
||||
{loop name="image_product_promo" type="image" limit="1" product="{$ID}"}
|
||||
src="{$IMAGE_URL}"
|
||||
{/loop}
|
||||
alt="Product #{#LOOP_COUNT}" >
|
||||
alt="Product #{$LOOP_COUNT}" >
|
||||
{/ifloop}
|
||||
{elseloop rel="image_product_promo"}
|
||||
{images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Promotion #{#LOOP_COUNT}">{/images}
|
||||
{images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Promotion #{$LOOP_COUNT}">{/images}
|
||||
{/elseloop}
|
||||
<span class="mask"></span>
|
||||
</a>
|
||||
|
||||
<div class="product-info">
|
||||
<h3 class="name"><a href="{#URL}"><span itemprop="name">{#CHAPO}</span></a></h3>
|
||||
<h3 class="name"><a href="{$URL}"><span itemprop="name">{$CHAPO}</span></a></h3>
|
||||
</div>
|
||||
|
||||
<div class="product-price">
|
||||
@@ -126,9 +126,9 @@
|
||||
preorder : http://schema.org/PreOrder
|
||||
online_only : http://schema.org/OnlineOnly
|
||||
-->
|
||||
{loop name="productSaleElements_promo" type="product_sale_elements" product="{#ID}" limit="1"}
|
||||
<span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{#TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
|
||||
<span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{#TAXED_PRICE}"} {currency attr="symbol"}</span></span>
|
||||
{loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"}
|
||||
<span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
|
||||
<span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
|
||||
{/loop}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -80,7 +80,7 @@ URL: http://www.thelia.net
|
||||
</ul>
|
||||
</li>
|
||||
{loop type="category" name="category.navigation" parent="0" limit="3"}
|
||||
<li><a href="{#URL}">{#TITLE}</a></li>
|
||||
<li><a href="{$URL}">{$TITLE}</a></li>
|
||||
{/loop}
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-cart navbar-right">
|
||||
@@ -113,7 +113,7 @@ URL: http://www.thelia.net
|
||||
<div class="input-group">
|
||||
<input type="search" name="q" id="q" placeholder="Search..." class="form-control" aria-required="true" required pattern=". { 2,}" title="Minmimum 2 characters.">
|
||||
<div class="input-group-btn">
|
||||
<button type="submit" class="btn btn-search"><i class="icon-search"></i> <span>Search</span></button>
|
||||
<button type="submit" class="btn btn-search"><span class="icon-search"></span> <span>Search</span></button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@@ -124,7 +124,7 @@ URL: http://www.thelia.net
|
||||
<a class="current dropdown-toggle" data-toggle="dropdown" href="language.html">{lang attr="title"}</a>
|
||||
<ul class="select dropdown-menu">
|
||||
{loop type="lang" name="lang_available" exclude="{lang attr="id"}"}
|
||||
<li><a href="?lang={#CODE}">{#TITLE}</a></li>
|
||||
<li><a href="?lang={$CODE}">{$TITLE}</a></li>
|
||||
{/loop}
|
||||
</ul>
|
||||
</div>
|
||||
@@ -134,7 +134,7 @@ URL: http://www.thelia.net
|
||||
<a class="current dropdown-toggle" data-toggle="dropdown" href="currency.html">{currency attr="code"}</a>
|
||||
<ul class="select dropdown-menu">
|
||||
{loop type="currency" name="currency_available" exclude="{currency attr="id"}" }
|
||||
<li><a href="?currency={#ISOCODE}">{#SYMBOL} - {#NAME}</a></li>
|
||||
<li><a href="?currency={$ISOCODE}">{$SYMBOL} - {$NAME}</a></li>
|
||||
{/loop}
|
||||
</ul>
|
||||
</div>
|
||||
@@ -158,15 +158,15 @@ URL: http://www.thelia.net
|
||||
<div class="container">
|
||||
<div class="banner banner-col-3">
|
||||
<div class="col">
|
||||
<i class="icon-truck icon-flip-horizontal"></i>
|
||||
<span class="icon-truck icon-flip-horizontal"></span>
|
||||
Free shipping <small>Orders over $50</small>
|
||||
</div>
|
||||
<div class="col">
|
||||
<i class="icon-credit-card"></i>
|
||||
<span class="icon-credit-card"></span>
|
||||
Secure payment <small>Multi-payment plateform</small>
|
||||
</div>
|
||||
<div class="col">
|
||||
<i class="icon-info"></i>
|
||||
<span class="icon-info"></span>
|
||||
Need help ? <small>Questions ? See or F.A.Q.</small>
|
||||
</div>
|
||||
</div>
|
||||
@@ -228,48 +228,48 @@ URL: http://www.thelia.net
|
||||
<li>
|
||||
<a href="http://facebook.com" class="facebook" data-toggle="tooltip" data-placement="top" title="facebook" target="_blank">
|
||||
<span class="icon-stack">
|
||||
<i class="icon-circle icon-stack-base"></i>
|
||||
<i class="icon-facebook icon-light"></i>
|
||||
<span class="icon-circle icon-stack-base"></span>
|
||||
<span class="icon-facebook icon-light"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://twitter.com" class="twitter" data-toggle="tooltip" data-placement="top" title="twitter" target="_blank">
|
||||
<span class="icon-stack">
|
||||
<i class="icon-circle icon-stack-base"></i>
|
||||
<i class="icon-twitter icon-light"></i>
|
||||
<span class="icon-circle icon-stack-base"></span>
|
||||
<span class="icon-twitter icon-light"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://instagram.com" class="instagram" data-toggle="tooltip" data-placement="top" title="instagram" target="_blank">
|
||||
<span class="icon-stack">
|
||||
<i class="icon-circle icon-stack-base"></i>
|
||||
<i class="icon-instagram icon-light"></i>
|
||||
<span class="icon-circle icon-stack-base"></span>
|
||||
<span class="icon-instagram icon-light"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://google.com" class="google-plus" data-toggle="tooltip" data-placement="top" title="google+" target="_blank">
|
||||
<span class="icon-stack">
|
||||
<i class="icon-circle icon-stack-base"></i>
|
||||
<i class="icon-google-plus icon-light"></i>
|
||||
<span class="icon-circle icon-stack-base"></span>
|
||||
<span class="icon-google-plus icon-light"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://youtube.com" class="youtube" data-toggle="tooltip" data-placement="top" title="youtube" target="_blank">
|
||||
<span class="icon-stack">
|
||||
<i class="icon-circle icon-stack-base"></i>
|
||||
<i class="icon-youtube icon-light"></i>
|
||||
<span class="icon-circle icon-stack-base"></span>
|
||||
<span class="icon-youtube icon-light"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#rss" class="rss" data-toggle="tooltip" data-placement="top" title="rss" target="_blank">
|
||||
<span class="icon-stack">
|
||||
<i class="icon-circle icon-stack-base"></i>
|
||||
<i class="icon-rss icon-light"></i>
|
||||
<span class="icon-circle icon-stack-base"></span>
|
||||
<span class="icon-rss icon-light"></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<h1 id="main-label" class="page-header">{intl l="Login"}</h1>
|
||||
{form name="thelia.customer.login"}
|
||||
<form id="form-login" action="{url path="/customer/login"}" method="post" role="form" {form_enctype form=$form}>
|
||||
{if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
|
||||
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
|
||||
{form_field form=$form field='success_url'}
|
||||
<input type="hidden" name="{$name}" value="{navigate to="return_to"}" /> {* the url the user is redirected to on login success *}
|
||||
{/form_field}
|
||||
@@ -34,7 +34,7 @@
|
||||
<div class="control-input">
|
||||
<input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" {$attr} aria-required="true" autofocus required>
|
||||
{if $error}
|
||||
<span class="help-block"><i class="icon-remove"></i> {$message}</span>
|
||||
<span class="help-block"><span class="icon-remove"></span> {$message}</span>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
@@ -58,7 +58,7 @@
|
||||
<div class="control-input">
|
||||
<input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off">
|
||||
{if $error}
|
||||
<span class="help-block"><i class="icon-remove"></i> {$message}</span>
|
||||
<span class="help-block"><span class="icon-remove"></span> {$message}</span>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
<div class="panel-body">
|
||||
{form_field form=$form field="firstname"}
|
||||
<div class="form-group group-firstname {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
|
||||
<div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
|
||||
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
|
||||
<div class="control-input">
|
||||
<input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
|
||||
@@ -40,7 +40,7 @@
|
||||
</div><!--/.form-group-->
|
||||
{/form_field}
|
||||
{form_field form=$form field="lastname"}
|
||||
<div class="form-group group-lastname {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
|
||||
<div class="form-group group-lastname {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
|
||||
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
|
||||
<div class="control-input">
|
||||
<input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
|
||||
@@ -53,8 +53,9 @@
|
||||
</div><!--/.form-group-->
|
||||
{/form_field}
|
||||
{form_field form=$form field="email"}
|
||||
<div class="form-group group-email {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
|
||||
<div class="form-group group-email {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
|
||||
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
|
||||
|
||||
<div class="control-input">
|
||||
<input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" required value="{$smarty.get.email|default:$value}">
|
||||
{if $error }
|
||||
@@ -66,7 +67,7 @@
|
||||
</div><!--/.form-group-->
|
||||
{/form_field}
|
||||
{form_field form=$form field="phone"}
|
||||
<div class="form-group group-phone {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
|
||||
<div class="form-group group-phone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
|
||||
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
|
||||
<div class="control-input">
|
||||
<input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
|
||||
@@ -79,7 +80,7 @@
|
||||
</div><!--/.form-group-->
|
||||
{/form_field}
|
||||
{form_field form=$form field="cellphone"}
|
||||
<div class="form-group group-cellphone {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
|
||||
<div class="form-group group-cellphone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
|
||||
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
|
||||
<div class="control-input">
|
||||
<input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
|
||||
|
||||
Reference in New Issue
Block a user