From c3cc2b08f1b563e4e883d95e6cc89c81633218f1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 11:57:44 +0100
Subject: [PATCH 1/9] [IMP] website_sale: demo data for suggested product

bzr revid: chm@openerp.com-20140114105744-gz1z4ap9zra33s11
---
 addons/website_sale/data/website_sale_demo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_sale/data/website_sale_demo.xml b/addons/website_sale/data/website_sale_demo.xml
index c16690f763d..d28a587603d 100644
--- a/addons/website_sale/data/website_sale_demo.xml
+++ b/addons/website_sale/data/website_sale_demo.xml
@@ -536,6 +536,7 @@ Weight: 1.1 ounces</field>
                     </div>
                 </section>
             </field>
+            <field name="suggested_product_ids" eval="[(6, 0, [ref('product.product_template_7')])]"/>
         </record>
 
         <record id="item1" model="product.pricelist.item">

From fbb74096e3c83449b7a382b1c89799d1f779160c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 11:58:02 +0100
Subject: [PATCH 2/9] [FIX] website_blog: employee can't post a comment

bzr revid: chm@openerp.com-20140114105802-ztc2d398zuz100z0
---
 addons/website_blog/controllers/main.py       | 24 ++++++++++++-------
 .../views/website_blog_templates.xml          |  6 ++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 00835d133ab..fc48266cc5e 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -23,6 +23,7 @@ from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.addons.website.models import website
 from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
 
 import werkzeug
 
@@ -218,16 +219,23 @@ class WebsiteBlog(http.Controller):
         }
         return request.website.render("website_blog.blog_post_complete", values)
 
-    @website.route(['/blogpost/<int:blog_post_id>/comment'], type='http', auth="public")
-    def blog_post_comment(self, blog_post_id, **post):
+    @website.route(['/blogpost/comment'], type='http', auth="public", methods=['POST'])
+    def blog_post_comment(self, blog_post_id=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
         if post.get('comment'):
-            request.registry['blog.post'].message_post(
-                cr, uid, blog_post_id,
-                body=post.get('comment'),
-                type='comment',
-                subtype='mt_comment',
-                context=dict(context, mail_create_nosubcribe=True))
+            user = request.registry['res.users'].browse(cr, SUPERUSER_ID, uid, context=context)
+            group_ids = user.groups_id
+            group_id = request.registry["ir.model.data"].get_object_reference(cr, uid, 'website_mail', 'group_comment')[1]
+            if group_id in [group.id for group in group_ids]:
+                blog_post = request.registry['blog.post']
+                blog_post.check_access_rights(cr, uid, 'read')
+                blog_post.message_post(
+                    cr, SUPERUSER_ID, int(blog_post_id),
+                    body=post.get('comment'),
+                    type='comment',
+                    subtype='mt_comment',
+                    author_id=user.partner_id.id,
+                    context=dict(context, mail_create_nosubcribe=True))
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
     @website.route('/blogpost/new', type='http', auth="public", multilang=True)
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 4fe512381a4..a3afdcbfd83 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -218,10 +218,10 @@
 <template id="opt_blog_post_complete_comment" name="Allow Comments"
         inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete"
         groups="website_mail.group_comment">
-    <xpath expr="//ul[@id='comments-list']" position="after">
+    <xpath expr="//ul[@id='comments-list']" position="before">
         <section class="mb32 css_editable_mode_hidden">
-            <form id="comment" t-attf-action="/blogpost/#{blog_post.id}/comment"
-                    method="POST">
+            <form id="comment" t-attf-action="/blogpost/comment" method="POST">
+                <input name="blog_post_id" t-att-value="blog_post.id" type="hidden"/>
                 <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
                 <div class="pull-left mb32" style="width: 75%%">
                     <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>

From 9e0df88d7ae22e26842e52342e2d734eec0d6d73 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 12:16:07 +0100
Subject: [PATCH 3/9] [ADD] website_mail: css

bzr revid: chm@openerp.com-20140114111607-as9mmdjcyqo2nrnh
---
 addons/website_mail/static/src/css/website_mail.css | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 addons/website_mail/static/src/css/website_mail.css

diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css
new file mode 100644
index 00000000000..5678442416c
--- /dev/null
+++ b/addons/website_mail/static/src/css/website_mail.css
@@ -0,0 +1,4 @@
+.js_follow[data-follow='on'] .js_follow_btn ,
+.js_follow[data-follow='off'] .js_unfollow_btn {
+    display: none;
+}
\ No newline at end of file

From 4e94761a8e0a4351b400dc20cae6a7417b68b01e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 15:29:40 +0100
Subject: [PATCH 4/9] [IMP] product: category and website_sale controllers

bzr revid: chm@openerp.com-20140114142940-xpshp8e6trio5mxc
---
 addons/product/product_view.xml         |  6 +++---
 addons/website_sale/controllers/main.py | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1a75a6e023b..8a22a53d270 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -400,7 +400,7 @@
             <field name="name">product.public.category.form</field>
             <field name="model">product.public.category</field>
             <field name="arch" type="xml">
-                <form string="Product Categories" version="7.0">
+                <form string="Pos/Public Categories" version="7.0">
                     <sheet>
                         <field name="image_medium" widget='image' class="oe_avatar oe_right"/>
                         <div class="oe_left">
@@ -426,7 +426,7 @@
             </field>
         </record>
         <record id="product_public_category_action" model="ir.actions.act_window">
-            <field name="name">Public Categories</field>
+            <field name="name">Pos/Public Product Categories</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.public.category</field>
             <field name="view_type">form</field>
@@ -445,7 +445,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="product_public_category_action" id="menu_product_public_category" parent="base.menu_product" sequence="10" />
+        <menuitem action="product_public_category_action" id="menu_product_public_category" parent="prod_config_main" sequence="10" />
         <!-- END -->
 
         <!-- Unit of Measure -->
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 5f30482723a..7696d01a49d 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -199,10 +199,10 @@ class Ecommerce(http.Controller):
     @website.route([
         '/shop/',
         '/shop/page/<int:page>/',
-        '/shop/category/<int:category>/',
-        '/shop/category/<int:category>/page/<int:page>/'
+        '/shop/category/<model("product.public.category"):category>/',
+        '/shop/category/<model("product.public.category"):category>/page/<int:page>/'
     ], type='http', auth="public", multilang=True)
-    def shop(self, category=0, page=0, filters='', search='', **post):
+    def shop(self, category=None, page=0, filters='', search='', **post):
         cr, uid, context = request.cr, request.uid, request.context
         product_obj = request.registry.get('product.template')
         domain = request.registry.get('website').ecommerce_get_product_domain()
@@ -211,7 +211,7 @@ class Ecommerce(http.Controller):
                 ('name', 'ilike', "%%%s%%" % search),
                 ('description', 'ilike', "%%%s%%" % search)]
         if category:
