From 71ab933988590a8f71902b50f05489080dd46f9a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 23 Sep 2013 16:44:41 +0530
Subject: [PATCH 1/5] More customizable options: Add to Cart must be in a
 inherit_option_id Product sale_description must be in a inherit_option_id

bzr revid: psa@tinyerp.com-20130923111441-pxhn2u2ex1oh1cws
---
 addons/website_sale/views/website_sale.xml | 28 +++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index cc855da8be4..bc447084362 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -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,26 @@
         </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_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>
+
     <!-- product --> 
 
     <template id="product" name="Product">

From f06f48ce5244dc8247c57002e6f10f37508905be Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 23 Sep 2013 18:17:52 +0530
Subject: [PATCH 2/5] [IMP] added list grid for shop.

bzr revid: psa@tinyerp.com-20130923124752-dhg0aao3diuh1isn
---
 .../static/src/css/website_sale.css           | 24 ++++++++++-
 addons/website_sale/views/website_sale.xml    | 42 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 8527eded0d8..1b22a066d2e 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -7,7 +7,6 @@
   top: 15px;
   bottom: 50px;
 }
-
 .oe_product_description {
   bottom: 0;
   position: absolute;
@@ -15,6 +14,29 @@
   right: 15px;
   border-top: 1px solid #dddddd;
 }
+.oe_products {
+  border: 1px solid rgba(100, 100, 100, 0.2);
+  max-width: 100%;
+  max-height: 140px;
+}
+.oe_product_list_image {
+  left: 15px;
+  right: 15px;
+  top: 15px;
+  bottom: 50px;
+  width: 200px;
+}
+.oe_products .oe_product_list_image img {
+  width: 150px;
+  height: 140px;
+}
+.oe_product_list_description {
+  bottom: 0;
+  position: absolute;
+  left: 240px;
+  right: 240px;
+  border-top: 1px solid #dddddd;
+}
 
 .oe_shop_top .oe_product_description {
   top: 0;
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index bc447084362..d6897685d16 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -165,7 +165,7 @@
 
     <!-- Add to cart button-->
 
-    <template id="add_basket" inherit_option_id="website_sale.products" name="Add to Cart">
+    <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"/>
@@ -173,6 +173,46 @@
         </xpath>
     </template>
 
+    <!-- List view of products -->
+
+    <template id="add_basket" inherit_option_id="website_sale.products" name="List View">
+        <xpath expr="//div[@id='products_grid']" position="replace">
+            <div class="col-md-12">
+                <t t-foreach="products" t-as="product">
+                    <div class="col-md-12 oe_products oe-height-1}" t-att-data-publish="product.website_published" data-snippet-id="colmd">
+                        <div class="oe_product_list_image .col-md-3">
+                            <a t-attf-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')"/>
+                            </a>
+                        </div>
+                        <div class="oe_product_list_description .col-md-offset-3">
+                            <a t-attf-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>
+                            <!-- This should be an option -->
+                            <div t-if="product.description_sale" class="text-muted oe_subdescription">
+                                <div id="product_description" t-att-data-name="product.id"/>
+                            </div>
+                            <div>
+                                <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>
+                                <span id="add_to_cart" t-att-data-name="product.id"/>
+                            </div>
+                        </div>
+
+                    </div>
+                </t>
+            </div>
+        </xpath>
+    </template>
+
+
     <!-- product --> 
 
     <template id="product" name="Product">

From de41937cfb4b73f48ba4bcab7d4aecddd181d5b9 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 23 Sep 2013 18:32:38 +0530
Subject: [PATCH 3/5] [IMP] Improved the template id.

bzr revid: psa@tinyerp.com-20130923130238-4it782jesm211t6w
---
 addons/website_sale/views/website_sale.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index d6897685d16..b46bc32f0f7 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -175,7 +175,7 @@
 
     <!-- List view of products -->
 
-    <template id="add_basket" inherit_option_id="website_sale.products" name="List View">
+    <template id="list_view" inherit_option_id="website_sale.products" name="List View">
         <xpath expr="//div[@id='products_grid']" position="replace">
             <div class="col-md-12">
                 <t t-foreach="products" t-as="product">

From 7a76a45a50cb3cfe38243ef62399fc7b1e7f2d9e Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 23 Sep 2013 18:46:11 +0530
Subject: [PATCH 4/5] done the same changes in sass as in css.

bzr revid: psa@tinyerp.com-20130923131611-eoexbw2a9dbxxyum
---
 .../static/src/css/website_sale.css           | 47 ++++++++++---------
 .../static/src/css/website_sale.sass          | 21 +++++++++
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 1b22a066d2e..bbd598f992c 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -14,29 +14,6 @@
   right: 15px;
   border-top: 1px solid #dddddd;
 }
