From 8318942e7e2acf60bc3934b69f22e4f0149bb88d Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Fri, 30 Sep 2011 10:00:26 +0100
Subject: [PATCH] Updated the templates for various issues and formatting
 errors

---
 app/groups/templates/groups/email/rejected.html | 2 +-
 app/groups/templates/groups/email/rejected.txt  | 2 +-
 app/groups/templates/groups/email/request.html  | 4 +++-
 app/groups/templates/groups/email/request.txt   | 6 +++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/groups/templates/groups/email/rejected.html b/app/groups/templates/groups/email/rejected.html
index c31d263..4aa830e 100644
--- a/app/groups/templates/groups/email/rejected.html
+++ b/app/groups/templates/groups/email/rejected.html
@@ -3,5 +3,5 @@
 Your request to join <b>{{ request.group.name }}</b> has been <b>rejected</b>.
 </p>
 <p>
-Your request was rejected by {{ request.changed_by.get_profile.primarycharacter.name }}, if you have any questions regarding this please contact them.
+Your request was rejected by {{ request.changed_by.username }}, if you have any questions regarding this please contact them.
 </p>
diff --git a/app/groups/templates/groups/email/rejected.txt b/app/groups/templates/groups/email/rejected.txt
index 5ba5cc4..c065067 100644
--- a/app/groups/templates/groups/email/rejected.txt
+++ b/app/groups/templates/groups/email/rejected.txt
@@ -1,3 +1,3 @@
 Your request to join {{ request.group.name }} has been rejected.
 
-Your request was rejected by {{ request.changed_by.get_profile.primarycharacter.name }}, if you have any questions regarding this please contact them.
+Your request was rejected by {{ request.changed_by.username }}, if you have any questions regarding this please contact them.
diff --git a/app/groups/templates/groups/email/request.html b/app/groups/templates/groups/email/request.html
index 213bc5b..e18080c 100644
--- a/app/groups/templates/groups/email/request.html
+++ b/app/groups/templates/groups/email/request.html
@@ -3,6 +3,8 @@
 <b>{{ request.user.username }}</b> has requested to be a member of the <b>{{ request.group.name }}<b> group.
 </p>
 <p>
-To accept or reject this request, please use the <a href="{{% url groups.admin request.group.id %}}">group administration panel</a>.
+To accept or reject this request, please use the <a href="https://{{ domain }}{% url groups-admin request.group.id %}">group administration panel</a>.
 </p>
+<h3>Reason</h3>
+<p>{{ request.reason }}</p>
 
diff --git a/app/groups/templates/groups/email/request.txt b/app/groups/templates/groups/email/request.txt
index 25b37d0..ca1a344 100644
--- a/app/groups/templates/groups/email/request.txt
+++ b/app/groups/templates/groups/email/request.txt
@@ -2,4 +2,8 @@
 
 To accept or reject this request, please use the group administration panel[1].
 
-[1] {{% url groups.admin request.group.id %}}
+Reason:
+
+{{ request.reason }}
+
+[1] https://{{ domain }}{% url groups-admin request.group.id %}