-            domain.append(('product_variant_ids.public_categ_id', 'child_of', category))
+            domain.append(('product_variant_ids.public_categ_id', 'child_of', category.id))
         if filters:
             filters = simplejson.loads(filters)
             if filters:
@@ -286,7 +286,7 @@ class Ecommerce(http.Controller):
         }
         return request.website.render("website_sale.product", values)
 
-    @website.route(['/shop/product/<int:product_template_id>/comment'], type='http', auth="public")
+    @website.route(['/shop/product/comment'], type='http', auth="public", methods=['POST'])
     def product_comment(self, product_template_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
         if post.get('comment'):
@@ -298,11 +298,11 @@ class Ecommerce(http.Controller):
                 context=dict(context, mail_create_nosubcribe=True))
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
-    @website.route(['/shop/add_product/', '/shop/category/<int:cat_id>/add_product/'], type='http', auth="user", multilang=True, methods=['POST'])
-    def add_product(self, name="New Product", cat_id=0, **post):
+    @website.route(['/shop/add_product/'], type='http', auth="user", multilang=True, methods=['POST'])
+    def add_product(self, name="New Product", category=0, **post):
         Product = request.registry.get('product.product')
         product_id = Product.create(request.cr, request.uid, {
-            'name': name, 'public_categ_id': cat_id
+            'name': name, 'public_categ_id': category
         }, context=request.context)
         product = Product.browse(request.cr, request.uid, product_id, context=request.context)
 

From 9624ec21f8b32cbdc4df06e50922b0400345321a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 15:58:33 +0100
Subject: [PATCH 5/9] [FIX] website_sale_delivery: public mode

bzr revid: chm@openerp.com-20140114145833-73t9cc60z9i8bniw
---
 addons/website_sale_delivery/controllers/main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index b31d0919af6..9c688cc1b97 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -2,6 +2,7 @@
 from openerp.addons.website_sale.controllers.main import Ecommerce
 from openerp.addons.web.http import request
 from openerp.addons.website.models import website
