From be919b3855592385878a1c6b62f4900aff2a4a85 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 26 Nov 2012 13:54:47 +0530
Subject: [PATCH] profile: added email signature to outgoing mail and profile
 settings

---
 home/page/latest_updates/latest_updates.js     | 4 ++++
 home/page/profile_settings/profile_settings.js | 2 ++
 home/page/profile_settings/profile_settings.py | 1 +
 public/js/toolbar.js                           | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 41e8ecd499..9ba2015ce5 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,4 +1,8 @@
 erpnext.updates = [
+	["26th November 2012", [
+		"Email: Added User Signature",
+		"Support Ticket: Added link to Lead / Contact. If incoming ticket is not from an existing Lead / Contact, create a new Lead",
+	]],
 	["24ht November 2012", [
 		"Support Ticket: Support Ticket Response is now Communication",
 	]],
diff --git a/home/page/profile_settings/profile_settings.js b/home/page/profile_settings/profile_settings.js
index 478af83ff6..795acb2e6b 100644
--- a/home/page/profile_settings/profile_settings.js
+++ b/home/page/profile_settings/profile_settings.js
@@ -70,6 +70,8 @@ MyProfile = function(wrapper) {
 			fields: [
 				{fieldname:'first_name', fieldtype:'Data',label:'First Name',reqd:1},
 				{fieldname:'last_name', fieldtype:'Data',label:'Last Name'},
+				{fieldname:'email_signature', fieldtype:'Text',label:'Email Signature',
+					decription:'Will be appended to outgoing mail'},
 				{fieldname:'bio', fieldtype:'Text',label:'Bio'},
 				{fieldname:'update', fieldtype:'Button',label:'Update'}
 			]
diff --git a/home/page/profile_settings/profile_settings.py b/home/page/profile_settings/profile_settings.py
index 8893ff6a62..0dbd10d891 100644
--- a/home/page/profile_settings/profile_settings.py
+++ b/home/page/profile_settings/profile_settings.py
@@ -63,6 +63,7 @@ def set_user_details(arg=None):
 	arg_dict = load_json(arg)
 	if not 'bio' in arg_dict: arg_dict['bio'] = None
 	if not 'last_name' in arg_dict: arg_dict['last_name'] = None
+	if not 'email_signature' in arg_dict: arg_dict['email_signature'] = None
 	p.fields.update(arg_dict)
 	p.save()
 	webnotes.msgprint('Updated')
diff --git a/public/js/toolbar.js b/public/js/toolbar.js
index 17f79dc589..1357eff950 100644
--- a/public/js/toolbar.js
+++ b/public/js/toolbar.js
@@ -22,7 +22,7 @@ erpnext.toolbar.setup = function() {
 	erpnext.toolbar.add_modules();
 	
 	// profile
-	$('#toolbar-user').append('<li><a href="#!profile-settings">Profile Settings</a></li>');
+	$('#toolbar-user').append('<li><a href="#!profile-settings">My Settings...</a></li>');
 
 	$('.navbar .pull-right').append('\
 		<li><a href="#!messages" title="Unread Messages"><span class="navbar-new-comments"></span></a></li>');