[IMP] web(_planner),website: navbars & menus merge

Merge appswitcher navbar and app navbar.
Merge planner menu and user menu.

2 files changed, 5 insertions, 52 deletions

diff --git a/addons/web_planner/static/src/js/web_planner_backend.js b/addons/web_planner/static/src/js/web_planner_backend.js
index c4079b36433..40055e39321 100644
--- a/addons/web_planner/static/src/js/web_planner_backend.js
+++ b/addons/web_planner/static/src/js/web_planner_backend.js
@@ -13,7 +13,7 @@ var QWeb = core.qweb;
 var _t = core._t;
 var PlannerDialog = planner.PlannerDialog;
 
-var PlannerLauncher = Widget.extend(planner.PlannerHelpMixin, {
+var PlannerLauncher = Widget.extend({
     template: "PlannerLauncher",
     init: function(parent) {
         this._super(parent);
@@ -25,12 +25,10 @@ var PlannerLauncher = Widget.extend(planner.PlannerHelpMixin, {
         core.bus.on("change_menu_section", self, self.on_menu_clicked);
 
         var res =  self._super.apply(this, arguments).then(function() {
-            self.$el.filter('.o_planner_systray').on('click', self, self.show_dialog.bind(self));
-            self.$el.filter('.o_planner_help').on('click', '.dropdown-menu li a[data-menu]', self.on_menu_help);
+            self.$el.on('click', self, self.show_dialog.bind(self));
             return self.fetch_application_planner();
         }).then(function(apps) {
-            self.$el.filter('.o_planner_systray').hide();  // hidden by default
-            self.$el.filter('.o_planner_help').find('.o_planner_link').hide();
+            self.$el.hide();  // hidden by default
             self.$('.progress').tooltip({html: true, placement: 'bottom', delay: {'show': 500}});
             self.planner_apps = apps;
             return apps;
@@ -58,8 +56,7 @@ var PlannerLauncher = Widget.extend(planner.PlannerHelpMixin, {
             this.setup(this.planner_apps[menu_id]);
             this.need_reflow = true;
         } else {
-            this.$el.filter('.o_planner_systray').hide();
-            this.$el.filter('.o_planner_help').find('.o_planner_link').hide();
+            this.$el.hide();
             this.need_reflow = true;
         }
         if (this.need_reflow) {
@@ -96,7 +93,7 @@ var PlannerLauncher = Widget.extend(planner.PlannerHelpMixin, {
         } else {
             this.$(".progress").show();
         }
-        this.$el.filter('.o_planner_systray').show();
+        this.$el.show();
         this.$(".progress-bar").css('width', percent+"%");
     },
     show_dialog: function() {
diff --git a/addons/web_planner/static/src/js/web_planner_common.js b/addons/web_planner/static/src/js/web_planner_common.js
index b7fd147d849..1abe71620f4 100644
--- a/addons/web_planner/static/src/js/web_planner_common.js
+++ b/addons/web_planner/static/src/js/web_planner_common.js
@@ -413,52 +413,8 @@ var PlannerDialog = Widget.extend({
     }
 });
 
-var PlannerHelpMixin = {
-
-    on_menu_help: function(ev) {
-        ev.preventDefault();
-
-        var menu = $(ev.currentTarget).data('menu');
-        if (menu === 'about') {
-            if (!odoo.db_info) {
-                var self = this;
-                this.rpc("/web/webclient/version_info", {}).done(function(db_info) {
-                    self.on_menu_help_about(db_info);
-                });
-            } else {
-                this.on_menu_help_about(odoo.db_info);
-            }
-        } else if (menu === 'documentation') {
-            window.open('https://www.odoo.com/documentation/user', '_blank');
-        } else if (menu === 'planner') {
-            if (this.dialog) this.show_dialog();
-        } else if (menu === 'support') {
-            if (odoo.db_info && odoo.db_info.server_version_info[5] === 'c') {
-                window.open('https://www.odoo.com/buy', '_blank');
-            } else {
-                window.location.href = 'mailto:help@odoo.com';
-            }
-        }
-    },
-
-    on_menu_help_about: function(db_info) {
-        var $help = $(QWeb.render("PlannerLauncher.about", {db_info: db_info}));
-        $help.find('a.oe_activate_debug_mode').click(function (e) {
-            e.preventDefault();
-            window.location = $.param.querystring( window.location.href, 'debug');
-        });
-        new Dialog(this, {
-            size: 'medium',
-            dialogClass: 'o_act_window',
-            title: _t("About"),
-            $content: $help
-        }).open();
-    },
-};
-
 return {
     PlannerDialog: PlannerDialog,
-    PlannerHelpMixin: PlannerHelpMixin,
 };
 
 });