[MERGE] login fade out

[odoo/odoo.git] / addons / web / static / src / js / chrome.js

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index df991fa..b0581f0 100644 (file)
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -484,7 +484,7 @@ instance.web.Login =  instance.web.Widget.extend({
             self.databasemanager.do_exit.add_last(function() {
                 self.databasemanager.destroy();
                 self.$element.find('.oe_login_bottom').show();
-                self.$element.find('.oe_login_pane').show('fast');
+                self.$element.find('.oe_login_pane').show();
                 self.load_db_list(true).then(self.proxy('_db_list_loaded'));
             });
         });
@@ -525,8 +525,7 @@ instance.web.Login =  instance.web.Widget.extend({
         }
         var login = $e.find("form input[name=login]").val();
         var password = $e.find("form input[name=password]").val();
-        $e.find("form input[name=login]").attr("disabled", "disabled");
-        $e.find("form input[name=password]").attr("disabled", "disabled")
+
         this.do_login(db, login, password);
     },
     /**
@@ -554,10 +553,9 @@ instance.web.Login =  instance.web.Widget.extend({
                     localStorage.setItem('last_password_login_success', '');
                 }
             }
-            
             self.trigger("login");
         },function () {
-               self.$(".oe_login_pane").fadeIn("fast");
+            self.$(".oe_login_pane").fadeIn("fast");
             self.$element.addClass("oe_login_invalid");
             self.$element.find("form input[name=login]").removeAttr("disabled");
             self.$element.find("form input[name=password]").removeAttr("disabled");
@@ -860,12 +858,12 @@ instance.web.WebClient = instance.web.Widget.extend({
     },
     start: function() {
         var self = this;
-        this.$element.addClass("openerp openerp-web-client-container");
+        this.$element.addClass("openerp openerp_webclient_container");
         if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
             $("body").addClass("kitten-mode-activated");
-            self.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {
-                self.$element.toggleClass('clark-gable');
-            });
+            if ($.blockUI) {
+                $.blockUI.defaults.message = '<img src="http://www.amigrave.com/kitten.gif">';
+            }
         }
         this.session.session_bind().then(function() {
             self.destroy_content();