[FIX] website_view: css price with position absolute for description

bzr revid: chm@openerp.com-20131009135914-nq5sr4qi7dc5wbsv

diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index aba10f6..a4cc4b8 100644 (file)
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -51,8 +51,16 @@
   left: 15px;
   right: 15px;
   border-top: 1px solid #dddddd;
-  max-height: 140px;
+  max-height: 120px;
   overflow: hidden;
+  padding-bottom: 24px;
+}
+
+.product_price {
+  position: absolute;
+  left: 15px;
+  bottom: 5px;
+  z-index: 6;
 }
 
 .oe_mycart .input-group-addon {
@@ -231,6 +239,10 @@
   right: 0;
   border-top: none;
   top: 15px;
+  max-height: 94px;
+}
+.oe_list_products .product_price {
+  left: 180px;
 }
 
 .oe_website_sale .row .row .col-md-12 {

diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 0704afb..e156224 100644 (file)
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -49,8 +49,14 @@
     left: 15px
     right: 15px
     border-top: 1px solid #dddddd
-    max-height: 140px
+    max-height: 120px
     overflow: hidden
+    padding-bottom: 24px
+.product_price
+    position: absolute
+    left: 15px
+    bottom: 5px
+    z-index: 6
 
 .oe_mycart
     .input-group-addon
@@ -200,6 +206,9 @@
         right: 0
         border-top: none
         top: 15px
+        max-height: 94px
+    .product_price
+        left: 180px
 
 .oe_website_sale .row .row .col-md-12
     float: none

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 8d3eef9..6fdb3d8 100644 (file)
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -110,18 +110,17 @@
           <a t-href="/shop/product/#{ product.id }/?#{ search and ('search=%s' % search) or ''}#{ category_id and ('&amp;category_id=%s' % category_id) or ''}">
               <b t-field="product.name"/>
           </a>
-          <div class="product_price">
-              <b>
-                  <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
-                    <span class="text-danger" style="text-decoration: line-through;">
-                        <t t-esc="product.product_variant_ids[0].lst_price" /> €
-                    </span>&amp;nbsp;
-                  </t>
-                  <t t-esc="product.product_variant_ids[0].price" /> €
-              </b>
-          </div>
       </div>
-
+      <div class="product_price">
+          <b>
+              <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
+                <span class="text-danger" style="text-decoration: line-through;">
+                    <t t-esc="product.product_variant_ids[0].lst_price" /> €
+                </span>&amp;nbsp;
+              </t>
+              <t t-esc="product.product_variant_ids[0].price" /> €
+          </b>
+      </div>
       <div class="oe_product_image text-center">
           <a t-href="/shop/product/#{ product.id }/?#{ search and ('search=%s' % search) or ''}#{ category_id and ('&amp;category_id=%s' % category_id) or ''}">
               <img class="img" t-att-src="product.img('image')"/>
@@ -245,7 +244,7 @@
     <!-- Product Description-->
 
     <template id="product_description" inherit_option_id="website_sale.products_cart" name="Product Description">
-        <xpath expr="//div[@class='product_price']" position="before">
+        <xpath expr="//div[@class='oe_product_description']" position="inside">
             <p class="text-muted oe_subdescription">
                 <span t-field="product.description_sale"/>
             </p>