+from openerp import SUPERUSER_ID
 
 
 class Ecommerce(Ecommerce):
@@ -15,8 +16,8 @@ class Ecommerce(Ecommerce):
         if order and carrier_id:
             # recompute delivery costs
             SaleOrder = request.registry['sale.order']
-            SaleOrder.write(cr, uid, [order.id], {'carrier_id': carrier_id}, context=context)
-            SaleOrder.delivery_set(cr, uid, [order.id], context=context)
+            SaleOrder.write(cr, SUPERUSER_ID, [order.id], {'carrier_id': carrier_id}, context=context)
+            SaleOrder.delivery_set(cr, SUPERUSER_ID, [order.id], context=context)
 
         res = super(Ecommerce, self).payment(**post)
         return res

From f51b91c345a884deaf2c70d42c8716b4addc09b1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 16:12:43 +0100
Subject: [PATCH 6/9] [FIX] website: mobile snippets height

bzr revid: chm@openerp.com-20140114151243-u1rjzw0exhskukbx
---
 addons/website/static/src/css/website.css  | 11 +++++++++--
 addons/website/static/src/css/website.sass |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index ca59f4c5697..9092b347e1f 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 /*       THIS CSS FILE IS FOR WEBSITE THEMING CUSTOMIZATION ONLY
  *
  * css for editor buttons, openerp widget included in the website and other
@@ -334,10 +335,15 @@ ul.nav-stacked > li > a {
 }
 
 /* ---- SNIPPETS --- */
