[MERGE] trunk

bzr revid: al@openerp.com-20111215184305-3yxw54l91psrz5d6

diff --cc addons/web/controllers/main.py
Simple merge

diff --cc addons/web/static/src/js/chrome.js
index eb9328a,e27dc34..70beb7e
--- 1/addons/web/static/src/js/chrome.js
--- 2/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@@ -1012,25 -1027,12 +1016,28 @@@ openerp.web.WebClient = openerp.web.Wid
      },
      start: function() {
          this._super.apply(this, arguments);
 -        this.notification.prependTo(this.$element);
 -        this.loading.appendTo($('#oe_loading'));
 -        this.header.appendTo($("#oe_header"));
 -        this.session.start();
 -        this.login.appendTo($('#oe_login'));
 -        this.menu.start();
 +        var self = this;
 +        openerp.connection.bind("",function() {
 +            var params = {};
-             if(jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
-                 self.$element.addClass("kitten-mode-activated");
++            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));
 +            openerp.connection.session_restore();
 +
 +            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();
 +        });
      },
      do_reload: function() {
          return $.when(this.session.session_restore(),this.menu.do_reload());

diff --cc addons/web/static/src/xml/base.xml
Simple merge