TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74 from thelia/frontend

Browse Source 
Frontend
This commit is contained in:
Manuel Raynaud
2013-10-25 02:54:51 -07:00
parent e33ed5047f d25e536b8d
commit 804b8599b1
7 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/default/assets/less/thelia/cart.less
View File

@@ -48,7 +48,11 @@
} }
} }
} }
&.qty {} &.qty {
.group-qty {
margin-bottom: 0;
}
}
&.subprice { &.subprice {
.price { .price {
color: @brand-primary; color: @brand-primary;

6
templates/default/assets/less/thelia/global.less
View File

@@ -33,12 +33,12 @@
// thumbnail // thumbnail
.thumbnail { .thumbnail {
&.active, /*&.active,
&:active { &:active {
border-style: solid; border-style: solid;
border-width: 2px; border-width: 2px;
} }*/
&.active { border-color: @gray-light; } &.active { border-color: @gray-dark; }
} }
// Layout // Layout

16
templates/default/assets/themes/default/less/theme.less
View File

@@ -1120,6 +1120,21 @@ td.product,
} }
} }
.table-cart-mini {
thead,
tbody,
tfoot {
> tr {
> th,
> td {
vertical-align: middle;
}
}
}
}
.table-cart { .table-cart {
thead, thead,
@@ -1130,6 +1145,7 @@ td.product,
> td { > td {
padding: 14px; padding: 14px;
text-align: center; text-align: center;
vertical-align: middle;
&.product { text-align: left; } &.product { text-align: left; }
} }
} }

3
templates/default/includes/mini-cart.html
View File

@@ -45,7 +45,8 @@
<tr> <tr>
<td colspan="2" class="empty"> <td colspan="2" class="empty">
<a href="{url path="/cart"}" role="button" class="btn btn-default btn-sm"><span>{intl l="View Cart"}</span></a> <a href="{url path="/cart"}" role="button" class="btn btn-default btn-sm"><span>{intl l="View Cart"}</span></a>
<button type="submit" name="checkout" class="btn btn-warning btn-sm"><span>{intl l="Checkout"}</span></button> <a href="{url path="/order/delivery"}" role="button" class="btn btn-warning btn-sm"><span>{intl l="Checkout"}</span></a>
{*<button type="submit" name="checkout" class="btn btn-warning btn-sm"><span>{intl l="Checkout"}</span></button>*}
</td> </td>
<td class="total"> <td class="total">
<div class="total-price"> <div class="total-price">

20
templates/default/layout.tpl
View File

@@ -23,7 +23,7 @@ URL: http://www.thelia.net
<meta charset="utf-8"> <meta charset="utf-8">
{* Page Title *} {* Page Title *}
<title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} | {/foreach}{/if}{config key="company_name"}{/strip}{/block}</title> <title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{config key="company_name"}{/strip}{/block}</title>
{* Meta Tags *} {* Meta Tags *}
<meta name="description" content=""> <meta name="description" content="">
@@ -179,15 +179,15 @@ URL: http://www.thelia.net
<div class="banner banner-col-3"> <div class="banner banner-col-3">
<div class="col"> <div class="col">
<span class="icon-truck icon-flip-horizontal"></span> <span class="icon-truck icon-flip-horizontal"></span>
Free shipping <small>Orders over $50</small> {intl l="Free shipping"} <small>{intl l="Orders over $50"}</small>
</div> </div>
<div class="col"> <div class="col">
<span class="icon-credit-card"></span> <span class="icon-credit-card"></span>
Secure payment <small>Multi-payment plateform</small> {intl l="Secure payment"} <small>{intl l="Multi-payment plateform"}</small>
</div> </div>
<div class="col"> <div class="col">
<span class="icon-info"></span> <span class="icon-info"></span>
Need help ? <small>Questions ? See or F.A.Q.</small> {intl l="Need help ?"} <small>{intl l="Questions ? See or F.A.Q."}</small>
</div> </div>
</div> </div>
</div> </div>
@@ -198,7 +198,7 @@ URL: http://www.thelia.net
<div class="blocks block-col-4"> <div class="blocks block-col-4">
<div class="col"> <div class="col">
<section class="block block-links"> <section class="block block-links">
<div class="block-heading"><h3 class="block-title">Latest articles</h3></div> <div class="block-heading"><h3 class="block-title">{intl l="Latest articles"}</h3></div>
<div class="block-content"> <div class="block-content">
{ifloop rel="blog.articles"} {ifloop rel="blog.articles"}
<ul> <ul>
@@ -328,16 +328,16 @@ URL: http://www.thelia.net
<ul> <ul>
<li class="contact-address"> <li class="contact-address">
<address class="adr" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress"> <address class="adr" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
<span class="street-address" itemprop="streetAddress">street name of my business</span><br> <span class="street-address" itemprop="streetAddress">Street name of my business</span><br>
<span class="postal-code" itemprop="postalCode">75000</span> <span class="postal-code" itemprop="postalCode">75000</span>
<span class="locality" itemprop="addressLocality">City, <span class="country-name">Country</span></span> <span class="locality" itemprop="addressLocality">City, <span class="country-name">France</span></span>
</address> </address>
</li> </li>
<li class="contact-phone"> <li class="contact-phone">
<span class="tel" itemprop="telephone">+33 04 44 05 31 00</span> <span class="tel" itemprop="telephone">+33 (0)0 00 00 00 00</span>
</li> </li>
<li class="contact-email"> <li class="contact-email">
{mailto address="info@thelia.net" encode="hex" extra='class="email" itemprop="email"'} {mailto address="contact@yourdomain.com" encode="hex" extra='class="email" itemprop="email"'}
</li> </li>
</ul> </ul>
</div> </div>
@@ -362,7 +362,7 @@ URL: http://www.thelia.net
</ul> </ul>
</nav> </nav>
<section class="copyright">Copyright &copy; <time datetime="2013-08-01">2013</time> <a href="http://www.thelia.net" rel="external">Thelia</a></section> <section class="copyright">{intl l="Copyright"} &copy; <time datetime="{'Y-m-d'|date}">{'Y'|date}</time> <a href="http://www.thelia.net" rel="external">Thelia</a></section>
</div> </div>
</div> </div>
</footer><!-- /.footer-info --> </footer><!-- /.footer-info -->

