[Merge] Merge the General section.

bzr revid: mdi@tinyerp.com-20121123054140-2mgtjrfmey4z7gb4
This commit is contained in:
Divyesh Makwana (Open ERP) 2012-11-23 11:11:40 +05:30
commit a49b3e6c64
2 changed files with 4 additions and 1 deletions

View File

@ -652,7 +652,7 @@
cursor: pointer;
}
.openerp .oe_dropdown_toggle {
color: rgba(0, 0, 0, 0.3);
color: #4C4C4C;
font-weight: normal;
}
.openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {

View File

@ -119,6 +119,9 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
},
session_logout: function() {
this.set_cookie('session_id', '');
var url = "#";
$.bbq.pushState(url);
window.location.search = "";
return this.rpc("/web/session/destroy", {});
},
get_cookie: function (name) {