[CHG] Do not toggle opened class on submenu (should be part of last commit)
[odoo/odoo.git] / addons / web / static / src / js / chrome.js
index 64a7e41..9b8ef61 100644 (file)
@@ -5,9 +5,8 @@ openerp.web.chrome = function(openerp) {
 var QWeb = openerp.web.qweb,
     _t = openerp.web._t;
 
-openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Notification# */{
+openerp.web.Notification =  openerp.web.OldWidget.extend(/** @lends openerp.web.Notification# */{
     template: 'Notification',
-    identifier_prefix: 'notification-',
 
     init: function() {
         this._super.apply(this, arguments);
@@ -18,79 +17,98 @@ openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Not
         this._super.apply(this, arguments);
         this.$element.notify({
             speed: 500,
-            expires: 1500
+            expires: 2500
         });
     },
-    notify: function(title, text) {
+    notify: function(title, text, sticky) {
+        sticky = !!sticky;
+        var opts = {};
+        if (sticky) {
+            opts.expires = false;
+        }
         this.$element.notify('create', {
             title: title,
             text: text
-        });
+        }, opts);
     },
-    warn: function(title, text) {
+    warn: function(title, text, sticky) {
+        sticky = !!sticky;
+        var opts = {};
+        if (sticky) {
+            opts.expires = false;
+        }
         this.$element.notify('create', 'oe_notification_alert', {
             title: title,
             text: text
-        });
+        }, opts);
     }
 
 });
 
+openerp.web.dialog = function(element) {
+    var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
+    result.dialog("widget").addClass("openerp");
+    return result;
+}
+
 openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog# */{
     dialog_title: "",
-    identifier_prefix: 'dialog',
     /**
      * @constructs openerp.web.Dialog
      * @extends openerp.web.OldWidget
      *
      * @param parent
-     * @param dialog_options
+     * @param options
      */
