odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] hide/show topbar and leftbar on login page and db manager 

bzr revid: chs@openerp.com-20120814103815-ajdku32ngf5eidrf
This commit is contained in:
Christophe Simonis 2012-08-14 12:38:15 +02:00
parent a1d68fb739
commit 747374f98f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/web/static/src/js/chrome.js
View File

@ -316,7 +316,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
}, },
do_render: function() { do_render: function() {
var self = this; var self = this;
$('.oe_topbar,.oe_leftbar').show(); instance.webclient.toggle_bars(true);
self.$element.html(QWeb.render("DatabaseManager", { widget : self })); self.$element.html(QWeb.render("DatabaseManager", { widget : self }));
$('.oe_user_menu_placeholder').append(QWeb.render("DatabaseManager.user_menu",{ widget : self })); $('.oe_user_menu_placeholder').append(QWeb.render("DatabaseManager.user_menu",{ widget : self }));
$('.oe_secondary_menus_container').append(QWeb.render("DatabaseManager.menu",{ widget : self })); $('.oe_secondary_menus_container').append(QWeb.render("DatabaseManager.menu",{ widget : self }));
@ -501,7 +501,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
}, },
do_exit: function () { do_exit: function () {
this.$element.remove(); this.$element.remove();
$('.oe_topbar,.oe_leftbar').hide(); instance.webclient.toggle_bars(false);
this.do_action('login'); this.do_action('login');
} }
}); });
@ -611,8 +611,9 @@ instance.web.Login = instance.web.Widget.extend({
} }
self.trigger('login_successful'); self.trigger('login_successful');
},function () { },function () {
self.$(".oe_login_pane").fadeIn("fast"); self.$(".oe_login_pane").fadeIn("fast", function() {
self.$element.addClass("oe_login_invalid"); self.$element.addClass("oe_login_invalid");
});
}); });
}, },
show: function () { show: function () {
@ -977,6 +978,9 @@ instance.web.Client = instance.web.Widget.extend({
self.action_manager = new instance.web.ActionManager(self); self.action_manager = new instance.web.ActionManager(self);
self.action_manager.appendTo(self.$('.oe_application')); self.action_manager.appendTo(self.$('.oe_application'));
}, },
toggle_bars: function(value) {
this.$('tr:has(td.oe_topbar),.oe_leftbar').toggle(value);
}
}); });
instance.web.WebClient = instance.web.Client.extend({ instance.web.WebClient = instance.web.Client.extend({
@ -1018,11 +1022,11 @@ instance.web.WebClient = instance.web.Client.extend({
}; };
}, },
show_login: function() { show_login: function() {
this.$('.oe_topbar').hide(); this.toggle_bars(false);
var action = { var action = {
'type': 'ir.actions.client', 'type': 'ir.actions.client',
'tag': 'login', 'tag': 'login'
}; };
var state = $.bbq.getState(true); var state = $.bbq.getState(true);
if (state.action === "login") { if (state.action === "login") {
@ -1038,7 +1042,7 @@ instance.web.WebClient = instance.web.Client.extend({
}, },
show_application: function() { show_application: function() {
var self = this; var self = this;
self.$('.oe_topbar').show(); self.toggle_bars(true);
self.menu = new instance.web.Menu(self); self.menu = new instance.web.Menu(self);
self.menu.replace(this.$element.find('.oe_menu_placeholder')); self.menu.replace(this.$element.find('.oe_menu_placeholder'));
self.menu.on('menu_click', this, this.on_menu_action); self.menu.on('menu_click', this, this.on_menu_action);