From ef29e554695ad0950e3b7d8a294e404abe577cc3 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 27 Feb 2012 18:41:11 +0530
Subject: [PATCH 1/2] message delete

---
 erpnext/utilities/page/calendar/calendar.css  |  9 +--------
 erpnext/utilities/page/calendar/calendar.html |  2 +-
 erpnext/utilities/page/messages/messages.js   | 20 ++++++++++++++++---
 erpnext/utilities/page/messages/messages.py   |  5 +++++
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/erpnext/utilities/page/calendar/calendar.css b/erpnext/utilities/page/calendar/calendar.css
index 2f3356f81e..9adae7a2bf 100644
--- a/erpnext/utilities/page/calendar/calendar.css
+++ b/erpnext/utilities/page/calendar/calendar.css
@@ -28,6 +28,7 @@ div.cal_head div {
 }
 
 div.cal_toolbar {
+	width: 80%;
 }
 
 div.cal_toolbar .btn {
@@ -155,14 +156,6 @@ div.cal_week_unit{
 	cursor:pointer;
 }
 
-div.cal_event {
-	overflow-x: hidden;
-	font-size: 11px;
-	color: #00B;
-	margin-bottom: 2px;
-	text-decoration: underline;
-}
-
 div.cal_event_Public {
 	color: GREEN;
 }
diff --git a/erpnext/utilities/page/calendar/calendar.html b/erpnext/utilities/page/calendar/calendar.html
index 2a5150eeb3..456566d589 100644
--- a/erpnext/utilities/page/calendar/calendar.html
+++ b/erpnext/utilities/page/calendar/calendar.html
@@ -1,5 +1,5 @@
 <div class="cal_body">
-	<a class="close" href="#" onclick="window.history.back();return false;">&times;</a>
+	<a class="close" onclick="window.history.back();">&times;</a>
 	<div class="cal_toolbar btn-group">
 		<button class="btn btn-small" onclick="erpnext.calendar.add_event()">
 			<i class="icon-plus"></i> Add Event
diff --git a/erpnext/utilities/page/messages/messages.js b/erpnext/utilities/page/messages/messages.js
index b59a21229d..22be895825 100644
--- a/erpnext/utilities/page/messages/messages.js
+++ b/erpnext/utilities/page/messages/messages.js
@@ -86,16 +86,30 @@ erpnext.messages = {
 				if(data.owner==user) {
 					data.cls = 'message-self';
 					data.comment_by_fullname = 'You';	
+					data.delete_html = repl('<a class="close" onclick="erpnext.messages.delete(this)"\
+						data-name="%(name)s">&times;</a>', data);
 				} else {
-					data.cls = 'message-other'
+					data.cls = 'message-other';
+					data.delete_html = '';
 				}
 
-				wrapper.innerHTML = repl('<div class="message %(cls)s"><b>%(comment)s</b>\
-					<div class="help">by %(comment_by_fullname)s, %(creation)s</div></div>\
+				wrapper.innerHTML = repl('<div class="message %(cls)s">%(delete_html)s\
+						<b>%(comment)s</b>\
+						<div class="help">by %(comment_by_fullname)s, %(creation)s</div></div>\
 					<div style="clear: both;"></div>', data);
 			}
 		});
 	},
+	delete: function(ele) {
+		$(ele).parent().css('opacity', 0.6);
+		wn.call({
+			method:'utilities.page.messages.messages.delete',
+			args: {name : $(ele).attr('data-name')},
+			callback: function() {
+				$(ele).parent().toggle(false);
+			}
+		});
+	},
 	show_active_users: function() {
 		wn.call({
 			module:'utilities',
diff --git a/erpnext/utilities/page/messages/messages.py b/erpnext/utilities/page/messages/messages.py
index 6ca2817f13..d7c60267ed 100644
--- a/erpnext/utilities/page/messages/messages.py
+++ b/erpnext/utilities/page/messages/messages.py
@@ -47,4 +47,9 @@ def post(arg=None):
 	d.comment_docname = arg['contact']
 	d.comment_doctype = 'Message'
 	d.save()
+	
+@webnotes.whitelist()
+def delete(arg=None):
+	webnotes.conn.sql("""delete from `tabComment Widget Record` where name=%s""", 
+		webnotes.form_dict['name']);
 	
\ No newline at end of file

From 1a5c9c59260f27b29b3d7e28be2e899846b39aee Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 27 Feb 2012 18:56:31 +0530
Subject: [PATCH 2/2] message reply

---
 erpnext/utilities/page/messages/messages.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/erpnext/utilities/page/messages/messages.js b/erpnext/utilities/page/messages/messages.js
index 22be895825..39f7974870 100644
--- a/erpnext/utilities/page/messages/messages.js
+++ b/erpnext/utilities/page/messages/messages.js
@@ -38,6 +38,7 @@ wn.pages.messages.onload = function(wrapper) {
 wn.pages.messages.onshow = function(wrapper) {
 	erpnext.messages.show();
 	setTimeout(erpnext.messages.refresh, 5000);
+	$('#message-post-text').focus();
 }
 
 erpnext.messages = {
@@ -83,19 +84,26 @@ erpnext.messages = {
 				data.creation = dateutil.comment_when(data.creation);
 				data.comment_by_fullname = wn.boot.user_fullnames[data.owner];
 
+				data.reply_html = '';
 				if(data.owner==user) {
 					data.cls = 'message-self';
 					data.comment_by_fullname = 'You';	
-					data.delete_html = repl('<a class="close" onclick="erpnext.messages.delete(this)"\
+					data.delete_html = repl('<a class="close" \
+						onclick="erpnext.messages.delete(this)"\
 						data-name="%(name)s">&times;</a>', data);
 				} else {
 					data.cls = 'message-other';
 					data.delete_html = '';
+					if(erpnext.messages.contact==user) {
+						data.reply_html = repl('<a href="#!messages/%(owner)s">\
+							<i class="icon-share-alt"></i> Reply</a>', data)
+					}
 				}
 
 				wrapper.innerHTML = repl('<div class="message %(cls)s">%(delete_html)s\
 						<b>%(comment)s</b>\
-						<div class="help">by %(comment_by_fullname)s, %(creation)s</div></div>\
+						<div class="help">by %(comment_by_fullname)s, %(creation)s</div>\
+						%(reply_html)s</div>\
 					<div style="clear: both;"></div>', data);
 			}
 		});