-    init: function (parent, dialog_options) {
+    init: function (parent, options, content) {
         var self = this;
         this._super(parent);
+        if (content) {
+            this.$element = content instanceof $ ? content : $(content);
+        }
         this.dialog_options = {
             modal: true,
-            width: 'auto',
+            destroy_on_close: true,
+            width: $(window).width() * (($(window).width() > 1024) ? 0.5 : 0.75),
             min_width: 0,
-            max_width: '100%',
+            max_width: '95%',
             height: 'auto',
             min_height: 0,
-            max_height: '100%',
+            max_height: this.get_height('100%') - 140,
             autoOpen: false,
+            position: [false, 50],
             buttons: {},
-            beforeClose: function () { self.on_close(); }
+            beforeClose: function () { self.on_close(); },
+            resizeStop: this.on_resized
         };
         for (var f in this) {
             if (f.substr(0, 10) == 'on_button_') {
                 this.dialog_options.buttons[f.substr(10)] = this[f];
             }
         }
-        if (dialog_options) {
-            this.set_options(dialog_options);
+        if (options) {
+            _.extend(this.dialog_options, options);
         }
-    },
-    set_options: function(options) {
-        options = options || {};
-        options.width = this.get_width(options.width || this.dialog_options.width);
-        options.min_width = this.get_width(options.min_width || this.dialog_options.min_width);
-        options.max_width = this.get_width(options.max_width || this.dialog_options.max_width);
-        options.height = this.get_height(options.height || this.dialog_options.height);
-        options.min_height = this.get_height(options.min_height || this.dialog_options.min_height);
-        options.max_height = this.get_height(options.max_height || this.dialog_options.max_width);
-
-        if (options.width !== 'auto') {
-            if (options.width > options.max_width) options.width = options.max_width;
-            if (options.width < options.min_width) options.width = options.min_width;
-        }
-        if (options.height !== 'auto') {
-            if (options.height > options.max_height) options.height = options.max_height;
-            if (options.height < options.min_height) options.height = options.min_height;
+        if (this.dialog_options.autoOpen) {
+            this.open();
+        } else {
+            openerp.web.dialog(this.$element, this.get_options());
         }
-        if (!options.title && this.dialog_title) {
-            options.title = this.dialog_title;
+    },
+    get_options: function(options) {
+        var self = this,
+            o = _.extend({}, this.dialog_options, options || {});
+        _.each(['width', 'height'], function(unit) {
+            o[unit] = self['get_' + unit](o[unit]);
+            o['min_' + unit] = self['get_' + unit](o['min_' + unit] || 0);
+            o['max_' + unit] = self['get_' + unit](o['max_' + unit] || 0);
+            if (o[unit] !== 'auto' && o['min_' + unit] && o[unit] < o['min_' + unit]) o[unit] = o['min_' + unit];
+            if (o[unit] !== 'auto' && o['max_' + unit] && o[unit] > o['max_' + unit]) o[unit] = o['max_' + unit];
+        });
+        if (!o.title && this.dialog_title) {
+            o.title = this.dialog_title;
         }
-        _.extend(this.dialog_options, options);
+        return o;
     },
     get_width: function(val) {
         return this.get_size(val.toString(), $(window.top).width());
@@ -107,41 +125,39 @@ openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog#
             return parseInt(val, 10);
         }
     },
-    start: function () {
-        this.$dialog = $(this.$element).dialog(this.dialog_options);
-        this._super();
-        return this;
-    },
-    open: function(dialog_options) {
+    open: function(options) {
         // TODO fme: bind window on resize
         if (this.template) {
             this.$element.html(this.render());
         }
-        this.set_options(dialog_options);
-        this.$dialog.dialog(this.dialog_options).dialog('open');
+        var o = this.get_options(options);
+        openerp.web.dialog(this.$element, o).dialog('open');
+        if (o.height === 'auto' && o.max_height) {
+            this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
+        }
         return this;
     },
     close: function() {
-        // Closes the dialog but leave it in a state where it could be opened again.
-        this.$dialog.dialog('close');
+        this.$element.dialog('close');
     },
     on_close: function() {
+        if (this.dialog_options.destroy_on_close) {
+            this.$element.dialog('destroy');
+        }
+    },
+    on_resized: function() {
+        //openerp.log("Dialog resized to %d x %d", this.$element.width(), this.$element.height());
     },
-    stop: function () {
+    destroy: function () {
         // Destroy widget
         this.close();
-        this.$dialog.dialog('destroy');
+        this.$element.dialog('destroy');
         this._super();
     }
 });
 
 openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
-    init: function() {
-        this._super();
-        openerp.connection.on_rpc_error.add(this.on_rpc_error);
-    },
     on_rpc_error: function(error) {
-        this.error = error;
         if (error.data.fault_code) {
             var split = ("" + error.data.fault_code).split('\n')[0].split(' -- ');
             if (split.length > 1) {
@@ -156,7 +172,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
         }
     },
     on_managed_error: function(error) {
-        $('<div>' + QWeb.render('DialogWarning', {error: error}) + '</div>').dialog({
+       openerp.web.dialog($('<div>' + QWeb.render('CrashManagerWarning', {error: error}) + '</div>'), {
             title: "OpenERP " + _.str.capitalize(error.type),
             buttons: [
                 {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
@@ -164,26 +180,48 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
         });
     },
     on_traceback: function(error) {
+        var self = this;
+        var buttons = {};
+        if (openerp.connection.openerp_entreprise) {
+            buttons[_t("Send OpenERP Enterprise Report")] = function() {
+                var $this = $(this);
+                var issuename = $('#issuename').val();
+                var explanation = $('#explanation').val();
+                var remark = $('#remark').val();
+                // Call the send method from server to send mail with details
+                new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [error.data,explanation,remark,issuename]).then(function(result){
+                    if (result === false) {
+                        alert('There was a communication error.')
+                    } else {
+                        $this.dialog('close');
+                    }
+                });
+            };
+            buttons[_t("Dont send")] = function() {
+                $(this).dialog("close");
+            };
+        } else {
+            buttons[_t("Ok")] = function() {
+                $(this).dialog("close");
+            };
+        }
         var dialog = new openerp.web.Dialog(this, {
             title: "OpenERP " + _.str.capitalize(error.type),
-            autoOpen: true,
-            width: '90%',
-            height: '90%',
+            width: '80%',
+            height: '50%',
             min_width: '800px',
             min_height: '600px',
-            buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
-            ]
-        }).start();
-        dialog.$element.html(QWeb.render('DialogTraceback', {error: error}));
+            buttons: buttons
+        }).open();
+        dialog.$element.html(QWeb.render('CrashManagerError', {session: openerp.connection, error: error}));
     }
 });
 
-openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading# */{
+openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loading# */{
     template: 'Loading',
     /**
      * @constructs openerp.web.Loading
-     * @extends openerp.web.Widget
+     * @extends openerp.web.OldWidget
      *
      * @param parent
      * @param element_id
@@ -192,8 +230,21 @@ openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading#
         this._super(parent);
         this.count = 0;
         this.blocked_ui = false;
-        this.session.on_rpc_request.add_first(this.on_rpc_event, 1);
-        this.session.on_rpc_response.add_last(this.on_rpc_event, -1);
+        var self = this;
+        this.request_call = function() {
+            self.on_rpc_event(1);
+        };
+        this.response_call = function() {
+            self.on_rpc_event(-1);
+        };
+        this.session.on_rpc_request.add_first(this.request_call);
+        this.session.on_rpc_response.add_last(this.response_call);
+    },
+    destroy: function() {
+        this.session.on_rpc_request.remove(this.request_call);
+        this.session.on_rpc_response.remove(this.response_call);
+        this.on_rpc_event(-this.count);
+        this._super();
     },
     on_rpc_event : function(increment) {
         var self = this;
@@ -207,10 +258,10 @@ openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading#
 
         this.count += increment;
         if (this.count > 0) {
-            //this.$element.html(QWeb.render("Loading", {}));
-            this.$element.html("Loading ("+this.count+")");
-            this.$element.show();
-            this.widget_parent.$element.addClass('loading');
+            $(".loading",this.$element).text(_.str.sprintf(
+                _t("Loading (%d)"), this.count));
+            $(".loading",this.$element).show();
+            this.getParent().$element.addClass('loading');
         } else {
             this.count = 0;
             clearTimeout(this.long_running_timer);
@@ -219,16 +270,17 @@ openerp.web.Loading = openerp.web.Widget.extend(/** @lends openerp.web.Loading#
                 this.blocked_ui = false;
                 $.unblockUI();
             }
-            this.$element.fadeOut();
-            this.widget_parent.$element.removeClass('loading');
+            $(".loading",this.$element).fadeOut();
+            this.getParent().$element.removeClass('loading');
         }
     }
 });
 
-openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database# */{
+openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Database# */{
+    template: "DatabaseManager",
     /**
      * @constructs openerp.web.Database
-     * @extends openerp.web.Widget
+     * @extends openerp.web.OldWidget
      *
      * @param parent
      * @param element_id
@@ -236,17 +288,18 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
      */
     init: function(parent, element_id, option_id) {
         this._super(parent, element_id);
-        this.$option_id = $('#' + option_id);
         this.unblockUIFunction = $.unblockUI;
+        $.validator.addMethod('matches', function (s, _, re) {
+            return new RegExp(re).test(s);
+        }, _t("Invalid database name"));
     },
     start: function() {
-        this._super();
-        this.$element.html(QWeb.render("Database", this));
+        this.$option_id = $("#oe_db_options");
 
         var self = this;
-        var fetch_db = this.rpc("/web/database/get_list", {}, function(result) {
-            self.db_list = result.db_list;
-        });
+        var fetch_db = this.rpc("/web/database/get_list", {}).pipe(
+            function(result) { self.db_list = result.db_list; },
+            function (_, ev) { ev.preventDefault(); self.db_list = null; });
         var fetch_langs = this.rpc("/web/session/get_lang_list", {}, function(result) {
             if (result.error) {
                 self.display_error(result);
@@ -265,7 +318,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
             self.hide();
         });
     },
-    stop: function () {
+    destroy: function () {
         this.hide();
         this.$option_id.empty();
 
@@ -277,13 +330,11 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
         this._super();
     },
     show: function () {
-        this.$element.closest(".openerp")
-                .removeClass("login-mode")
+        this.$element.closest(".login")
                 .addClass("database_block");
     },
     hide: function () {
-        this.$element.closest(".openerp")
-                .addClass("login-mode")
+        this.$element.closest(".login")
                 .removeClass("database_block")
     },
     /**
@@ -330,9 +381,9 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
 
             var admin = result[1][0];
             setTimeout(function () {
-                self.widget_parent.do_login(
+                self.getParent().do_login(
                         info.db, admin.login, admin.password);
-                self.stop();
+                self.destroy();
                 self.unblockUI();
             });
         });
@@ -362,7 +413,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
      * @param {String} error.error message of the error dialog
      */
     display_error: function (error) {
-        return $('<div>').dialog({
+        return openerp.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
@@ -383,9 +434,11 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
                         self.display_error(result);
                         return;
                     }
-                    self.db_list.push(self.to_object(fields)['db_name']);
-                    self.db_list.sort();
-                    self.widget_parent.set_db_list(self.db_list);
+                    if (self.db_list) {
+                        self.db_list.push(self.to_object(fields)['db_name']);
+                        self.db_list.sort();
+                        self.getParent().set_db_list(self.db_list);
+                    }
                     var form_obj = self.to_object(fields);
                     self.wait_for_newdb(result, {
                         password: form_obj['super_admin_pwd'],
@@ -414,8 +467,10 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
                         return;
                     }
                     $db_list.find(':selected').remove();
-                    self.db_list.splice(_.indexOf(self.db_list, db, true), 1);
-                    self.widget_parent.set_db_list(self.db_list);
+                    if (self.db_list) {
+                        self.db_list.splice(_.indexOf(self.db_list, db, true), 1);
+                        self.getParent().set_db_list(self.db_list);
+                    }
                     self.do_notify("Dropping database", "The database '" + db + "' has been dropped");
                 });
             }
@@ -430,14 +485,14 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
                 self.blockUI();
                 self.session.get_file({
                     form: form,
-                    error: function (body) {
-                        var error = body.firstChild.data.split('|');
-                        self.display_error({
-                            title: error[0],
-                            error: error[1]
-                        });
+                    success: function () {
+                        self.do_notify(_t("Backed"),
+                            _t("Database backed up successfully"));
                     },
-                    complete: $.proxy(self, 'unblockUI')
+                    error: openerp.webclient.crashmanager.on_rpc_error,
+                    complete: function() {
+                        self.unblockUI();
+                    }
                 });
             }
         });
@@ -473,7 +528,10 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
                             })
                         }
                     },
