[MERGE] from trunk

bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl

diff --cc addons/website/static/src/css/editor.css
Simple merge

diff --cc addons/website/static/src/css/editor.sass
Simple merge

diff --cc addons/website/static/src/js/website.editor.js
Simple merge

diff --cc addons/website/static/src/js/website.snippets.editor.js
index 7865c1f,0177e8b..8f49409
--- 1/addons/website/static/src/js/website.snippets.editor.js
--- 2/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@@ -361,15 -362,21 +362,20 @@@
          },
          clean_for_save: function () {
              var self = this;
-             this.dom_filter(website.snippet.globalSelector).each(function () {
-                 var $snippet = $(this);
-                 self.make_active($snippet);
-                 self.make_active(false);
-                 var editor = $snippet.data("snippet-editor");
-                 if (editor) {
-                     editor.clean_for_save();
 -
+             $("*[contentEditable], *[attributeEditable]")
+                 .removeAttr('contentEditable')
+                 .removeAttr('attributeEditable');
+ 
+             var options = website.snippet.options;
+             var template = website.snippet.templateOptions;
+             for (var k in options) {
+                 if (template[k] && options[k].prototype.clean_for_save !== dummy) {
+                     var $snippet = this.dom_filter(template[k].selector);
+                     $snippet.each(function () {
+                         new options[k](self, null, $(this), k).clean_for_save();
+                     });
                  }
-             });
+             }
          },
          make_active: function ($snippet) {
              if ($snippet && this.$active_snipped_id && this.$active_snipped_id.get(0) === $snippet.get(0)) {

diff --cc addons/website_report/views/layouts.xml
Simple merge