From 744e7214d54411f4b3ab4b5a673709f00b8cf8ab Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Aug 2013 15:25:47 +0200
Subject: [PATCH] [IMP] enable CKEDITOR on every element, seems to work
 acceptably well for now

potential problem: toolbar allowing creation of block elements inside inlines

bzr revid: xmo@openerp.com-20130813132547-pxcm6jvodabv7xc6
---
 addons/website/static/src/js/website.js | 2 +-
 addons/website/views/views.xml          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index d840bd3ae32..4e1c044f713 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -97,7 +97,7 @@ instance.website.EditorBar = instance.web.Widget.extend({
                 .not('.oe_snippet_editor')
                 .prop('contentEditable', true)
                 .addClass('oe_editable');
-        var $rte_ables = $editables.filter('div, p, li, section, header, footer').not('[data-oe-type]');
+        var $rte_ables = $editables.not('[data-oe-type]');
         var $raw_editables = $editables.not($rte_ables);
 
         // temporary fix until we fix ckeditor
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 37db0c95456..5ec873833f0 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -28,7 +28,9 @@
                         <script type="text/javascript" src="/website/static/lib/ckeditor.sharedspace/plugin.js"></script>
                         <script type="text/javascript">
                             CKEDITOR.disableAutoInline = true;
-                            CKEDITOR.dtd.$editable.li = 1;
+                            // EDIT ALL THE THINGS
+                            CKEDITOR.dtd.$editable = $.extend(
+                                {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
                         </script>
 
                         <t t-if="editable">