-                    complete: $.proxy(self, 'unblockUI')
+                    complete: function() {
+                        self.unblockUI();
+                        self.do_notify(_t("Restored"), _t("Database restored successfully"));
+                    }
                 });
             }
         });
@@ -506,14 +564,13 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
     }
 });
 
-openerp.web.Login =  openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
+openerp.web.Login =  openerp.web.OldWidget.extend(/** @lends openerp.web.Login# */{
     remember_credentials: true,
     
     template: "Login",
-    identifier_prefix: 'oe-app-login-',
     /**
      * @constructs openerp.web.Login
-     * @extends openerp.web.Widget
+     * @extends openerp.web.OldWidget
      *
      * @param parent
      * @param element_id
@@ -535,9 +592,8 @@ openerp.web.Login =  openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
     },
     start: function() {
         var self = this;
-        this.database = new openerp.web.Database(
-                this, "oe_database", "oe_db_options");
-        this.database.start();
+        this.database = new openerp.web.Database(this);
+        this.database.appendTo(this.$element);
 
         this.$element.find('#oe-db-config').click(function() {
             self.database.show();
@@ -555,27 +611,21 @@ openerp.web.Login =  openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
         });
 
     },
-    stop: function () {
-        this.database.stop();
-        this._super();
-    },
     set_db_list: function (list) {
         this.$element.find("[name=db]").replaceWith(
             openerp.web.qweb.render('Login_dblist', {
                 db_list: list, selected_db: this.selected_db}))
     },
-    on_login_invalid: function() {
-        this.$element.closest(".openerp").addClass("login-mode");
-    },
-    on_login_valid: function() {
-        this.$element.closest(".openerp").removeClass("login-mode");
-    },
     on_submit: function(ev) {
         if(ev) {
             ev.preventDefault();
         }
         var $e = this.$element;
         var db = $e.find("form [name=db]").val();
+        if (!db) {
+            this.do_warn("Login", "No database selected !");
+            return false;
+        }
         var login = $e.find("form input[name=login]").val();
         var password = $e.find("form input[name=password]").val();
 
@@ -590,88 +640,274 @@ openerp.web.Login =  openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
      */
     do_login: function (db, login, password) {
         var self = this;
+        this.$element.removeClass('login_invalid');
+        this.session.on_session_invalid.add({
+            callback: function () {
+                self.$element.addClass("login_invalid");
+            },
+            unique: true
+        });
         this.session.session_authenticate(db, login, password).then(function() {
-            if(self.session.session_is_valid()) {
-                if (self.has_local_storage) {
-                    if(self.remember_credentials) {
-                        localStorage.setItem('last_db_login_success', db);
-                        localStorage.setItem('last_login_login_success', login);
-                        if (jQuery.deparam(jQuery.param.querystring()).debug != undefined) {
-                            localStorage.setItem('last_password_login_success', password);
-                        }
-                    } else {
-                        localStorage.setItem('last_db_login_success', '');
-                        localStorage.setItem('last_login_login_success', '');
-                        localStorage.setItem('last_password_login_success', '');
+            self.$element.removeClass("login_invalid");
+            if (self.has_local_storage) {
+                if(self.remember_credentials) {
+                    localStorage.setItem('last_db_login_success', db);
+                    localStorage.setItem('last_login_login_success', login);
+                    if (jQuery.deparam(jQuery.param.querystring()).debug != undefined) {
+                        localStorage.setItem('last_password_login_success', password);
                     }
+                } else {
+                    localStorage.setItem('last_db_login_success', '');
+                    localStorage.setItem('last_login_login_success', '');
+                    localStorage.setItem('last_password_login_success', '');
                 }
-                self.on_login_valid();
-            } else {
-                self.$element.addClass("login_invalid");
-                self.on_login_invalid();
             }
         });
-    },
-    do_ask_login: function(continuation) {
-        this.on_login_invalid();
-        this.$element
-            .removeClass("login_invalid");
-        this.on_login_valid.add({
-            position: "last",
-            unique: true,
-            callback: continuation || function() {}
+    }
+});
+
+openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
+    /**
+     * @constructs openerp.web.Menu
+     * @extends openerp.web.Widget
+     *
+     * @param parent
+     */
+    template: 'Menu',
+    do_reload: function() {
+        var self = this;
+        return this.rpc("/web/menu/load", {}, this.on_loaded).then(function () {
+            if (self.current_menu) {
+                self.open_menu(self.current_menu);
+            }
         });
     },
+    on_loaded: function(data) {
+        this.data = data;
+        this.render_element();
+        if (!this.$secondary_menu && this.getParent()) {
+            // TODO: create Widget openerp.web.SubMenu
+            this.$secondary_menu = this.getParent().$element.find('.oe_secondary_menu');
+        }
+        this.$secondary_menu.html(QWeb.render("Menu.secondary", { widget : this }));
+        this.$element.add(this.$secondary_menu).find("a").click(this.on_menu_click);
+    },
+    /**
+     * Opens a given menu by id, as if a user had browsed to that menu by hand
+     * except does not trigger any event on the way
+     *
+     * @param {Number} menu_id database id of the terminal menu to select
+     */
+    open_menu: function (menu_id) {
+        this.$element.add(this.$secondary_menu).find('.oe_active')
+                .removeClass('oe_active');
+        this.$secondary_menu.find('> .oe_secondary_menu').hide();
+
+        var $primary_menu;
+        var $secondary_submenu = this.$secondary_menu.find(
+                'a[data-menu=' + menu_id +']');
+        if ($secondary_submenu.length) {
+            for(;;) {
+                if ($secondary_submenu.hasClass('leaf')) {
+                    $secondary_submenu.addClass('oe_active');
+                } else if ($secondary_submenu.hasClass('submenu')) {
+                    $secondary_submenu.addClass('opened')
+                }
+                var $parent = $secondary_submenu.parent().show();
+                if ($parent.hasClass('oe_secondary_menu')) {
+                    var primary_id = $parent.data('menu-parent');
+                    $primary_menu = this.$element.find(
+                            'a[data-menu=' + primary_id + ']');
+                    break;
+                }
+                $secondary_submenu = $parent.prev();
+            }
+        } else {
+            $primary_menu = this.$element.find('a[data-menu=' + menu_id + ']');
+        }
+        if (!$primary_menu.length) {
+            return;
+        }
+        $primary_menu.addClass('oe_active');
+        this.$secondary_menu.find(
+            'div[data-menu-parent=' + $primary_menu.data('menu') + ']').addClass('oe_active');
+    },
+    on_menu_click: function(ev, id) {
+        id = id || 0;
+        var $clicked_menu, manual = false;
+
+        if (id) {
+            // We can manually activate a menu with it's id (for hash url mapping)
+            manual = true;
+            $clicked_menu = this.$element.find('a[data-menu=' + id + ']');
+            if (!$clicked_menu.length) {
+                $clicked_menu = this.$secondary_menu.find('a[data-menu=' + id + ']');
+            }
+        } else {
+            $clicked_menu = $(ev.currentTarget);
+            id = $clicked_menu.data('menu');
+        }
+
+        if (this.do_menu_click($clicked_menu, manual) && id) {
+            this.current_menu = id;
+            this.session.active_id = id;
+            this.rpc('/web/menu/action', {'menu_id': id}, this.on_menu_action_loaded);
+        }
+        if (ev) {
+            ev.stopPropagation();
+        }
+        return false;
+    },
+    do_menu_click: function($clicked_menu, manual) {
+        var $sub_menu, $main_menu,
+            active = $clicked_menu.is('.oe_active'),
+            sub_menu_visible = false,
+            has_submenu_items = false;
+
+        if (this.$secondary_menu.has($clicked_menu).length) {
+            $sub_menu = $clicked_menu.parents('.oe_secondary_menu');
+            $main_menu = this.$element.find('a[data-menu=' + $sub_menu.data('menu-parent') + ']');
+        } else {
+            $sub_menu = this.$secondary_menu.find('.oe_secondary_menu[data-menu-parent=' + $clicked_menu.attr('data-menu') + ']');
+            $main_menu = $clicked_menu;
+        }
+
+        sub_menu_visible = $sub_menu.is(':visible');
+        has_submenu_items = !!$sub_menu.children().length;
+        this.$secondary_menu.find('.oe_secondary_menu').hide();
+
+        $('.oe_active', this.$element.add(this.$secondary_menu)).removeClass('oe_active');
+        $main_menu.add($clicked_menu).add($sub_menu).addClass('oe_active');
+
+        if (has_submenu_items) {
+            if (!manual) {
+                this.do_show_secondary($sub_menu, $main_menu);
+            } else {
+                this.do_show_secondary();
+            }
+        }
+
+        if ($main_menu != $clicked_menu) {
+            if ($clicked_menu.is('.submenu')) {
+                $clicked_menu.toggleClass('opened').next().toggle();
+            } else if ($clicked_menu.is('.leaf')) {
+                return true;
+            }
+        } else {
+            return true;
+        }
+        return false;
+    },
+    do_hide_secondary: function() {
+        //this.$secondary_menu.hide();
+    },
+    do_show_secondary: function($sub_menu, $main_menu) {
+        var self = this;
+        this.$secondary_menu.show();
+        if (!arguments.length) {
+            return;
+        }
+        $sub_menu.show();
+    },
+    on_menu_action_loaded: function(data) {
+        var self = this;
+        if (data.action.length) {
+            var action = data.action[0][2];
+            action.from_menu = true;
+            self.on_action(action);
+        } else {
+            self.on_action({type: 'null_action'});
+        }
+    },
+    on_action: function(action) {
+    }
 });
 
-openerp.web.Header =  openerp.web.Widget.extend(/** @lends openerp.web.Header# */{
-    template: "Header",
-    identifier_prefix: 'oe-app-header-',
+openerp.web.DropDownMenu =  openerp.web.Widget.extend(/** @lends openerp.web.DropDownMenu# */{
+    template: "DropDownMenu",
     /**
-     * @constructs openerp.web.Header
+     * @constructs openerp.web.DropDownMenu
      * @extends openerp.web.Widget
      *
      * @param parent
      */
     init: function(parent) {
         this._super(parent);
-        this.qs = "?" + jQuery.param.querystring();
-        this.$content = $();
         this.update_promise = $.Deferred().resolve();
     },
     start: function() {
-        this._super();
+        var self = this;
+        this._super.apply(this, arguments);
+        $('html').bind('click', function() {
+            self.$element.find('.oe_dropdown_options').hide();
+        });
+        this.$element.find('.oe_dropdown_toggle').click(function() {
+            self.$element.find('.oe_dropdown_options').toggle();
+            return false;
+        });
+        this.$element.on('click', '.oe_dropdown_options li a[data-menu]', function() {
+            var f = self['on_menu_' + $(this).data('menu')];
+            f && f($(this));
+            self.$element.find('.oe_dropdown_options').hide();
+            return false;
+        });
+    },
+    change_password :function() {
+        var self = this;
+        this.dialog = new openerp.web.Dialog(this, {
+            title: _t("Change Password"),
+            width : 'auto'
+        }).open();
+        this.dialog.$element.html(QWeb.render("Change_Pwd", self));
+        this.dialog.$element.find("form[name=change_password_form]").validate({
+            submitHandler: function (form) {
+                self.rpc("/web/session/change_password",{
+                    'fields': $(form).serializeArray()
+                }, function(result) {
+                    if (result.error) {
+                        self.display_error(result);
+                        return;
+                    } else {
+                        openerp.webclient.on_logout();
+                    }
+                });
+            }
+        });
+    },
+    display_error: function (error) {
+        return openerp.web.dialog($('<div>'), {
+            modal: true,
+            title: error.title,
+            buttons: [
+                {text: _("Ok"), click: function() { $(this).dialog("close"); }}
+            ]
+        }).html(error.error);
     },
     do_update: function () {
         var self = this;
         var fct = function() {
-            self.$content.remove();
+            var $avatar = self.$element.find('.oe_topbar_avatar');
+            $avatar.attr('src', $avatar.data('default-src'));
             if (!self.session.uid)
                 return;
             var func = new openerp.web.Model("res.users").get_func("read");
             return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
-                self.$content = $(QWeb.render("Header-content", {widget: self, user: res}));
-                self.$content.appendTo(self.$element);
-                self.$element.find(".logout").click(self.on_logout);
-                self.$element.find("a.preferences").click(self.on_preferences);
-                self.$element.find(".about").click(self.on_about);
+                // TODO: Only show company if multicompany in use
+                self.$element.find('.oe_topbar_name').text(res.name + '/' + res.company_id[1]);
                 return self.shortcut_load();
             });
         };
         this.update_promise = this.update_promise.pipe(fct, fct);
     },
-    on_about: function() {
-        var self = this;
-        self.rpc("/web/webclient/version_info", {}).then(function(res) {
-            var $help = $(QWeb.render("About-Page", {version_info: res}));
-            $help.dialog({autoOpen: true,
-                modal: true, width: 960, title: _t("About")});
-        });
+    on_action: function() {
     },
     shortcut_load :function(){
         var self = this,
             sc = self.session.shortcuts,
             shortcuts_ds = new openerp.web.DataSet(this, 'ir.ui.view_sc');
+        self.$element.find('.oe_dropdown_options a[data-menu=shortcut]').each(function() {
+            $(this).parent().remove();
+        });
         // TODO: better way to communicate between sections.
         // sc.bindings, because jquery does not bind/trigger on arrays...
         if (!sc.binding) {
@@ -679,52 +915,41 @@ openerp.web.Header =  openerp.web.Widget.extend(/** @lends openerp.web.Header# *
             $(sc.binding).bind({
                 'add': function (e, attrs) {
                     shortcuts_ds.create(attrs, function (out) {
-                        $('<li>', {
-                            'data-shortcut-id':out.result,
-                            'data-id': attrs.res_id
-                        }).text(attrs.name)
-                          .appendTo(self.$element.find('.oe-shortcuts ul'));
+                        var shortcut = QWeb.render('DropDownMenu.shortcut', {
+                            shortcuts : [{
+                                name : attrs.name,
+                                id : out.result,
+                                res_id : attrs.res_id
+                            }]
+                        });
+                        $(shortcut).appendTo(self.$element.find('.oe_dropdown_options'));
                         attrs.id = out.result;
                         sc.push(attrs);
                     });
                 },
                 'remove-current': function () {
                     var menu_id = self.session.active_id;
-                    var $shortcut = self.$element
-                        .find('.oe-shortcuts li[data-id=' + menu_id + ']');
+                    var $shortcut = self.$element.find('.oe_dropdown_options li a[data-id=' + menu_id + ']');
                     var shortcut_id = $shortcut.data('shortcut-id');
                     $shortcut.remove();
                     shortcuts_ds.unlink([shortcut_id]);
                     var sc_new = _.reject(sc, function(shortcut){ return shortcut_id === shortcut.id});
                     sc.splice(0, sc.length);
                     sc.push.apply(sc, sc_new);
-                    }
+                }
             });
         }
         return this.rpc('/web/session/sc_list', {}, function(shortcuts) {
             sc.splice(0, sc.length);
             sc.push.apply(sc, shortcuts);
 
-            self.$element.find('.oe-shortcuts')
-                .html(QWeb.render('Shortcuts', {'shortcuts': shortcuts}))
-                .undelegate('li', 'click')
-
-                .delegate('li', 'click', function(e) {
-                    e.stopPropagation();
-                    var id = $(this).data('id');
-                    self.session.active_id = id;
-                    self.rpc('/web/menu/action', {'menu_id':id}, function(ir_menu_data) {
-                        if (ir_menu_data.action.length){
-                            self.on_action(ir_menu_data.action[0][2]);
-                        }
-                    });
-                });
+            $(QWeb.render('DropDownMenu.shortcut', {'shortcuts': shortcuts}))
+                .appendTo(self.$element.find('.oe_dropdown_options'));
         });
     },
-
-    on_action: function(action) {
+    on_menu_logout: function() {
     },
-    on_preferences: function(){
+    on_menu_settings: function() {
         var self = this;
         var action_manager = new openerp.web.ActionManager(this);
         var dataset = new openerp.web.DataSet (this,'res.users',this.context);
@@ -744,233 +969,48 @@ openerp.web.Header =  openerp.web.Widget.extend(/** @lends openerp.web.Header# *
             });
         });
         this.dialog = new openerp.web.Dialog(this,{
-            modal: true,
             title: _t("Preferences"),
-            width: 600,
-            height: 500,
+            width: '700px',
             buttons: [
-                {text: _t("Change password"), click: function(){ self.change_password(); }},
                 {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
+                {text: _t("Change password"), click: function(){ self.change_password(); }},
                 {text: _t("Save"), click: function(){
                         var inner_viewmanager = action_manager.inner_viewmanager;
                         inner_viewmanager.views[inner_viewmanager.active_view].controller.do_save()
                         .then(function() {
-                            self.dialog.stop();
+                            self.dialog.destroy();
+                            // needs to refresh interface in case language changed
                             window.location.reload();
                         });
                     }
                 }
             ]
-        });
-       this.dialog.start().open();
+        }).open();
        action_manager.appendTo(this.dialog);
        action_manager.render(this.dialog);
     },
-
-    change_password :function() {
+    on_menu_about: function() {
         var self = this;
-        this.dialog = new openerp.web.Dialog(this,{
-            modal : true,
-            title: _t("Change Password"),
-            width : 'auto',
-            height : 'auto'
-        });
-        this.dialog.start().open();
-        this.dialog.$element.html(QWeb.render("Change_Pwd", self));
-        this.dialog.$element.find("form[name=change_password_form]").validate({
-            submitHandler: function (form) {
-                self.rpc("/web/session/change_password",{
-                    'fields': $(form).serializeArray()
-                }, function(result) {
-                    if (result.error) {
-                        self.display_error(result);
-                        return;
-                    } else {
-                        self.session.logout();
-                    }
-                });
-            }
+        self.rpc("/web/webclient/version_info", {}).then(function(res) {
+            var $help = $(QWeb.render("About-Page", {version_info: res}));
+            $help.find('a.oe_activate_debug_mode').click(function (e) {
+                e.preventDefault();
+                window.location = $.param.querystring(
+                        window.location.href, 'debug');
+            });
+            openerp.web.dialog($help, {autoOpen: true,
+                modal: true, width: 960, title: _t("About")});
         });
     },
-    display_error: function (error) {
-        return $('<div>').dialog({
-            modal: true,
-            title: error.title,
-            buttons: [
-                {text: _("Ok"), click: function() { $(this).dialog("close"); }}
-            ]
-        }).html(error.error);
-    },
-    on_logout: function() {
-    }
-});
-
-openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
-    /**
-     * @constructs openerp.web.Menu
-     * @extends openerp.web.Widget
-     *
-     * @param parent
-     * @param element_id
-     * @param secondary_menu_id
-     */
-    init: function(parent, element_id, secondary_menu_id) {
-        this._super(parent, element_id);
-        this.secondary_menu_id = secondary_menu_id;
-        this.$secondary_menu = $("#" + secondary_menu_id);
-        this.menu = false;
-        this.folded = false;
-        if (window.localStorage) {
-            this.folded = localStorage.getItem('oe_menu_folded') === 'true';
-        }
-        this.float_timeout = 700;
-    },
-    start: function() {
-        this.$secondary_menu.addClass(this.folded ? 'oe_folded' : 'oe_unfolded');
-    },
-    do_reload: function() {
-        return this.rpc("/web/menu/load", {}, this.on_loaded);
-    },
-    on_loaded: function(data) {
-        this.data = data;
-        this.$element.html(QWeb.render("Menu", { widget : this }));
-        this.$secondary_menu.html(QWeb.render("Menu.secondary", { widget : this }));
-        this.$element.add(this.$secondary_menu).find("a").click(this.on_menu_click);
-        this.$secondary_menu.find('.oe_toggle_secondary_menu').click(this.on_toggle_fold);
-    },
-    on_toggle_fold: function() {
-        this.$secondary_menu.toggleClass('oe_folded').toggleClass('oe_unfolded');
-        if (this.folded) {
-            this.$secondary_menu.find('.oe_secondary_menu.active').show();
-        } else {
-            this.$secondary_menu.find('.oe_secondary_menu').hide();
-        }
-        this.folded = !this.folded;
-        if (window.localStorage) {
-            localStorage.setItem('oe_menu_folded', this.folded.toString());
-        }
-    },
-    on_menu_click: function(ev, id) {
-        id = id || 0;
-        var $clicked_menu, manual = false;
-
-        if (id) {
-            // We can manually activate a menu with it's id (for hash url mapping)
-            manual = true;
-            $clicked_menu = this.$element.find('a[data-menu=' + id + ']');
-            if (!$clicked_menu.length) {
-                $clicked_menu = this.$secondary_menu.find('a[data-menu=' + id + ']');
-            }
-        } else {
-            $clicked_menu = $(ev.currentTarget);
-            id = $clicked_menu.data('menu');
-        }
-
-        if (this.do_menu_click($clicked_menu, manual) && id) {
-            this.session.active_id = id;
-            this.rpc('/web/menu/action', {'menu_id': id}, this.on_menu_action_loaded);
-        }
-        if (ev) {
-            ev.stopPropagation();
-        }
-        return false;
-    },
-    do_menu_click: function($clicked_menu, manual) {
-        var $sub_menu, $main_menu,
-            active = $clicked_menu.is('.active'),
-            sub_menu_visible = false;
-
-        if (this.$secondary_menu.has($clicked_menu).length) {
-            $sub_menu = $clicked_menu.parents('.oe_secondary_menu');
-            $main_menu = this.$element.find('a[data-menu=' + $sub_menu.data('menu-parent') + ']');
-        } else {
-            $sub_menu = this.$secondary_menu.find('.oe_secondary_menu[data-menu-parent=' + $clicked_menu.attr('data-menu') + ']');
-            $main_menu = $clicked_menu;
-        }
-
-        sub_menu_visible = $sub_menu.is(':visible');
-        this.$secondary_menu.find('.oe_secondary_menu').hide();
-
-        $('.active', this.$element.add(this.$secondary_menu)).removeClass('active');
-        $main_menu.add($clicked_menu).add($sub_menu).addClass('active');
-
-        if (!(this.folded && manual)) {
-            this.do_show_secondary($sub_menu, $main_menu);
-        } else {
-            this.do_show_secondary();
-        }
-
-        if ($main_menu != $clicked_menu) {
-            if ($clicked_menu.is('.submenu')) {
-                $sub_menu.find('.submenu.opened').each(function() {
-                    if (!$(this).next().has($clicked_menu).length && !$(this).is($clicked_menu)) {
-                        $(this).removeClass('opened').next().hide();
-                    }
-                });
-                $clicked_menu.toggleClass('opened').next().toggle();
-            } else if ($clicked_menu.is('.leaf')) {
-                $sub_menu.toggle(!this.folded);
-                return true;
-            }
-        } else if (this.folded) {
-            if (active && sub_menu_visible) {
-                $sub_menu.hide();
-                return true;
-            }
-            return manual;
-        } else {
-            return true;
-        }
-        return false;
-    },
-    do_hide_secondary: function() {
-        this.$secondary_menu.hide();
-    },
-    do_show_secondary: function($sub_menu, $main_menu) {
-        var self = this;
-        this.$secondary_menu.show();
-        if (!arguments.length) {
-            return;
-        }
-        if (this.folded) {
-            var css = $main_menu.position(),
-                fold_width = this.$secondary_menu.width() + 2,
-                window_width = $(window).width();
-            css.top += 33;
-            css.left -= Math.round(($sub_menu.width() - $main_menu.width()) / 2);
-            css.left = css.left < fold_width ? fold_width : css.left;
-            if ((css.left + $sub_menu.width()) > window_width) {
-                delete(css.left);
-                css.right = 1;
+    on_menu_shortcut: function($link) {
+        var self = this,
+            id = $link.data('id');
+        self.session.active_id = id;
+        self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) {
+            if (ir_menu_data.action.length){
+                self.on_action(ir_menu_data.action[0][2]);
             }
-            $sub_menu.css(css);
-            $sub_menu.mouseenter(function() {
-                clearTimeout($sub_menu.data('timeoutId'));
-                $sub_menu.data('timeoutId', null);
-                return false;
-            }).mouseleave(function(evt) {
-                var timeoutId = setTimeout(function() {
-                    if (self.folded && $sub_menu.data('timeoutId')) {
-                        $sub_menu.hide().unbind('mouseenter').unbind('mouseleave');
-                    }
-                }, self.float_timeout);
-                $sub_menu.data('timeoutId', timeoutId);
-                return false;
-            });
-        }
-        $sub_menu.show();
-    },
-    on_menu_action_loaded: function(data) {
-        var self = this;
-        if (data.action.length) {
-            var action = data.action[0][2];
-            action.from_menu = true;
-            self.on_action(action);
-        } else {
-            self.on_action({type: 'null_action'});
-        }
-    },
-    on_action: function(action) {
+        });
     }
 });
 
@@ -978,64 +1018,96 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
     /**
      * @constructs openerp.web.WebClient
      * @extends openerp.web.Widget
-     *
-     * @param element_id
      */
-    init: function(element_id) {
+    init: function(parent) {
         var self = this;
-        this._super(null, element_id);
+        this._super(parent);
         openerp.webclient = this;
-
-        this.notification = new openerp.web.Notification(this);
-        this.loading = new openerp.web.Loading(this);
-        this.crashmanager =  new openerp.web.CrashManager();
-
-        this.header = new openerp.web.Header(this);
-        this.login = new openerp.web.Login(this);
-        this.header.on_logout.add(this.on_logout);
-        this.header.on_action.add(this.on_menu_action);
-
+        this.querystring = '?' + jQuery.param.querystring();
         this._current_state = null;
     },
     start: function() {
-        this._super.apply(this, arguments);
         var self = this;
+        this.$element.addClass("openerp openerp2");
+        if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
+            this.$element.addClass("kitten-mode-activated");
+            this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
+                self.$element.toggleClass('clark-gable');
+            });
+        }
         this.session.bind().then(function() {
-            var params = {};
-            if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
-                this.$element.addClass("kitten-mode-activated");
-                this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
-                    self.$element.toggleClass('clark-gable');
-                });
-            }
-            self.$element.html(QWeb.render("Interface", params));
-            self.menu = new openerp.web.Menu(self, "oe_menu", "oe_secondary_menu");
-            self.menu.on_action.add(self.on_menu_action);
-
-            self.notification.prependTo(self.$element);
-            self.loading.appendTo($('#oe_loading'));
-            self.header.appendTo($("#oe_header"));
-            self.login.appendTo($('#oe_login'));
-            self.menu.start();
-            if(self.session.session_is_valid()) {
-                self.login.on_login_valid();
-            } else {
-                self.login.on_login_invalid();
+            if (!self.session.session_is_valid()) {
+                self.show_login();
             }
         });
-        this.session.ready.then(function() {
-            self.login.on_login_valid();
-            self.header.do_update();
+        this.session.on_session_valid.add(function() {
+            self.show_application();
+
+            self.dropdown_menu.do_update();
             self.menu.do_reload();
             if(self.action_manager)
-                self.action_manager.stop();
+                self.action_manager.destroy();
             self.action_manager = new openerp.web.ActionManager(self);
             self.action_manager.appendTo($("#oe_app"));
             self.bind_hashchange();
+            var version_label = _t("OpenERP - Unsupported/Community Version");
+            if (!self.session.openerp_entreprise) {
+                self.$element.find('.oe_footer_powered').append(_.str.sprintf('<span> - <a href="http://www.openerp.com/support-or-publisher-warranty-contract" target="_blank">%s</a></span>', version_label));
+                document.title = version_label;
+            }
         });
     },
+    show_login: function() {
+        var self = this;
+        this.destroy_content();
+        this.show_common();
+        self.login = new openerp.web.Login(self);
+        self.login.appendTo(self.$element);
+    },
+    show_application: function() {
+        var self = this;
+        this.destroy_content();
+        this.show_common();
+        self.$table = $(QWeb.render("WebClient", {}));
+        self.$element.append(self.$table);
+        self.menu = new openerp.web.Menu(self);
+        self.menu.replace(this.$element.find('.oe_menu_placeholder'));
+        self.menu.on_action.add(this.proxy('on_menu_action'));
+        self.dropdown_menu = new openerp.web.DropDownMenu(self);
+        self.dropdown_menu.replace(this.$element.find('.oe_dropdown_menu_placeholder'));
+        self.dropdown_menu.on_menu_logout.add(this.proxy('on_logout'));
+        self.dropdown_menu.on_action.add(this.proxy('on_menu_action'));
+    },
+    show_common: function() {
+        var self = this;
+        if (!this.crashmanager) {
+            this.crashmanager =  new openerp.web.CrashManager();
+            openerp.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
+            window.onerror = function (message, file, line) {
+                self.crashmanager.on_traceback({
+                    type: _t("Client Error"),
+                    message: message,
+                    data: {debug: file + ':' + line}
+                });
+            }
+        }
+        this.notification = new openerp.web.Notification(this);
+        this.notification.appendTo(this.$element);
+        this.loading = new openerp.web.Loading(this);
+        this.loading.appendTo(this.$element);
+    },
+    destroy_content: function() {
+        _.each(_.clone(this.getChildren()), function(el) {
+            el.destroy();
+        });
+        this.$element.children().remove();
+    },
     do_reload: function() {
-        return this.session.session_init().pipe(_.bind(function() {this.menu.do_reload();}, this));
+        var self = this;
+        return this.session.session_reload().pipe(function () {
+            openerp.connection.load_modules(true).pipe(
+                self.menu.proxy('do_reload')); });
+
     },
     do_notify: function() {
         var n = this.notification;
@@ -1046,14 +1118,14 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         n.warn.apply(n, arguments);
     },
     on_logout: function() {
-        this.session.session_logout();
-        this.login.on_login_invalid();
-        this.header.do_update();
-        $(window).unbind('hashchange', this.on_hashchange);
-        this.do_push_state({});
-        if(this.action_manager)
-            this.action_manager.stop();
-        this.action_manager = null;
+        var self = this;
+        this.session.session_logout().then(function () {
+            $(window).unbind('hashchange', self.on_hashchange);
+            self.do_push_state({});
+            //would be cool to be able to do this, but I think it will make addons do strange things
+            //this.show_login();
+            window.location.reload();
+        });
     },
     bind_hashchange: function() {
         $(window).bind('hashchange', this.on_hashchange);
@@ -1068,7 +1140,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
     on_hashchange: function(event) {
         var state = event.getState(true);
         if (!_.isEqual(this._current_state, state)) {
-            this.action_manager.do_load_state(state);
+            this.action_manager.do_load_state(state, !!this._current_state);
         }
         this._current_state = state;
     },
@@ -1088,10 +1160,10 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
                 self.menu.on_menu_click(null, action.menu_id);
             });
         }
-    },
+    }
 });
 
-openerp.web.EmbeddedClient = openerp.web.Widget.extend({
+openerp.web.EmbeddedClient = openerp.web.OldWidget.extend({
     template: 'EmptyComponent',
     init: function(action_id, options) {
         this._super();
@@ -1116,7 +1188,7 @@ openerp.web.EmbeddedClient = openerp.web.Widget.extend({
 
             self.am.do_action(action);
         });
-    },
+    }
 
 });