diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 39cdde90326..7f6ab93a2d7 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -311,7 +311,8 @@ FaceTime HD Camera, 1.2 MP Photos
-
+
+
iPod
M-Las
@@ -322,6 +323,24 @@ FaceTime HD Camera, 1.2 MP Photos
+
+ iPod
+ M-Las
+
+
+ 14
+ 16.50
+ consu
+
+
+
+
+
+ 32 Gb
+ 12
+
+
+
Mouse, Wireless
M-Wir
@@ -1023,12 +1042,12 @@ QWERTY keyboard
1
-
+
diff --git a/addons/product/product_image_demo.xml b/addons/product/product_image_demo.xml
index b4c1776559d..f07e67b698c 100644
--- a/addons/product/product_image_demo.xml
+++ b/addons/product/product_image_demo.xml
@@ -194,9 +194,9 @@
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
-
+
diff --git a/addons/website_sale/product.py b/addons/website_sale/product.py
index 344787fe6b7..06c53c0af1d 100644
--- a/addons/website_sale/product.py
+++ b/addons/website_sale/product.py
@@ -88,4 +88,5 @@ class product_product(osv.Model):
}
def img(self, cr, uid, ids, field='image_small', context=None):
- return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])
+ temp_id = self.browse(cr, uid, ids[0], context=context).product_tmpl_id.id
+ return "/website/image?model=product.template&field=%s&id=%s" % (field, temp_id)
diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 65323ba883f..eb8ed400341 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -1,5 +1,19 @@
@charset "utf-8";
/* ---- Default Styles Description ---- */
+.oe_product_image {
+ position: absolute;
+}
+.oe_product_image img {
+ max-width: 100%;
+ max-height: 100%;
+ margin: auto;
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+}
+
.oe_product .oe_product_image {
position: absolute;
left: 15px;
@@ -72,16 +86,16 @@
/* ---- Product Sizes ---- */
.col-md-12 .oe-height-1 {
- height: 170px;
+ height: 125px;
}
.col-md-12 .oe-height-2 {
- height: 255px;
+ height: 250px;
}
.col-md-12 .oe-height-3 {
- height: 340px;
+ height: 375px;
}
.col-md-12 .oe-height-4 {
- height: 510px;
+ height: 499.9px;
}
.col-md-9 .oe-height-1 {
@@ -98,22 +112,33 @@
}
/* ---- Product list style ---- */
-.oe_products {
+.oe_list_products {
border: 1px solid rgba(100, 100, 100, 0.2);
max-width: 100%;
max-height: 140px;
}
-.oe_products .oe_product_image {
+.oe_list_products .oe_product_image {
+ position: absolute;
left: 15px;
right: 15px;
- top: 15px;
- bottom: 50px;
- width: 200px;
+ top: 0;
+ bottom: 0;
+ width: 150px;
}
-.oe_products .oe_product_description {
+.oe_list_products .oe_product_image img {
+ max-width: 100%;
+ max-height: 100%;
+ margin: auto;
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+}
+.oe_list_products .oe_product_description {
bottom: 0;
position: absolute;
- left: 240px;
- right: 240px;
+ left: 180px;
+ right: 0;
border-top: 1px solid #dddddd;
}
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index d9eecb01145..03f1351ffeb 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -1,6 +1,19 @@
@charset "utf-8"
/* ---- Default Styles Description ---- */
+
+.oe_product_image
+ position: absolute
+ img
+ max-width: 100%
+ max-height: 100%
+ margin: auto
+ position: absolute
+ top: 0
+ left: 0
+ bottom: 0
+ right: 0
+
.oe_product
.oe_product_image
position: absolute
@@ -74,13 +87,13 @@
.col-md-12
.oe-height-1
- height: 170px
+ height: 125px
.oe-height-2
- height: 255px
+ height: 250px
.oe-height-3
- height: 340px
+ height: 375px
.oe-height-4
- height: 510px
+ height: 499.9px
.col-md-9
.oe-height-1
height: 95px
@@ -93,19 +106,29 @@
/* ---- Product list style ---- */
-.oe_products
+.oe_list_products
border: 1px solid rgba(100, 100, 100, 0.2)
max-width: 100%
max-height: 140px
.oe_product_image
+ position: absolute
left: 15px
right: 15px
- top: 15px
- bottom: 50px
- width: 200px
+ top: 0
+ bottom: 0
+ width: 150px
+ img
+ max-width: 100%
+ max-height: 100%
+ margin: auto
+ position: absolute
+ top: 0
+ left: 0
+ bottom: 0
+ right: 0
.oe_product_description
bottom: 0
position: absolute
- left: 240px
- right: 240px
+ left: 180px
+ right: 0
border-top: 1px solid #dddddd
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 3e804ffb26c..b8c513432d5 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -113,7 +113,7 @@