[REF] web_editor,website,mass_mailing: JS/XML update

* Adapt DOM selectors
* Refactore dialog XMLs to have odoo styling
* New editor options (background-position, ...)
* Various improvements

1 files changed, 17 insertions, 40 deletions

diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js
index 3cbcaefbb14..01deb49977c 100644
--- a/addons/website/static/src/js/website.contentMenu.js
+++ b/addons/website/static/src/js/website.contentMenu.js
@@ -15,34 +15,18 @@ var qweb = core.qweb;
 ajax.loadXML('/website/static/src/xml/website.contentMenu.xml', qweb);
 
 var TopBarContent = Widget.extend({
-    start: function() {
+    start: function () {
         var self = this;
-        self.$el.on('click', 'a[data-action]', function(ev) {
-            ev.preventDefault();
-            var $content_item = $(this);
-            self[$content_item.data('action')]();
-        });
-
-        // Build 'ADD PAGE' modal
-        var $cont    = $('#website_addPage_modal .website_addPage_ul');
-        var $defIcon = $('<i class="fa fa-cube"></i>')
 
-        $("#website_addPage_list").nextAll().each(function(){
-            var $clone = $(this).clone().appendTo($cont).attr("data-dismiss","modal").addClass('animated')
-            var $a     = $clone.find('a')
-            var text   = $a.text()
-
-            if($clone.find('i').length < 1){ $defIcon.clone().prependTo($a)}
-            if($clone.find('p').length < 1){ $a.html($a.html().replace($a.text(),'')).append('<p>' + text + '</p>')}
+        // Add page modal + menu content event
+        this.$el.add($('#o_website_add_page_modal')).on('click', 'a[data-action]', function (e) {
+            e.preventDefault();
+            self[$(this).data('action')]();
+        });
 
-            $a.on('click', function(){
-                var $content_item = $(this);
-                self[$content_item.data('action')]();
-            })
-        })
         return this._super();
     },
-    edit_menu: function() {
+    edit_menu: function () {
         var self = this;
         var context = base.get_context();
         var def = $.Deferred();
@@ -70,7 +54,7 @@ var TopBarContent = Widget.extend({
             });
         });
     },
-    new_page: function() {
+    new_page: function () {
         website.prompt({
             id: "editor_new_page",
             window_title: _t("New Page"),
@@ -79,18 +63,11 @@ var TopBarContent = Widget.extend({
                 var $group = this.$dialog.find("div.form-group");
                 $group.removeClass("mb0");
 
-                var $add = $(
-                    '<div class="form-group mb0">'+
-                        '<span class="col-sm-offset-3 col-sm-9 text-left">'+
-                            '<label class="switch checked" for="switch_addTo_menu">' +
-                              '<input type="checkbox" id="switch_addTo_menu" class="switch_input" checked="checked" />' +
-                              '<span class="switch_track"></span>' +
-                            '</label>' +
-                        '</span>'+
-                    '</div>');
-                $add.find('label').after(_t("Add page in menu"));
+                var $add = $('<div/>', {'class': 'form-group mb0'})
+                            .append($('<span/>', {'class': 'col-sm-offset-3 col-sm-9 text-left'})
+                                    .append(qweb.render('web_editor.components.switch', {id: 'switch_addTo_menu', label: _t("Add page in menu")})));
+                $add.find('input').prop('checked', true);
                 $group.after($add);
-                console.log(website)
             }
         }).then(function (val, field, $dialog) {
             if (val) {
@@ -100,7 +77,7 @@ var TopBarContent = Widget.extend({
             }
         });
     },
-    rename_page: function() {
+    rename_page: function () {
         var self = this;
         var context = base.get_context();
         self.mo_id = self.getMainObject().id;
@@ -134,7 +111,7 @@ var TopBarContent = Widget.extend({
             });
         });
     },
-    delete_page: function() {
+    delete_page: function () {
         var self = this;
         var context = base.get_context();
         self.mo_id = self.getMainObject().id;
@@ -144,17 +121,17 @@ var TopBarContent = Widget.extend({
             method: 'page_search_dependencies',
             args: [self.mo_id],
             kwargs: {
-                context: context
+                context: context,
             },
         }).then(function (deps) {
             website.prompt({
                 id: "editor_delete_page",
                 window_title: _t("Delete Page"),
                 dependencies: deps,
-                    init: function() { $('.btn-continue').prop("disabled", true)},
+                    init: function () { $('.btn-continue').prop("disabled", true)},
             }, 'website.delete_page').then(function (val, field, $dialog) {
 
-                if ($dialog.find('input[type="checkbox"]').is(':checked')){
+                if ($dialog.find('input[type="checkbox"]').is(':checked')) {
                     ajax.jsonRpc('/web/dataset/call_kw', 'call', {
                         model: 'website',
                         method: 'delete_page',