[IMP] Major improvement to kitten mode
[odoo/odoo.git] / addons / web / static / src / js / chrome.js
index e1706bc..76a6b56 100644 (file)
@@ -1,16 +1,15 @@
 /*---------------------------------------------------------
  * OpenERP Web chrome
  *---------------------------------------------------------*/
-openerp.web.chrome = function(openerp) {
-var QWeb = openerp.web.qweb,
-    _t = openerp.web._t;
+openerp.web.chrome = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 
-openerp.web.Notification =  openerp.web.Widget.extend({
+instance.web.Notification =  instance.web.Widget.extend({
     template: 'Notification',
     init: function() {
         this._super.apply(this, arguments);
-        // move to openerp.web.notification
-        openerp.notification = this;
+        instance.web.notification = this;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -43,13 +42,17 @@ openerp.web.Notification =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.dialog = function(element) {
+/**
+ * The very minimal function everything should call to create a dialog
+ * in OpenERP Web Client.
+ */
+instance.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.Widget.extend({
+instance.web.Dialog = instance.web.Widget.extend({
     dialog_title: "",
     init: function (parent, options, content) {
         var self = this;
@@ -83,7 +86,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
         if (this.dialog_options.autoOpen) {
             this.open();
         } else {
-            openerp.web.dialog(this.$element, this.get_options());
+            instance.web.dialog(this.$element, this.get_options());
         }
     },
     get_options: function(options) {
@@ -122,7 +125,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
             this.$element.html(this.renderElement());
         }
         var o = this.get_options(options);
-        openerp.web.dialog(this.$element, o).dialog('open');
+        instance.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' });
         }
@@ -137,7 +140,6 @@ openerp.web.Dialog = openerp.web.Widget.extend({
         }
     },
     on_resized: function() {
-        //openerp.log("Dialog resized to %d x %d", this.$element.width(), this.$element.height());
     },
     destroy: function () {
         this.close();
@@ -146,7 +148,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
+instance.web.CrashManager = instance.web.CallbackEnabled.extend({
     on_rpc_error: function(error) {
         if (error.data.fault_code) {
             var split = ("" + error.data.fault_code).split('\n')[0].split(' -- ');
@@ -162,7 +164,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
         }
     },
     on_managed_error: function(error) {
-       openerp.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
+        instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
             title: "OpenERP " + _.str.capitalize(error.type),
             buttons: [
                 {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
@@ -172,16 +174,16 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
     on_traceback: function(error) {
         var self = this;
         var buttons = {};
-        if (openerp.connection.openerp_entreprise) {
+        if (instance.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){
+                new instance.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.')
+                        alert('There was a communication error.');
                     } else {
                         $this.dialog('close');
                     }
@@ -195,7 +197,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
                 $(this).dialog("close");
             };
         }
-        var dialog = new openerp.web.Dialog(this, {
+        var dialog = new instance.web.Dialog(this, {
             title: "OpenERP " + _.str.capitalize(error.type),
             width: '80%',
             height: '50%',
@@ -203,11 +205,18 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
             min_height: '600px',
             buttons: buttons
         }).open();
-        dialog.$element.html(QWeb.render('CrashManager.error', {session: openerp.connection, error: error}));
-    }
+        dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error}));
+    },
+    on_javascript_exception: function(exception) {
+       this.on_traceback({
+           type: _t("Client Error"),
+           message: exception,
+           data: {debug: ""}
+       });
+    },
 });
 
-openerp.web.Loading = openerp.web.Widget.extend({
+instance.web.Loading = instance.web.Widget.extend({
     template: 'Loading',
     init: function(parent) {
         this._super(parent);
@@ -258,7 +267,7 @@ openerp.web.Loading = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.DatabaseManager = openerp.web.Widget.extend({
+instance.web.DatabaseManager = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         this.unblockUIFunction = $.unblockUI;
@@ -269,12 +278,12 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
     start: function() {
         var self = this;
         var fetch_db = this.rpc("/web/database/get_list", {}).pipe(
-            function(result) { 
-                self.db_list = result.db_list; 
+            function(result) {
+                self.db_list = result.db_list;
             },
-            function (_, ev) { 
+            function (_, ev) {
                 ev.preventDefault();
-                self.db_list = null; 
+                self.db_list = null;
             });
         var fetch_langs = this.rpc("/web/session/get_lang_list", {}).then(function(result) {
             self.lang_list = result.lang_list;
@@ -284,11 +293,15 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
     do_render: function() {
         var self = this;
         self.$element.html(QWeb.render("DatabaseManager", { widget : self }));
-        self.$element.find(".oe_database_manager_menu").tabs();
+        self.$element.find(".oe_database_manager_menu").tabs({
+            show: function(event, ui) {
+                $('*[autofocus]:first', ui.panel).focus();
+            }
+        });
         self.$element.find("form[name=create_db_form]").validate({ submitHandler: self.do_create });
-               self.$element.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop });
-               self.$element.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup });
-               self.$element.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore });
+        self.$element.find("form[name=drop_db_form]").validate({ submitHandler: self.do_drop });
+        self.$element.find("form[name=backup_db_form]").validate({ submitHandler: self.do_backup });
+        self.$element.find("form[name=restore_db_form]").validate({ submitHandler: self.do_restore });
         self.$element.find("form[name=change_pwd_form]").validate({
             messages: {
                 old_pwd: "Please enter your previous password",
@@ -300,7 +313,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
             },
             submitHandler: self.do_change_password
         });
-               self.$element.find("#back_to_login").click(self.do_exit);
+        self.$element.find("#back_to_login").click(self.do_exit);
     },
     destroy: function () {
         this.$element.find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login').unbind('click').end().empty();
@@ -344,7 +357,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
      * @param {String} error.error message of the error dialog
      */
     display_error: function (error) {
-        return openerp.web.dialog($('<div>'), {
+        return instance.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
@@ -388,7 +401,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
             success: function () {
                 self.do_notify(_t("Backed"), _t("Database backed up successfully"));
             },
-            error: openerp.webclient.crashmanager.on_rpc_error,
+            error: instance.webclient.crashmanager.on_rpc_error,
             complete: function() {
                 self.unblockUI();
             }
@@ -409,12 +422,12 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
                     self.display_error({
                         title: 'Access Denied',
                         error: 'Incorrect super-administrator password'
-                    })
+                    });
                 } else {
                     self.display_error({
                         title: 'Restore Database',
                         error: 'Could not restore the database'
-                    })
+                    });
                 }
             },
             complete: function() {
@@ -439,9 +452,11 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.Login =  openerp.web.Widget.extend({
+instance.web.Login =  instance.web.Widget.extend({
     template: "Login",
     remember_credentials: true,
+    _db_list: null,
+
     init: function(parent) {
         this._super(parent);
         this.has_local_storage = typeof(localStorage) != 'undefined';
@@ -451,7 +466,7 @@ openerp.web.Login =  openerp.web.Widget.extend({
         if (this.has_local_storage && this.remember_credentials) {
             this.selected_db = localStorage.getItem('last_db_login_success');
             this.selected_login = localStorage.getItem('last_login_login_success');
-            if (jQuery.deparam(jQuery.param.querystring()).debug != undefined) {
+            if (jQuery.deparam(jQuery.param.querystring()).debug !== undefined) {
                 this.selected_password = localStorage.getItem('last_password_login_success');
             }
         }
@@ -464,29 +479,39 @@ openerp.web.Login =  openerp.web.Widget.extend({
         self.$element.find('.oe_login_manage_db').click(function() {
             self.$element.find('.oe_login_bottom').hide();
             self.$element.find('.oe_login_pane').hide();
-            self.databasemanager = new openerp.web.DatabaseManager(self);
+            self.databasemanager = new instance.web.DatabaseManager(self);
             self.databasemanager.appendTo(self.$element);
             self.databasemanager.do_exit.add_last(function() {
                 self.databasemanager.destroy();
                 self.$element.find('.oe_login_bottom').show();
                 self.$element.find('.oe_login_pane').show();
-                self.load_db_list();
-            })
-        });
-        self.load_db_list();
-    },
-    load_db_list: function () {
-        var self = this;
-        self.rpc("/web/database/get_list", {}, function(result) {
-            self.set_db_list(result.db_list);
-        }, function(error, event) {
-            if (error.data.fault_code === 'AccessDenied') {
-                event.preventDefault();
-            }
+                self.load_db_list(true).then(self.proxy('_db_list_loaded'));
+            });
         });
-    },
-    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}))
+        return self.load_db_list().then(self.proxy('_db_list_loaded'));
+    },
+    load_db_list: function (force) {
+        var d = $.when(), self = this;
+        if (_.isNull(this._db_list) || force) {
+            d = self.rpc("/web/database/get_list", {}, function(result) {
+                self._db_list = _.clone(result.db_list);
+            }, function(error, event) {
+                if (error.data.fault_code === 'AccessDenied') {
+                    event.preventDefault();
+                }
+            });
+        }
+        return d;
+    },
+    _db_list_loaded: function () {
+        var list = this._db_list,
+            dbdiv = this.$element.find('div.oe_login_dbpane');
+        this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}));
+        if(list && list.length === 1) {
+            dbdiv.hide();
+        } else {
+            dbdiv.show();
+        }
     },
     on_submit: function(ev) {
         if(ev) {
@@ -512,20 +537,13 @@ openerp.web.Login =  openerp.web.Widget.extend({
      */
     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() {
-            self.$element.removeClass("login_invalid");
+        this.$element.removeClass('oe_login_invalid');
+        return this.session.session_authenticate(db, login, password).pipe(function() {
             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) {
+                    if (jQuery.deparam(jQuery.param.querystring()).debug !== undefined) {
                         localStorage.setItem('last_password_login_success', password);
                     }
                 } else {
@@ -534,44 +552,43 @@ openerp.web.Login =  openerp.web.Widget.extend({
                     localStorage.setItem('last_password_login_success', '');
                 }
             }
+            self.$(".oe_login_pane").fadeOut("slow");
+            self.trigger("login");
+        },function () {
+            self.$element.addClass("oe_login_invalid");
         });
     }
 });
 
-openerp.web.Menu =  openerp.web.Widget.extend({
+instance.web.Menu =  instance.web.Widget.extend({
     template: 'Menu',
     init: function() {
         this._super.apply(this, arguments);
         this.has_been_loaded = $.Deferred();
         this.maximum_visible_links = 'auto'; // # of menu to show. 0 = do not crop, 'auto' = algo
+        this.data = {data:{children:[]}};
     },
     start: function() {
         this._super.apply(this, arguments);
         this.$secondary_menus = this.getParent().$element.find('.oe_secondary_menus_container');
-        this.$secondary_menus.on('click', 'a[data-menu]', this.on_menu_click);
-        $('html').bind('click', this.do_hide_more);
+        return this.do_reload();
     },
     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);
-            }
-        });
+        return this.rpc("/web/menu/load", {}).then(this.on_loaded);
     },
     on_loaded: function(data) {
         var self = this;
         this.data = data;
         this.renderElement();
         this.limit_entries();
-        this.$element.on('click', 'a[data-menu]', this.on_menu_click);
-        this.$element.on('click', 'a.oe_menu_more_link', function() {
-            self.$element.find('.oe_menu_more').toggle();
-            return false;
-        });
         this.$secondary_menus.html(QWeb.render("Menu.secondary", { widget : this }));
+        this.$element.on('click', 'a[data-menu]', this.on_menu_click);
+        this.$secondary_menus.on('click', 'a[data-menu]', this.on_menu_click);
         // Hide second level submenus
         this.$secondary_menus.find('.oe_menu_toggler').siblings('.oe_secondary_submenu').hide();
+        if (self.current_menu) {
+            self.open_menu(self.current_menu);
+        }
         this.has_been_loaded.resolve();
     },
     limit_entries: function() {
@@ -591,9 +608,6 @@ openerp.web.Menu =  openerp.web.Widget.extend({
         var width = $(window).width();
         return Math.floor(width / 125);
     },
-    do_hide_more: function() {
-        this.$element.find('.oe_menu_more').hide();
-    },
     /**
      * 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
@@ -603,6 +617,7 @@ openerp.web.Menu =  openerp.web.Widget.extend({
     open_menu: function (id) {
         var $clicked_menu, $sub_menu, $main_menu;
         $clicked_menu = this.$element.add(this.$secondary_menus).find('a[data-menu=' + id + ']');
+        this.trigger('open_menu', id, $clicked_menu);
 
         if (this.$secondary_menus.has($clicked_menu).length) {
             $sub_menu = $clicked_menu.parents('.oe_secondary_menu');
@@ -620,6 +635,9 @@ openerp.web.Menu =  openerp.web.Widget.extend({
         this.$secondary_menus.find('.oe_secondary_menu').hide();
         $sub_menu.show();
 
+        // Hide/Show the leftbar menu depending of the presence of sub-items
+        this.$secondary_menus.parent('.oe_leftbar').toggle(!!$sub_menu.children().length);
+
         // Activate current menu item and show parents
         this.$secondary_menus.find('.oe_active').removeClass('oe_active');
         if ($main_menu !== $clicked_menu) {
@@ -631,58 +649,62 @@ openerp.web.Menu =  openerp.web.Widget.extend({
             }
         }
     },
+    /**
+     * Call open_menu with the first menu_item matching an action_id
+     *
+     * @param {Number} id the action_id to match
+     */
     open_action: function (id) {
-        var menu_id, $menu = this.$element.add(this.$secondary_menus).find('a[data-action-id=' + id + ']');
-        if (menu_id = $menu.data('menu')) {
+        var $menu = this.$element.add(this.$secondary_menus).find('a[data-action-id=' + id + ']');
+        var menu_id = $menu.data('menu');
+        if (menu_id) {
             this.open_menu(menu_id);
         }
     },
-    on_menu_click: function(ev, id) {
-        this.do_hide_more();
-        id = id || 0;
-        var $clicked_menu, manual = false;
-
+    /**
+     * Process a click on a menu item
+     *
+     * @param {Number} id the menu_id
+     */
+    menu_click: function(id) {
         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_menus.find('a[data-menu=' + id + ']');
+            // find back the menuitem in dom to get the action
+            var $item = this.$element.find('a[data-menu=' + id + ']');
+            if (!$item.length) {
+                $item = this.$secondary_menus.find('a[data-menu=' + id + ']');
+            }
+            var action_id = $item.data('action-id');
+            // If first level menu doesnt have action trigger first leaf
+            if (!action_id) {
+                if(this.$element.has($item).length) {
+                    $sub_menu = this.$secondary_menus.find('.oe_secondary_menu[data-menu-parent=' + id + ']');
+                    $items = $sub_menu.find('a[data-action-id]').filter('[data-action-id!=""]');
+                    if($items.length) {
+                        action_id = $items.data('action-id');
+                        id = $items.data('menu');
+                    }
+                }
             }
-        } else {
-            $clicked_menu = $(ev.currentTarget);
-            id = $clicked_menu.data('menu');
-        }
-
-        this.trigger('menuClicked', id, $clicked_menu);
-
-        if (id) {
             this.open_menu(id);
             this.current_menu = id;
             this.session.active_id = id;
-            var action_id = $clicked_menu.data('action-id');
             if (action_id) {
-                this.on_action(action_id);
+                this.trigger('menu_click', action_id, id, $item);
             }
         }
-        if (ev) {
-            ev.stopPropagation();
-        }
-        return false;
     },
-    do_show_secondary: function($sub_menu, $main_menu) {
-        var self = this;
-        this.$secondary_menus.show();
-        if (!arguments.length) {
-            return;
-        }
-        $sub_menu.show();
+    /**
+     * Jquery event handler for menu click
+     *
+     * @param {Event} ev the jquery event
+     */
+    on_menu_click: function(ev) {
+        ev.preventDefault();
+        this.menu_click($(ev.currentTarget).data('menu'));
     },
-    on_action: function(action) {
-    }
 });
 
-openerp.web.UserMenu =  openerp.web.Widget.extend({
+instance.web.UserMenu =  instance.web.Widget.extend({
     template: "UserMenu",
     init: function(parent) {
         this._super(parent);
@@ -691,27 +713,21 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     start: function() {
         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() {
+        this.$element.on('click', '.oe_dropdown_menu li a[data-menu]', function(ev) {
+            ev.preventDefault();
             var f = self['on_menu_' + $(this).data('menu')];
-            f && f($(this));
-            self.$element.find('.oe_dropdown_options').hide();
-            return false;
+            if (f) {
+                f($(this));
+            }
         });
     },
     change_password :function() {
         var self = this;
-        this.dialog = new openerp.web.Dialog(this, {
+        this.dialog = new instance.web.Dialog(this, {
             title: _t("Change Password"),
             width : 'auto'
         }).open();
-        this.dialog.$element.html(QWeb.render("Change_Pwd", self));
+        this.dialog.$element.html(QWeb.render("UserMenu.password", self));
         this.dialog.$element.find("form[name=change_password_form]").validate({
             submitHandler: function (form) {
                 self.rpc("/web/session/change_password",{
@@ -721,14 +737,14 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
                         self.display_error(result);
                         return;
                     } else {
-                        openerp.webclient.on_logout();
+                        instance.webclient.on_logout();
                     }
                 });
             }
         });
     },
     display_error: function (error) {
-        return openerp.web.dialog($('<div>'), {
+        return instance.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
@@ -743,72 +759,28 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
             $avatar.attr('src', $avatar.data('default-src'));
             if (!self.session.uid)
                 return;
-            var func = new openerp.web.Model("res.users").get_func("read");
+            var func = new instance.web.Model("res.users").get_func("read");
             return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
-                // TODO: Show company if multicompany is in use
-                var topbar_name = _.str.sprintf("%s (%s)", res.name, openerp.connection.db, res.company_id[1]);
+                var topbar_name = res.name;
+                if(instance.connection.debug)
+                    topbar_name = _.str.sprintf("%s (%s)", topbar_name, instance.connection.db);
+                if(res.company_id[0] > 1)
+                    topbar_name = _.str.sprintf("%s (%s)", topbar_name, res.company_id[1]);
                 self.$element.find('.oe_topbar_name').text(topbar_name);
                 var avatar_src = _.str.sprintf('%s/web/binary/image?session_id=%s&model=res.users&field=avatar&id=%s', self.session.prefix, self.session.session_id, self.session.uid);
                 $avatar.attr('src', avatar_src);
-                return self.shortcut_load();
             });
         };
         this.update_promise = this.update_promise.pipe(fct, fct);
     },
     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) {
-            sc.binding = {};
-            $(sc.binding).bind({
-                'add': function (e, attrs) {
-                    shortcuts_ds.create(attrs, function (out) {
-                        var shortcut = QWeb.render('UserMenu.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_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);
-
-            $(QWeb.render('UserMenu.shortcut', {'shortcuts': shortcuts}))
-                .appendTo(self.$element.find('.oe_dropdown_options'));
-        });
-    },
     on_menu_logout: 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);
+        var action_manager = new instance.web.ActionManager(this);
+        var dataset = new instance.web.DataSet (this,'res.users',this.context);
         dataset.call ('action_get','',function (result){
             self.rpc('/web/action/load', {action_id:result}, function(result){
                 action_manager.do_action(_.extend(result['result'], {
@@ -825,12 +797,12 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
                 }));
             });
         });
-        this.dialog = new openerp.web.Dialog(this,{
+        this.dialog = new instance.web.Dialog(this,{
             title: _t("Preferences"),
             width: '700px',
             buttons: [
-                {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
                 {text: _t("Change password"), click: function(){ self.change_password(); }},
+                {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
                 {text: _t("Save"), click: function(){
                         var inner_viewmanager = action_manager.inner_viewmanager;
                         inner_viewmanager.views[inner_viewmanager.active_view].controller.do_save()
@@ -849,108 +821,125 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     on_menu_about: function() {
         var self = this;
         self.rpc("/web/webclient/version_info", {}).then(function(res) {
-            var $help = $(QWeb.render("About-Page", {version_info: res}));
+            var $help = $(QWeb.render("UserMenu.about", {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,
+            instance.web.dialog($help, {autoOpen: true,
                 modal: true, width: 960, title: _t("About")});
         });
     },
-    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]);
-            }
-        });
-    }
 });
 
-openerp.web.WebClient = openerp.web.Widget.extend({
+instance.web.WebClient = instance.web.Widget.extend({
     init: function(parent) {
         var self = this;
         this._super(parent);
-        openerp.webclient = this;
+        instance.webclient = this;
         this.querystring = '?' + jQuery.param.querystring();
         this._current_state = null;
     },
+    _get_version_label: function() {
+        if (this.session.openerp_entreprise) {
+            return 'OpenERP';
+        } else {
+            return _t("OpenERP - Unsupported/Community Version");
+        }
+    },
+    set_title: function(title) {
+        title = _.str.clean(title);
+        var sep = _.isEmpty(title) ? '' : ' - ';
+        document.title = title + sep + 'OpenERP';
+    },
     start: function() {
         var self = this;
-        this.$element.addClass("openerp openerp-web-client-container");
-        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.$element.addClass("openerp openerp_webclient_container");
+        if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
+            $("body").addClass("kitten-mode-activated");
+            if ($.blockUI) {
+                $.blockUI.defaults.message = '<img src="http://www.amigrave.com/kitten.gif">';
+            }
         }
         this.session.session_bind().then(function() {
+            self.destroy_content();
+            self.show_common();
             if (!self.session.session_is_valid()) {
                 self.show_login();
-            }
-        });
-        this.session.on_session_valid.add(function() {
-            self.show_application();
-
-            self.user_menu.do_update();
-            self.menu.do_reload();
-            if(self.action_manager)
-                self.action_manager.destroy();
-            self.action_manager = new openerp.web.ActionManager(self);
-            self.action_manager.appendTo(self.$element.find('.oe_application'));
-            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;
+            } else {
+                self.show_application();
             }
         });
         this.$element.on('mouseenter', '.oe_systray > div:not([data-tipsy=true])', function() {
             $(this).attr('data-tipsy', 'true').tipsy().trigger('mouseenter');
         });
+        this.$element.on('click', '.oe_dropdown_toggle', function(ev) {
+            ev.preventDefault();
+            var $menu = $(this).find('.oe_dropdown_menu');
+            var state = $menu.is('.oe_opened');
+            setTimeout(function() {
+                // Do not alter propagation
+                $menu.toggleClass('oe_opened', !state);
+                if (!state) {
+                    // Move $menu if outside window's edge
+                    var doc_width = $(document).width();
+                    var offset = $menu.offset();
+                    var menu_width = $menu.width();
+                    var x = doc_width - offset.left - menu_width - 15;
+                    if (x < 0) {
+                        $menu.offset({ left: offset.left + x }).width(menu_width);
+                    }
+                }
+            }, 0);
+        });
+        instance.web.bus.on('click', this, function() {
+            self.$element.find('.oe_dropdown_menu.oe_opened').removeClass('oe_opened');
+        });
+    },
+    show_common: function() {
+        var self = this;
+        this.crashmanager =  new instance.web.CrashManager();
+        instance.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}
+            });
+        };
+        self.notification = new instance.web.Notification(this);
+        self.notification.appendTo(self.$element);
+        self.loading = new instance.web.Loading(self);
+        self.loading.appendTo(self.$element);
+        self.login = new instance.web.Login(self);
+        self.login.on("login",self,self.show_application);
+        self.$table = $(QWeb.render("WebClient", {}));
+        self.action_manager = new instance.web.ActionManager(self);
+        self.action_manager.appendTo(self.$table.find('.oe_application'));
     },
     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.login.$element.hide();
+        self.menu = new instance.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
-        self.menu.on_action.add(this.proxy('on_menu_action'));
-        self.user_menu = new openerp.web.UserMenu(self);
+        self.menu.on('menu_click', this, this.on_menu_action);
+        self.user_menu = new instance.web.UserMenu(self);
         self.user_menu.replace(this.$element.find('.oe_user_menu_placeholder'));
         self.user_menu.on_menu_logout.add(this.proxy('on_logout'));
         self.user_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}
-                });
-            }
+        self.user_menu.do_update();
+        self.bind_hashchange();
+        if (!self.session.openerp_entreprise) {
+            var version_label = self._get_version_label();
+            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));
         }
-        this.notification = new openerp.web.Notification(this);
-        this.notification.appendTo(this.$element);
-        this.loading = new openerp.web.Loading(this);
-        this.loading.appendTo(this.$element);
+        self.set_title();
     },
     destroy_content: function() {
         _.each(_.clone(this.getChildren()), function(el) {
@@ -961,7 +950,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     do_reload: function() {
         var self = this;
         return this.session.session_reload().pipe(function () {
-            openerp.connection.load_modules(true).pipe(
+            instance.connection.load_modules(true).pipe(
                 self.menu.proxy('do_reload')); });
 
     },
@@ -984,23 +973,39 @@ openerp.web.WebClient = openerp.web.Widget.extend({
         });
     },
     bind_hashchange: function() {
+        var self = this;
         $(window).bind('hashchange', this.on_hashchange);
 
         var state = $.bbq.getState(true);
         if (! _.isEmpty(state)) {
             $(window).trigger('hashchange');
         } else {
-            this.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
+            self.menu.has_been_loaded.then(function() {
+                var first_menu_id = self.menu.$element.find("a:first").data("menu");
+                if(first_menu_id) {
+                    self.menu.menu_click(first_menu_id);
+                }
+            });
         }
     },
     on_hashchange: function(event) {
+        var self = this;
         var state = event.getState(true);
         if (!_.isEqual(this._current_state, state)) {
-            this.action_manager.do_load_state(state, !!this._current_state);
+            if(state.action_id === undefined && state.menu_id) {
+                self.menu.has_been_loaded.then(function() {
+                    self.menu.do_reload().then(function() {
+                        self.menu.menu_click(state.menu_id)
+                    });
+                });
+            } else {
+                this.action_manager.do_load_state(state, !!this._current_state);
+            }
         }
         this._current_state = state;
     },
     do_push_state: function(state) {
+        this.set_title(state.title);
         var url = '#' + $.param(state);
         this._current_state = _.clone(state);
         $.bbq.pushState(url);
@@ -1010,10 +1015,10 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     },
     do_action: function(action) {
         var self = this;
-        // TODO replace by client action menuclick 
+        // TODO replace by client action menuclick
         if(action.menu_id) {
             this.do_reload().then(function () {
-                self.menu.on_menu_click(null, action.menu_id);
+                self.menu.menu_click(action.menu_id);
             });
         }
     },
@@ -1025,14 +1030,14 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.EmbeddedClient = openerp.web.Widget.extend({
+instance.web.EmbeddedClient = instance.web.Widget.extend({
     template: 'EmptyComponent',
     init: function(parent, action_id, options) {
         this._super(parent);
-        // TODO take the xmlid of a action instead of its id 
+        // TODO take the xmlid of a action instead of its id
         this.action_id = action_id;
         this.options = options || {};
-        this.am = new openerp.web.ActionManager(this);
+        this.am = new instance.web.ActionManager(this);
     },
     start: function() {
         var self = this;
@@ -1052,7 +1057,7 @@ openerp.web.EmbeddedClient = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.embed = function (origin, dbname, login, key, action, options) {
+instance.web.embed = function (origin, dbname, login, key, action, options) {
     $('head').append($('<link>', {
         'rel': 'stylesheet',
         'type': 'text/css',
@@ -1063,14 +1068,14 @@ openerp.web.embed = function (origin, dbname, login, key, action, options) {
         var sc = document.getElementsByTagName('script');
         currentScript = sc[sc.length-1];
     }
-    openerp.connection.session_bind(origin).then(function () {
-        openerp.connection.session_authenticate(dbname, login, key, true).then(function () {
-            var client = new openerp.web.EmbeddedClient(null, action, options);
+    instance.connection.session_bind(origin).then(function () {
+        instance.connection.session_authenticate(dbname, login, key, true).then(function () {
+            var client = new instance.web.EmbeddedClient(null, action, options);
             client.insertAfter(currentScript);
         });
     });
 
-}
+};
 
 };