-.oe_products {
-  border: 1px solid rgba(100, 100, 100, 0.2);
-  max-width: 100%;
-  max-height: 140px;
-}
-.oe_product_list_image {
-  left: 15px;
-  right: 15px;
-  top: 15px;
-  bottom: 50px;
-  width: 200px;
-}
-.oe_products .oe_product_list_image img {
-  width: 150px;
-  height: 140px;
-}
-.oe_product_list_description {
-  bottom: 0;
-  position: absolute;
-  left: 240px;
-  right: 240px;
-  border-top: 1px solid #dddddd;
-}
 
 .oe_shop_top .oe_product_description {
   top: 0;
@@ -108,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_list_image img {
+  width: 150px;
+  height: 140px;
+}
+.oe_product_list_image {
+  left: 15px;
+  right: 15px;
+  top: 15px;
+  bottom: 50px;
+  width: 200px;
+}
+.oe_product_list_description {
+  bottom: 0;
+  position: absolute;
+  left: 240px;
+  right: 240px;
+  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 4efb1a84c54..4e61cfd8410 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -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_list_image
+    left: 15px
+    right: 15px
+    top: 15px
+    bottom: 50px
+    width: 200px
+.oe_product_list_description
+    bottom: 0
+    position: absolute
+    left: 240px
+    right: 240px
+    border-top: 1px solid #dddddd

From 8fc38776462d912e1103a66e4eee839f325d0db0 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 24 Sep 2013 12:16:17 +0530
Subject: [PATCH 5/5] [IMP] Improved code to make small way to change to list
 view rather than writing the whole product template code twice.

bzr revid: psa@tinyerp.com-20130924064617-40ruht7l15c08p7y
---
 .../static/src/css/website_sale.css           |  8 ++--
 .../static/src/css/website_sale.sass          | 38 +++++++++----------
 addons/website_sale/views/website_sale.xml    | 38 ++-----------------
 3 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index bbd598f992c..e630e78caef 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -1,6 +1,6 @@
 @charset "utf-8";
 /* ---- Default Styles Description ---- */
-.oe_product_image {
+.oe_product .oe_product_image {
   position: absolute;
   left: 15px;
   right: 15px;
@@ -91,18 +91,18 @@
   max-width: 100%;
   max-height: 140px;
 }
-.oe_products .oe_product_list_image img {
+.oe_products .oe_product_image img {
   width: 150px;
   height: 140px;
 }
-.oe_product_list_image {
+.oe_products .oe_product_image {
   left: 15px;
   right: 15px;
   top: 15px;
   bottom: 50px;
   width: 200px;
 }
-.oe_product_list_description {
+.oe_products .oe_product_description {
   bottom: 0;
   position: absolute;
   left: 240px;
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 4e61cfd8410..36a6abae385 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -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
@@ -93,15 +93,15 @@
         img
             width: 150px
             height: 140px
-.oe_product_list_image
-    left: 15px
-    right: 15px
-    top: 15px
-    bottom: 50px
-    width: 200px
-.oe_product_list_description
-    bottom: 0
-    position: absolute
-    left: 240px
-    right: 240px
-    border-top: 1px solid #dddddd
+    .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
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 00fb01ee382..0a48ccfacac 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -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" data-snippet-id="colmd">
+                        <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" data-snippet-id="colmd" 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 ''}">
@@ -176,40 +176,10 @@
     <!-- List view of products -->
 
     <template id="list_view" inherit_option_id="website_sale.products" name="List View">
-        <xpath expr="//div[@id='products_grid']" position="replace">
-            <div class="col-md-12">
-                <t t-foreach="products" t-as="product">
-                    <div class="col-md-12 oe_products oe-height-1}" t-att-data-publish="product.website_published" data-snippet-id="colmd">
-                        <div class="oe_product_list_image .col-md-3">
-                            <a t-attf-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')"/>
-                            </a>
-                        </div>
-                        <div class="oe_product_list_description .col-md-offset-3">
-                            <a t-attf-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>
-                            <!-- This should be an option -->
-                            <div t-if="product.description_sale" class="text-muted oe_subdescription">
-                                <div id="product_description" t-att-data-name="product.id"/>
-                            </div>
-                            <div>
-                                <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>
-                                <span id="add_to_cart" t-att-data-name="product.id"/>
-                            </div>
-                        </div>
-
-                    </div>
-                </t>
-            </div>
+        <xpath  expr="//div[@id='products_layout']" position="attributes">
+            <attribute name="class">col-md-12 oe_products oe-height-1</attribute>
         </xpath>
+
     </template>