From 0b7055ee2687f6039b234971679928b883292713 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 30 Sep 2011 09:33:16 +0100 Subject: [PATCH] Added some basic templates --- app/groups/templates/groups/email/accepted.html | 7 +++++++ app/groups/templates/groups/email/accepted.txt | 3 +++ app/groups/templates/groups/email/rejected.html | 7 +++++++ app/groups/templates/groups/email/rejected.txt | 3 +++ app/groups/templates/groups/email/request.html | 8 ++++++++ app/groups/templates/groups/email/request.txt | 5 +++++ app/groups/urls.py | 2 +- 7 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/groups/templates/groups/email/accepted.html b/app/groups/templates/groups/email/accepted.html index e69de29..29e7ad7 100644 --- a/app/groups/templates/groups/email/accepted.html +++ b/app/groups/templates/groups/email/accepted.html @@ -0,0 +1,7 @@ +

Group Request Accepted

+

+Your request to join {{ request.group.name }} has been accepted. +

+

+Please check the forums for further information on what this group entitles you to. Your accesss will be updated within the next few minutes. +

diff --git a/app/groups/templates/groups/email/accepted.txt b/app/groups/templates/groups/email/accepted.txt index e69de29..9a70a22 100644 --- a/app/groups/templates/groups/email/accepted.txt +++ b/app/groups/templates/groups/email/accepted.txt @@ -0,0 +1,3 @@ +Your request to join {{ request.group.name }} has been accepted. + +Please check the forums for further information on what this group entitles you to. Your accesss will be updated within the next few minutes. diff --git a/app/groups/templates/groups/email/rejected.html b/app/groups/templates/groups/email/rejected.html index e69de29..c31d263 100644 --- a/app/groups/templates/groups/email/rejected.html +++ b/app/groups/templates/groups/email/rejected.html @@ -0,0 +1,7 @@ +

Group Request Rejected

+

+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. +

diff --git a/app/groups/templates/groups/email/rejected.txt b/app/groups/templates/groups/email/rejected.txt index e69de29..5ba5cc4 100644 --- a/app/groups/templates/groups/email/rejected.txt +++ b/app/groups/templates/groups/email/rejected.txt @@ -0,0 +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. diff --git a/app/groups/templates/groups/email/request.html b/app/groups/templates/groups/email/request.html index e69de29..213bc5b 100644 --- a/app/groups/templates/groups/email/request.html +++ b/app/groups/templates/groups/email/request.html @@ -0,0 +1,8 @@ +

Group Request

+

+{{ request.user.username }} has requested to be a member of the {{ request.group.name }} group. +

+

+To accept or reject this request, please use the group administration panel. +

+ diff --git a/app/groups/templates/groups/email/request.txt b/app/groups/templates/groups/email/request.txt index e69de29..25b37d0 100644 --- a/app/groups/templates/groups/email/request.txt +++ b/app/groups/templates/groups/email/request.txt @@ -0,0 +1,5 @@ +{{ request.user.username }} has requested to be a member of the {{ request.group.name }} group. + +To accept or reject this request, please use the group administration panel[1]. + +[1] {{% url groups.admin request.group.id %}} diff --git a/app/groups/urls.py b/app/groups/urls.py index da5b379..02bfb3f 100644 --- a/app/groups/urls.py +++ b/app/groups/urls.py @@ -8,7 +8,7 @@ urlpatterns = patterns('', (r'^kick/(?P\d+)/(?P\d+)/$', views.kick_member), (r'^promote/(?P\d+)/(?P\d+)/$', views.promote_member), - (r'^admin/(?P\d+)/$', views.admin_group), + url(r'^admin/(?P\d+)/$', views.admin_group, name='groups-admin'), (r'^accept/(?P\d+)/$', views.accept_request), (r'^reject/(?P\d+)/$', views.reject_request), )