nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved to bootstrap 2.1 and some ui fixes in todo and messages

Browse Source
This commit is contained in:
Rushabh Mehta
2012-10-03 11:56:38 +05:30
parent 079df382f9
commit 3009c46ba5
12 changed files with 52 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utilities/page/messages/messages.js
View File

@@ -24,7 +24,7 @@ wn.pages.messages.onload = function(wrapper) {
$('<h3 id="message-title">Everyone</h3>\
<div id="show-everyone" style="display: none;">\
<a href="#messages" style="font-size: 80%;">\
<a href="#messages/'+user+'" style="font-size: 80%;">\
Show messages from everyone</a></div><hr>\
<div id="post-message" style="display: none">\
<textarea style="width: 100%; height: 24px;"></textarea>\
@@ -36,6 +36,9 @@ wn.pages.messages.onload = function(wrapper) {
}
$(wn.pages.messages).bind('show', function() {
// remove alerts
$('#alert-container .alert').remove();
erpnext.messages.show();
setTimeout("erpnext.messages.refresh()", 7000);
})
@@ -78,7 +81,7 @@ erpnext.Messages = Class.extend({
});
},
show: function() {
var contact = this.get_contact();
var contact = this.get_contact() || this.contact || user;
$('#message-title').text(contact==user ? "Everyone" :
wn.boot.user_info[contact].fullname)
@@ -108,7 +111,6 @@ erpnext.Messages = Class.extend({
}
return name;
}
return user;
},
make_list: function() {
this.list = new wn.ui.Listing({