[IMP] improved css for checkout form and others.
bzr revid: psa@tinyerp.com-20130826074016-bejnsnij9ly9df93
This commit is contained in:
Paramjit Singh Sahota
@@ -23,7 +23,7 @@
|
||||
<i class="icon-shopping-cart"></i>
|
||||
My cart
|
||||
<t t-if="order and order.get_total_quantity()">
|
||||
<span class="badge badge-success" t-esc="order.get_total_quantity()"/>
|
||||
<span class="badge" t-esc="order.get_total_quantity()"/>
|
||||
</t>
|
||||
</a>
|
||||
</li>
|
||||
@@ -97,8 +97,8 @@
|
||||
<t t-call="website_sale.layout">
|
||||
<t t-set="title">Product</t>
|
||||
<t t-set="shop_content">
|
||||
<div class='navbar navbar-inverse'>
|
||||
<div class='navbar-inner'>
|
||||
<nav class='navbar navbar-default navbar-inverse'>
|
||||
<div class='navbar-header'>
|
||||
<t t-call="website.pager" >
|
||||
<t t-set="classname">pull-left</t>
|
||||
</t>
|
||||
@@ -106,13 +106,13 @@
|
||||
<input type="text" name="search" class="search-query col-md-2" placeholder="Search" t-att-value="search or '' or ''"/>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
<div class='row grid grid-align-top'>
|
||||
<t t-foreach="products" t-as="product">
|
||||
<div t-attf-class="col-md-2 mb16 thumbnail text-center #{not product.website_published and 'alert' or ''}">
|
||||
<div t-attf-class="col-md-2 mb16 thumbnail text-center #{not product.website_published and 'alert alert-warning' or ''}">
|
||||
<a t-attf-href="/shop/product/#{ product.id }/?#{ search and ('search=%s' % search) or ''}#{ category_id and ('&category_id=%s' % category_id) or ''}">
|
||||
<h5 t-field="product.name"> </h5>
|
||||
<img class="img-rounded" t-att-src="product.img('image_small')"/>
|
||||
<img class="img-rounded" t-att-src="product.img('image_small')" />
|
||||
</a>
|
||||
<div>
|
||||
<div t-field="product.description_sale"></div>
|
||||
@@ -142,13 +142,13 @@
|
||||
<t t-call="website_sale.layout">
|
||||
<t t-set="title">Product</t>
|
||||
<t t-set="shop_content">
|
||||
<div class='navbar navbar-inverse'>
|
||||
<div class='navbar-inner'>
|
||||
<nav class='navbar navbar-default navbar-inverse'>
|
||||
<div class='navbar-header'>
|
||||
<form t-attf-action="/shop/#{ category_id and ('category/%s/' % category_id) or ''}" method="get" class="navbar-search pull-right pagination">
|
||||
<input type="text" name="search" class="search-query col-md-2" placeholder="Search" t-att-value="search or '' or ''"/>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
<div id="product_detail">
|
||||
<t t-call="website.publish"><t t-set="object" t-value="product"/></t>
|
||||
<h2 t-field="product.name"></h2>
|
||||
@@ -158,10 +158,10 @@
|
||||
<input type="radio" name="product_id" t-att-value="product.id" t-att-checked="product == product.product_variant_ids[0] or None" />
|
||||
<t t-esc="product.variants or ''">Standard</t>
|
||||
<span class="badge" t-if="product.price_extra"><t t-esc="product.price_extra > 0 and '+' or ''"/><t t-esc="product.price_extra"/> €</span>
|
||||
</label></br>
|
||||
</label><br/>
|
||||
<button class="btn btn-default btn-small btn-success">Add to cart</button>
|
||||
</form>
|
||||
<img class="media-object" t-att-src="product.img('image_medium')"/>
|
||||
<img class="media-object img-responsive" t-att-src="product.img('image_medium')"/>
|
||||
<div t-field="product.website_description"></div>
|
||||
<div>
|
||||
<t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
|
||||
@@ -182,7 +182,7 @@
|
||||
<div class='col-md-2 thumbnail'>
|
||||
<a t-attf-href="/shop/product/#{ product.id }/">
|
||||
<div class='mt16 text-center'>
|
||||
<img t-att-src="product.img('image_small')"/>
|
||||
<img t-att-src="product.img('image_small')" class="img-responsive" />
|
||||
<h5 t-field='product.name'></h5>
|
||||
</div>
|
||||
</a>
|
||||
@@ -306,7 +306,7 @@
|
||||
<div class='col-md-2 thumbnail'>
|
||||
<a t-attf-href="/shop/product/#{ product.id }/">
|
||||
<div class='mt16 text-center'>
|
||||
<img t-att-src="product.img('image_small')"/>
|
||||
<img t-att-src="product.img('image_small')" class="img-responsive" />
|
||||
<h5 t-field='product.name'></h5>
|
||||
</div>
|
||||
</a>
|
||||
@@ -318,7 +318,7 @@
|
||||
</template>
|
||||
<template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
|
||||
<xpath expr="//table[@id='mycart_total']" position="after">
|
||||
<form t-if="order and order.order_line" class="well form-search" action="/shop/mycart/" method="post">
|
||||
<form t-if="order and order.order_line" class="well" action="/shop/mycart/" method="post">
|
||||
<input name="promo" class='input' type="text" placeholder="Reduction Code..." t-att-value="order.pricelist_id.code or ''"/>
|
||||
<button class="btn">Apply Code</button>
|
||||
</form>
|
||||
@@ -365,53 +365,53 @@
|
||||
<form class="col-md-8 form-horizontal" action="/shop/confirm_order/" method="post">
|
||||
<div class=" row">
|
||||
<a t-if="not partner" t-attf-href="/admin#action=redirect&url=#{ host_url }/shop/checkout/" class="btn btn-default btn-primary">Log me, I have an account</a>
|
||||
<h3 class="col-md-8">Billing Information</h3>
|
||||
<div t-attf-class="control-group #{error.get('name', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Name and firstname</label>
|
||||
<div class="controls">
|
||||
<h3 class="col-md-10">Billing Information</h3>
|
||||
<div t-attf-class="form-group #{error.get('name', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Name and firstname</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="text" name="name" t-att-value="checkout.get('name', '')"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('phone', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Telephone</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('phone', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Telephone</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="phone" t-att-value="checkout.get('phone', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('fax', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Fax</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('fax', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Fax</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="fax" t-att-value="checkout.get('fax', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('company', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Company</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('company', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Company</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="company" t-att-value="checkout.get('company', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('email', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Email address</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('email', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Email address</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="email" t-att-value="checkout.get('email', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('street', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Street</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('street', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Street</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="street" t-att-value="checkout.get('street', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('city', '')}">
|
||||
<label class="control-label label-default" for="contact_name">City</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('city', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">City</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="city" t-att-value="checkout.get('city', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('state_id', '')}">
|
||||
<label class="control-label label-default" for="contact_name">State / Province</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('state_id', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">State / Province</label>
|
||||
<div class="col-lg-4">
|
||||
<select name="state_id">
|
||||
<option value="">State / Province...</option>
|
||||
<t t-foreach="states or []" t-as="state">
|
||||
@@ -420,15 +420,15 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('zip', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Zip / Postal Code</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('zip', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Zip / Postal Code</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="zip" t-att-value="checkout.get('zip', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('country_id', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Country</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('country_id', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Country</label>
|
||||
<div class="col-lg-4">
|
||||
<select name="country_id">
|
||||
<option value="">Country...</option>
|
||||
<t t-foreach="countries or []" t-as="country">
|
||||
@@ -437,8 +437,8 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group checkbox">
|
||||
<div class="controls">
|
||||
<div class="form-group checkbox">
|
||||
<div class="col-lg-3">
|
||||
<label label-default="label-default" class="checkbox">
|
||||
<input t-if="not shipping" type="checkbox" name="shipping_different"/>
|
||||
<input t-if="shipping" type="checkbox" name="shipping_different" checked="1"/>
|
||||
@@ -448,40 +448,40 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="js_shipping row" t-att-style="not shipping and 'display:none' or ''">
|
||||
<h3 class="col-md-8 oe_shipping">Shipping Information</h3>
|
||||
<div t-attf-class="control-group #{error.get('shipping_name', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Name and firstname</label>
|
||||
<div class="controls">
|
||||
<h3 class="col-md-12 oe_shipping">Shipping Information</h3>
|
||||
<div t-attf-class="form-group #{error.get('shipping_name', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Name and firstname</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="text" name="shipping_name" t-att-value="checkout.get('shipping_name', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('shipping_phone', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Telephone</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('shipping_phone', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Telephone</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="shipping_phone" t-att-value="checkout.get('shipping_phone', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('shipping_fax', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Fax</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('shipping_fax', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Fax</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="shipping_fax" t-att-value="checkout.get('shipping_fax', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('shipping_street', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Street</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('shipping_street', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Street</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="shipping_street" t-att-value="checkout.get('shipping_street', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('shipping_city', '')}">
|
||||
<label class="control-label label-default" for="contact_name">City</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('shipping_city', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">City</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="shipping_city" t-att-value="checkout.get('shipping_city', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('shipping_state_id', '')}">
|
||||
<label class="control-label label-default" for="contact_name">State / Province</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('shipping_state_id', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">State / Province</label>
|
||||
<div class="col-lg-4">
|
||||
<select name="shipping_state_id">
|
||||
<option value="">State / Province...</option>
|
||||
<t t-foreach="states or []" t-as="state">
|
||||
@@ -490,15 +490,15 @@
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('shipping_zip', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Zip / Postal Code</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('shipping_zip', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Zip / Postal Code</label>
|
||||
<div class="col-lg-4">
|
||||
<input type="tel" name="shipping_zip" t-att-value="checkout.get('shipping_zip', '')"/>
|
||||
</div>
|
||||
</div>
|
||||
<div t-attf-class="control-group #{error.get('shipping_country_id', '')}">
|
||||
<label class="control-label label-default" for="contact_name">Country</label>
|
||||
<div class="controls">
|
||||
<div t-attf-class="form-group #{error.get('shipping_country_id', '')}">
|
||||
<label class="col-lg-3 control-label" for="contact_name">Country</label>
|
||||
<div class="col-lg-4">
|
||||
<select name="shipping_country_id">
|
||||
<option value="">Country...</option>
|
||||
<t t-foreach="countries or []" t-as="country">
|
||||
|
||||
Reference in New Issue
Block a user