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

Polished disconnection style 

bzr revid: nicolas.vanhoren@openerp.com-20121204144310-a9l68frigqhmpysg
This commit is contained in:
niv-openerp 2012-12-04 15:43:10 +01:00
parent 61fc7a8dbe
commit 7ad062ca39
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/web_im/static/src/css/im.css
View File

@ -118,7 +118,6 @@
}
.openerp .oe_im_chatview .oe_im_chatview_disconnected {
display:none;
position: absolute;
z-index: 100;
width: 100%;
background: #E8EBEF;
@ -126,6 +125,11 @@
font-size: 11px;
color: #999;
line-height: 14px;
height: 28px;
overflow: hidden;
}
.openerp .oe_im_chatview.oe_im_chatview_disconnected_status .oe_im_chatview_disconnected {
display: block;
}
.openerp .oe_im_chatview .oe_im_chatview_header {
padding: 3px 6px 2px;
@ -156,6 +160,9 @@
overflow: auto;
height: 287px;
}
.openerp .oe_im_chatview.oe_im_chatview_disconnected_status .oe_im_chatview_content {
height: 249px;
}
.openerp .oe_im_chatview .oe_im_chatview_footer {
position: relative;
padding: 3px;

6
addons/web_im/static/src/js/im.js
View File

@ -308,8 +308,9 @@ openerp.web_im = function(instance) {
},
start: function() {
var change_status = function() {
this.$el.toggleClass("oe_im_chatview_disconnected_status", this.user.get("im_status") === false);
this.$(".oe_im_chatview_online").toggle(this.user.get("im_status") === true);
this.$(".oe_im_chatview_disconnected").toggle(this.user.get("im_status") === false);
this._go_bottom();
};
this.user.on("change:im_status", this, change_status);
change_status.call(this);
@ -358,6 +359,9 @@ openerp.web_im = function(instance) {
date = date.toString(Date.CultureInfo.formatPatterns.shortDate + " " + Date.CultureInfo.formatPatterns.shortTime);
this.last_bubble = $(QWeb.render("Conversation.bubble", {"items": items, "user": user, "time": date}));
$(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);
this._go_bottom();
},
_go_bottom: function() {
this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
},
destroy: function() {