listing/messages fix
diff --git a/erpnext/utilities/page/messages/messages.css b/erpnext/utilities/page/messages/messages.css
index 81260ab..49b3771 100644
--- a/erpnext/utilities/page/messages/messages.css
+++ b/erpnext/utilities/page/messages/messages.css
@@ -1,9 +1,9 @@
#message-post-text {
- height: 3em;
+ width: 50%;
}
#message-list {
- margin: 0px 40px;
+
}
.message {
diff --git a/erpnext/utilities/page/messages/messages.html b/erpnext/utilities/page/messages/messages.html
index b645d3f..7538785 100644
--- a/erpnext/utilities/page/messages/messages.html
+++ b/erpnext/utilities/page/messages/messages.html
@@ -3,7 +3,7 @@
<a class="close" onclick="window.history.back();">×</a>
<h1>Messages</h1>
<div class="well">
- <textarea id="message-post-text"></textarea>
+ <input id="message-post-text"></input>
<button disabled="disabled" id="message-post" class="btn btn-small"><i class="icon-play"></i> Post</button>
</div>
<div id="message-list">
diff --git a/erpnext/utilities/page/messages/messages.js b/erpnext/utilities/page/messages/messages.js
index 4cc7a52..ef56020 100644
--- a/erpnext/utilities/page/messages/messages.js
+++ b/erpnext/utilities/page/messages/messages.js
@@ -43,20 +43,24 @@
});
// enable, disable button
- $('#message-post-text').keyup(function() {
+ $('#message-post-text').keyup(function(e) {
if($(this).val()) {
$('#message-post').attr('disabled', false);
} else {
$('#message-post').attr('disabled', true);
}
+
+ if(e.which==13) {
+ $('#message-post').click();
+ }
})
}
-wn.pages.messages.onshow = function(wrapper) {
+$(wn.pages.messages).bind('show', function() {
erpnext.messages.show();
- setTimeout(erpnext.messages.refresh, 5000);
+ setTimeout(erpnext.messages.refresh, 7000);
$('#message-post-text').focus();
-}
+})
erpnext.messages = {
show: function() {
@@ -75,8 +79,8 @@
},
// check for updates every 5 seconds if page is active
refresh: function() {
- setTimeout(erpnext.messages.refresh, 10000);
- if(wn.container.page.label != 'messages') return;
+ setTimeout(erpnext.messages.refresh, 7000);
+ if(wn.container.page.label != 'Messages') return;
erpnext.messages.show();
},
get_contact: function() {
@@ -98,6 +102,8 @@
contact: null
},
render_row: function(wrapper, data) {
+ $(wrapper).removeClass('list-row');
+
data.creation = dateutil.comment_when(data.creation);
data.comment_by_fullname = wn.user_info(data.owner).fullname;