-[data-snippet-id],.colmd,.hr,.blockquote {
-    overflow: hidden;
+[data-snippet-id], .colmd, .hr, .blockquote {
+  overflow: hidden;
 }
 
+@media (max-width: 400px) {
+  [data-snippet-id] {
+    height: auto !important;
+  }
+}
 .carousel-inner {
   height: 100%;
 }
@@ -345,6 +351,7 @@ ul.nav-stacked > li > a {
   height: 100%;
   background-size: 100%;
 }
+
 .carousel .carousel-caption {
   left: auto;
   right: auto;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index ab13d795465..ec7984505f8 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -245,6 +245,10 @@ ul.nav-stacked > li > a
 [data-snippet-id],.colmd,.hr,.blockquote
     overflow: hidden
 
+@media (max-width: 400px)
+    [data-snippet-id]
+        height: auto !important
+
 .carousel-inner
     height: 100%
     .item

From 9a53155e7e827d756c8fad89652fca153d7a27a2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 16:22:08 +0100
Subject: [PATCH 7/9] [IMP] product: product_variant restrict to the
 group_product_variant

bzr revid: chm@openerp.com-20140114152208-r2hasl9arc28rmm2
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8a22a53d270..1ea85cc96d4 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -802,7 +802,7 @@
                                         <field name="mes_type"/>
                                     </group>
 
-                                    <group colspan="4" string="Product Variants">
+                                    <group colspan="4" string="Product Variants" groups="product.group_product_variant">
                                         <field colspan="4" name="product_variant_ids" nolabel="1">
                                             <tree string="Product Variants" editable="bottom">
                                                 <field name="active"/>

From dac3058100b29d961908fa40b4e082049ceaab5c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 17:04:34 +0100
Subject: [PATCH 8/9] [IMP] website: This page is under construction

bzr revid: chm@openerp.com-20140114160434-wukbj48ope1twhja
---
 addons/website/static/src/css/editor.css         |  11 ++++++++++-
 addons/website/static/src/css/editor.sass        |   6 ++++++
 addons/website/static/src/css/website.css        |   4 ++--
 addons/website/static/src/css/website.sass       |   4 ++--
 .../static/src/img/under_construction.png        | Bin 0 -> 6574 bytes
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 addons/website/static/src/img/under_construction.png

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 79fcdb68ce0..11cfad48583 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -103,6 +103,14 @@
   top: 2px;
 }
 
+.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
+  background-image: url("/website/static/src/img/edit_here.png") !important;
+}
+
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before {
+  content: "Press The Top-Left Edit Button" !important;
+}
+
 /* ---- EDITOR BAR ---- {{{ */
 table.editorbar-panel {
   cursor: pointer;
@@ -433,8 +441,9 @@ ul.oe_menu_editor .disclose {
 
 /* ---- SNIPPET MANIPULATOR ---- {{{ */
 .resize_editor_busy {
-  background-color: rgba(0,0,0,0.1);
+  background-color: rgba(0, 0, 0, 0.3);
 }
+
 .oe_overlay {
   display: none;
   position: absolute;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 78af810448f..0ea928dba86 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -85,6 +85,12 @@
         position: relative !important
         top: +2px
 
+.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
+    background-image: url('/website/static/src/img/edit_here.png') !important
+
+.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
+    content: 'Press The Top-Left Edit Button' !important
+
 // }}}
 
 /* ---- EDITOR BAR ---- {{{ */
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 9092b347e1f..425fbd17ea6 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -234,7 +234,7 @@ footer {
 }
 
 .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
-  background-image: url("/website/static/src/img/edit_here.png");
+  background-image: url("/website/static/src/img/under_construction.png");
   background-repeat: no-repeat;
   background-position: center;
   height: 220px !important;
@@ -245,7 +245,7 @@ footer {
 }
 
 .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before {
-  content: "Press The Top-Left Edit Button";
+  content: "This page is under construction";
   text-align: center;
   display: block;
   padding-top: 160px;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index ec7984505f8..cb7a86c3d02 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -154,7 +154,7 @@ footer
     background-image: url('/website/static/src/img/drag_here.png')
 
 .oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child
-    background-image: url('/website/static/src/img/edit_here.png')
+    background-image: url('/website/static/src/img/under_construction.png')
     background-repeat: no-repeat
     background-position: center
     height: 220px !important
@@ -163,7 +163,7 @@ footer
     position: static
 
 .oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
-    content: 'Press The Top-Left Edit Button'
+    content: 'This page is under construction'
     text-align: center
     display: block
     padding-top: 160px
diff --git a/addons/website/static/src/img/under_construction.png b/addons/website/static/src/img/under_construction.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d5ee85de9b57648ef168b9e5cde5d3ac1a1a8bc
GIT binary patch
literal 6574
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
JSNhJl{{dXJyM_P&

literal 0
HcmV?d00001


From 45feba1f864565f01919f37c9411ac71b7c178ae Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 14 Jan 2014 17:29:25 +0100
Subject: [PATCH 9/9] [IMP]website_sale: no product message for public users

bzr revid: chm@openerp.com-20140114162925-z1gcl5h2rkxb7crx
---
 addons/website/static/src/css/editor.css   | 4 ++++
 addons/website/static/src/css/editor.sass  | 3 +++
 addons/website/static/src/css/website.css  | 4 ++++
 addons/website/static/src/css/website.sass | 3 +++
 addons/website_sale/views/website_sale.xml | 3 ++-
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 11cfad48583..d786830c8f5 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -81,6 +81,10 @@
   outline: none !important;
 }
 
+.css_editable_display {
+  display: block !important;
+}
+
 .css_non_editable_mode_hidden {
   display: none;
 }
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 0ea928dba86..66665252379 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -67,6 +67,9 @@
 .oe_editable:focus
     outline: none !important
 
+.css_editable_display
+    display: block !important
+
 .css_non_editable_mode_hidden
     display: none
 
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 425fbd17ea6..a047753ebfc 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -258,6 +258,10 @@ footer {
   content: "Drag Building Blocks Here";
 }
 
+.css_editable_display {
+  display: none;
+}
+
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 .navbar .nav > li > p {
   margin-bottom: 0px;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index cb7a86c3d02..c509bebce55 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -174,6 +174,9 @@ footer
 .oe_structure.oe_editable.oe_empty:empty:before, .oe_editable[data-oe-type=html]:empty:before, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child:before, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child:before
     content: 'Drag Building Blocks Here'
 
+.css_editable_display
+    display: none
+
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
 .navbar .nav > li > p
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index bc9695cda39..902bb9ee604 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -188,7 +188,8 @@
               </table>
               <t t-if="not bins">
                 <div class="text-center text-muted">
-                  <h3>No product found</h3>
+                  <h3 class="css_editable_display">No product found</h3>
+                  <h3 class="css_non_editable_mode_hidden">There isn't available products right know, click <a t-href="/page/website.contactus">here</a> to contact us</h3>
                   <t groups="base.group_website_publisher">
                     <p>Click on "Content" to define a new product or "Help" for more informations.</p>
                     <img src="/website/static/src/img/content_here.png"/>