nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into production

Browse Source
This commit is contained in:
Nabin Hait
2012-12-18 13:49:07 +05:30
parent bf52eb08a6 92af22aa12
commit 5f175dfd00
41 changed files with 519 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ wn.pages.messages.onload = function(wrapper) {
</div><hr>\
<div id="post-message">\
<textarea style="width: 100%; height: 24px;"></textarea>\
<div><button class="btn btn-small">Post</button></div><hr>\
<div><button class="btn">Post</button></div><hr>\
</div>\
<div class="all-messages"></div>').appendTo($(wrapper).find('.layout-main-section'));
@@ -182,7 +182,7 @@ erpnext.Messages = Class.extend({
var $body = $(me.wrapper).find('.layout-side-section');
$('<h4>Users</h4><hr>\
<div id="show-everyone">\
<a href="#messages/'+user+'" class="btn btn-small">\
<a href="#messages/'+user+'" class="btn">\
Show messages from everyone</a><hr></div>\
').appendTo($body);
r.message.sort(function(a, b) { return b.has_session - a.has_session; });