diff --git a/kallithea/model/comment.py b/kallithea/model/comment.py
--- a/kallithea/model/comment.py
+++ b/kallithea/model/comment.py
@@ -88,6 +88,7 @@ class ChangesetCommentsModel(BaseModel):
'cs_comment_user': user.full_name_and_username,
'cs_target_repo': h.canonical_url('summary_home', repo_name=repo.repo_name),
'cs_comment_url': comment_url,
+ 'cs_url': h.canonical_url('changeset_home', repo_name=repo.repo_name, revision=revision),
'raw_id': revision,
'message': cs.message,
'message_short': h.shorter(cs.message, 50, firstline=True),
@@ -137,6 +138,7 @@ class ChangesetCommentsModel(BaseModel):
'status_change': status_change,
'closing_pr': closing_pr,
'pr_comment_url': comment_url,
+ 'pr_url': pull_request.url(canonical=True),
'pr_comment_user': user.full_name_and_username,
'pr_target_repo': h.canonical_url('summary_home',
repo_name=pull_request.other_repo.repo_name),
diff --git a/kallithea/model/user.py b/kallithea/model/user.py
--- a/kallithea/model/user.py
+++ b/kallithea/model/user.py
@@ -198,7 +198,9 @@ class UserModel(BaseModel):
edit_url = h.canonical_url('edit_user', id=new_user.user_id)
email_kwargs = {
'registered_user_url': edit_url,
- 'new_username': new_user.username}
+ 'new_username': new_user.username,
+ 'new_email': new_user.email,
+ 'new_full_name': new_user.full_name}
NotificationModel().create(created_by=new_user, subject=subject,
body=body, recipients=None,
type_=Notification.TYPE_REGISTRATION,
diff --git a/kallithea/templates/email_templates/button.html b/kallithea/templates/email_templates/button.html
new file mode 100644
--- /dev/null
+++ b/kallithea/templates/email_templates/button.html
@@ -0,0 +1,8 @@
+<%page args="url,title='',padding_top=True,padding_bottom=True" />\
+##
+
+
+ ${_(title)}
+
+
+##
diff --git a/kallithea/templates/email_templates/button.txt b/kallithea/templates/email_templates/button.txt
new file mode 100644
--- /dev/null
+++ b/kallithea/templates/email_templates/button.txt
@@ -0,0 +1,3 @@
+<%page args="url,title" />\
+
+${title|n,unicode}: ${url}
diff --git a/kallithea/templates/email_templates/changeset_comment.html b/kallithea/templates/email_templates/changeset_comment.html
--- a/kallithea/templates/email_templates/changeset_comment.html
+++ b/kallithea/templates/email_templates/changeset_comment.html
@@ -1,20 +1,19 @@
-## -*- coding: utf-8 -*-
-<%inherit file="main.html"/>
-
-%if is_mention:
-${_('Comment from %s on %s changeset %s mentioned you') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))}:
-%else:
-${_('Comment from %s on %s changeset %s') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))}:
-%endif
-${body}
-
-%if status_change:
- ${_('The changeset status was changed to')}: ${status_change}
-%endif
-
-${_('URL')}: ${cs_comment_url}
-
-${_('Changeset')}: ${h.short_id(raw_id)}
-${_('Description')}:
-${h.shorter(message, 256)}
-
+<%inherit file="main.html"/>\
+\
+<%block name="header">\
+<% title = _('Mention in Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) %>\
+<%include file="header.html" args="title=title,link=cs_comment_url"/>\
+\
+\
+<%include file="comment.html" args="text=body,author=cs_comment_user,status=status_change"/>\
+
+ ${_('Changeset on')}
+ ${cs_target_repo}
+ ${_('branch')}
+ ${branch}:
+
+ "${h.shorter(message, 60, firstline=True)}"
+ ${_('by')}
+ ${cs_author.full_name_and_username}.
+
+<%include file="button.html" args="url=cs_comment_url,title=_('View Comment'),padding_bottom=False"/>\
diff --git a/kallithea/templates/email_templates/changeset_comment.txt b/kallithea/templates/email_templates/changeset_comment.txt
--- a/kallithea/templates/email_templates/changeset_comment.txt
+++ b/kallithea/templates/email_templates/changeset_comment.txt
@@ -1,19 +1,16 @@
-## -*- coding: utf-8 -*-
-<%inherit file="main.txt"/>
+<%block name="header">\
+<% title = _('Mention in Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) if is_mention else _('Comment on Changeset "%s"') % h.shorter(message, 200, firstline=True) %>\
+<%include file="header.txt" args="title=title,link=cs_comment_url"/>\
+\
-%if is_mention:
-${_('Comment from %s on %s changeset %s mentioned you') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))|n,unicode}:
-%else:
-${_('Comment from %s on %s changeset %s') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))|n,unicode}:
-%endif
-${body|n,unicode}
+<%include file="comment.txt" args="text=body,author=cs_comment_user,status=status_change"/>\
-%if status_change:
-${_('The changeset status was changed to')|n,unicode}: ${status_change|n,unicode}
-%endif
+${_('Changeset on')|n,unicode} \
+${cs_target_repo|n,unicode} \
+${_('branch')|n,unicode} \
+${branch|n,unicode}:
+"${h.shorter(message, 60, firstline=True)|n,unicode}" \
+${_('by')|n,unicode} \
+${cs_author.full_name_and_username|n,unicode}.
-${_('URL')|n,unicode}: ${cs_comment_url|n,unicode}
-
-${_('Changeset')|n,unicode}: ${h.short_id(raw_id)|n,unicode}
-${_('Description')|n,unicode}:
-${h.shorter(message, 256)|n,unicode}
+<%include file="button.txt" args="url=cs_comment_url,title=_('View Comment')"/>\
diff --git a/kallithea/templates/email_templates/comment.html b/kallithea/templates/email_templates/comment.html
new file mode 100644
--- /dev/null
+++ b/kallithea/templates/email_templates/comment.html
@@ -0,0 +1,17 @@
+<%page args="author,text,status,close=False" />\
+\
+##
+
+ %if link is not None:
+ ${title}
+ %else:
+ ${title}
+ %endif
+
+##
diff --git a/kallithea/templates/email_templates/header.txt b/kallithea/templates/email_templates/header.txt
new file mode 100644
--- /dev/null
+++ b/kallithea/templates/email_templates/header.txt
@@ -0,0 +1,8 @@
+<%page args="title,link" />\
+%if link is not None:
+${link}
+
+%endif
+${title|n,unicode}
+
+## Trailing empty line
diff --git a/kallithea/templates/email_templates/main.html b/kallithea/templates/email_templates/main.html
--- a/kallithea/templates/email_templates/main.html
+++ b/kallithea/templates/email_templates/main.html
@@ -6,10 +6,8 @@
-${self.body()}
-
-
---
-${_("This is an automatic notification. Don't reply to this mail.")}
+ ##
+${self.body()}\
+ ##