pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] website_sale: add layout options and css

Browse Source 
bzr revid: chm@openerp.com-20130924083349-1woicpx50668272g
This commit is contained in:
Christophe Matthieu
2013-09-24 10:33:49 +02:00
parent 9bb4af7d9f ce9a7cccce
commit b1cf178978
3 changed files with 86 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/static/src/css/website_sale.css
+25 -2
View File
@@ -1,13 +1,12 @@
@charset "utf-8";
/* ---- Default Styles Description ---- */
.oe_product_image {
.oe_product .oe_product_image {
position: absolute;
left: 15px;
right: 15px;
top: 15px;
bottom: 50px;
}
.oe_product_description {
bottom: 0;
position: absolute;
@@ -86,3 +85,27 @@
.oe-height-4 {
height: 510px;
}
/* ---- Product list style ---- */
.oe_products {
border: 1px solid rgba(100, 100, 100, 0.2);
max-width: 100%;
max-height: 140px;
}
.oe_products .oe_product_image img {
width: 150px;
height: 140px;
}
.oe_products .oe_product_image {
left: 15px;
right: 15px;
top: 15px;
bottom: 50px;
width: 200px;
}
.oe_products .oe_product_description {
bottom: 0;
position: absolute;
left: 240px;
right: 240px;
border-top: 1px solid #dddddd;
}
addons/website_sale/static/src/css/website_sale.sass
+28 -7
View File
@@ -1,13 +1,13 @@
@charset "utf-8"
/* ---- Default Styles Description ---- */
.oe_product_image
position: absolute
left: 15px
right: 15px
top: 15px
bottom: 50px
.oe_product
.oe_product_image
position: absolute
left: 15px
right: 15px
top: 15px
bottom: 50px
.oe_product_description
bottom: 0
@@ -84,3 +84,24 @@
.oe-height-4
height: 510px
/* ---- Product list style ---- */
.oe_products
border: 1px solid rgba(100, 100, 100, 0.2)
max-width: 100%
max-height: 140px
.oe_product_list_image
img
width: 150px
height: 140px
.oe_product_image
left: 15px
right: 15px
top: 15px
bottom: 50px
width: 200px
.oe_product_description
bottom: 0
position: absolute
left: 240px
right: 240px
border-top: 1px solid #dddddd
addons/website_sale/views/website_sale.xml
+33 -7
View File
@@ -111,7 +111,7 @@
<div class='row style_default'>
<div class="col-md-12" id="products_grid">
<t t-foreach="products" t-as="product">
<div t-attf-class="col-md-#{ product.website_sizex } oe_product oe-height-#{ product.website_sizey } #{ product.website_product_class}" t-att-data-publish="product.website_published">
<div t-attf-class="col-md-#{ product.website_sizex } oe_product oe-height-#{ product.website_sizey } #{ product.website_product_class}" t-att-data-publish="product.website_published" id="products_layout">
<div class="oe_product_description">
<a t-attf-href="/shop/product/#{ product.id }/?#{ search and ('search=%s' % search) or ''}#{ category_id and ('&amp;category_id=%s' % category_id) or ''}">
@@ -119,9 +119,7 @@
</a>
<!-- This should be an option -->
<div t-if="product.description_sale" class="text-muted oe_subdescription">
<!-- TODO: replace by a smart t-field on field.text: description_sale -->
<small t-raw="product.description_sale.replace('\n','&lt;br/&gt;') "/>
<div id="product_description" t-att-data-name="product.id"/>
</div>
<div>
<b>
@@ -132,9 +130,7 @@
</t>
<t t-esc="product.product_variant_ids[0].price" /> €
</b>
<a t-attf-href="./add_cart/?product_id=#{ product.id }">
<span class="icon-shopping-cart"/>
</a>
<span id="add_to_cart" t-att-data-name="product.id"/>
</div>
</div>
@@ -157,6 +153,36 @@
</t>
</template>
<!-- Product Description-->
<template id="product_description" inherit_option_id="website_sale.products" name="Product Description">
<xpath expr="//div[@id='product_description']" position="replace">
<small>
<t t-field="product.description_sale"/>
</small>
</xpath>
</template>
<!-- Add to cart button-->
<template id="add_to_basket" inherit_option_id="website_sale.products" name="Add to Cart">
<xpath expr="//span[@id='add_to_cart']" position="replace">
<a t-attf-href="./add_cart/?product_id=#{ product.id }">
<span class="icon-shopping-cart"/>
</a>
</xpath>
</template>
<!-- List view of products -->
<template id="list_view" inherit_option_id="website_sale.products" name="List View">
<xpath expr="//div[@id='products_layout']" position="attributes">
<attribute name="class">col-md-12 oe_products oe-height-1</attribute>
</xpath>
</template>
<!-- product -->
<template id="product" name="Product">