diff --git a/addons/website/static/src/js/menu/edit.js b/addons/website/static/src/js/menu/edit.js index fc5532a3a29..3ab52b7fdc7 100644 --- a/addons/website/static/src/js/menu/edit.js +++ b/addons/website/static/src/js/menu/edit.js @@ -80,7 +80,8 @@ var EditPageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ self.$welcomeMessage.remove(); } var $wrapwrap = $('#wrapwrap'); // TODO find this element another way - $wrapwrap.find('.oe_structure.oe_empty, [data-oe-type="html"]').attr('data-editor-message', _t('DRAG BUILDING BLOCKS HERE')); + var $htmlEditable = $wrapwrap.find('.oe_structure.oe_empty, [data-oe-type="html"]').not('[data-editor-message]'); + $htmlEditable.attr('data-editor-message', _t('DRAG BUILDING BLOCKS HERE')); var def = $.Deferred(); self.trigger_up('animation_start_demand', { editableMode: true, diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py index 727775b9027..d1ddf51c581 100644 --- a/addons/website_sale/models/product.py +++ b/addons/website_sale/models/product.py @@ -68,6 +68,7 @@ class ProductPublicCategory(models.Model): # buttons have consistent styling. # In this case, the default image is set by the js code. image = fields.Binary(attachment=True, help="This field holds the image used as image for the category, limited to 1024x1024px.") + website_description = fields.Html('Category Description', sanitize_attributes=False, translate=html_translate) image_medium = fields.Binary(string='Medium-sized image', attachment=True, help="Medium-sized image of the category. It is automatically " "resized as a 128x128px image, with aspect ratio preserved. " diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index e5c04dfbfc1..401966fc0f3 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -203,6 +203,10 @@