38
templates/default/order-delivery.html
View File

@@ -31,6 +31,7 @@
</div> </div>
{form name="thelia.order.delivery"} {form name="thelia.order.delivery"}
{assign var="isPost" value="{$smarty.post|count}"}
<form id="form-cart-delivery" action="{url path="/order/delivery"}" method="post" role="form" {form_enctype form=$form}> <form id="form-cart-delivery" action="{url path="/order/delivery"}" method="post" role="form" {form_enctype form=$form}>
{form_hidden_fields form=$form} {form_hidden_fields form=$form}
@@ -42,7 +43,7 @@
<div id="delivery-address" class="panel"> <div id="delivery-address" class="panel">
<div class="panel-heading clearfix"> <div class="panel-heading clearfix">
<a href="{url path="/address/create"}" class="btn btn-add-address">{intl l="Add a new address"}</a> <a href="{url path="/address/create"}" class="btn btn-add-address">{intl l="Add a new address"}</a>
{intl l="Chose your delivery address"} {intl l="Choose your delivery address"}
{if $error} {if $error}
<span class="help-block"><span class="icon-remove"></span> {$message}</span> <span class="help-block"><span class="icon-remove"></span> {$message}</span>
{/if} {/if}
@@ -50,18 +51,20 @@
<div class="panel-body"> <div class="panel-body">
<table class="table table-address" role="presentation" summary="Address Books"> <table class="table table-address" role="presentation" summary="Address Books">
<tbody> <tbody>
{loop type="address" name="customer.addresses" customer="current"} {loop type="address" name="customer.addresses" customer="current"}
{if $isPost}
{if $value == $ID}
{assign var="isDeliveryAddressChecked" value="true"}
{/if}
{elseif $DEFAULT}
{assign var="isDeliveryAddressChecked" value="true"}
{/if}
<tr> <tr>
<th> <th>
<div class="radio"> <div class="radio">
<label for="delivery-address_{$ID}"> <label for="delivery-address_{$ID}">
<input type="radio" name="{$name}" value="{$ID}"{if isDeliveryAddressChecked } checked="checked"{/if} id="delivery-address_{$ID}">
<input type="radio" name="{$name}" value="{$ID}" {if $value == $ID}checked="checked"{/if} id="delivery-address_{$ID}"> {$LABEL|default:"{intl l='Address %nb' nb={$LOOP_COUNT}}"}
{$LABEL}
</label> </label>
</div> </div>
</th> </th>
@@ -125,12 +128,19 @@
<div class="panel-body"> <div class="panel-body">
{loop type="delivery" name="deliveries" force_return="true"} {loop type="delivery" name="deliveries" force_return="true"}
<div class="radio"> <div class="radio">
<label for="delivery-method_1"> {form_field form=$form field='delivery-module'}
{form_field form=$form field='delivery-module'} {if $isPost}
<input type="radio" name="{$name}" {if $value == $ID}checked="checked"{/if} value="{$ID}"> {if $value == $ID}
{/form_field} {assign var="isDeliveryMethodChecked" value="true"}
<strong>{$TITLE}</strong> / {currency attr="symbol"} {$POSTAGE} {/if}
</label> {elseif $LOOP_COUNT == 1}
{assign var="isDeliveryMethodChecked" value="true"}
{/if}
<label for="delivery-method_{$ID}">
<input type="radio" name="{$name}" id="delivery-method_{$ID}"{if $isDeliveryMethodChecked} checked="checked"{/if} value="{$ID}">
<strong>{$TITLE}</strong> / {currency attr="symbol"} {$POSTAGE}
</label>
{/form_field}
</div> </div>
{/loop} {/loop}
</div> </div>

3
templates/default/order-invoice.html
View File

@@ -70,7 +70,6 @@
<tbody> <tbody>
{loop type="cart" name="cartloop"} {loop type="cart" name="cartloop"}
<tr> <tr>
<td class="image"> <td class="image">
@@ -141,7 +140,7 @@
<td class="coupon"> <td class="coupon">
{form_field form=$form field='coupon-code'} {form_field form=$form field='coupon-code'}
<div class="input-group {if $error}has-error{/if}"> <div class="input-group {if $error}has-error{/if}">
<label class="control-label" for="code">{intl l='Code :'}</label> <label class="control-label sr-only" for="code">{intl l='Code :'}</label>
<input id="coupon" class="form-control" type="text" name="{$name}" value="{$value}" placeholder="{intl l='Coupon code'}"> <input id="coupon" class="form-control" type="text" name="{$name}" value="{$value}" placeholder="{intl l='Coupon code'}">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn btn-coupon">{intl l="Ok"}</button> <button type="submit" class="btn btn-coupon">{intl l="Ok"}</button>