# HG changeset patch
# User Lennard de Rijk
# Date 1256513323 25200
# Node ID b89af35c74d33a28bc0206221b295d89d0f62877
# Parent cdc652533fcce365bc0aa879fd577fd7cd6a22d4
Redone the request templates to work with the new ID-based request.
Changes here also include upcoming View changes.
diff -r cdc652533fcc -r b89af35c74d3 app/soc/templates/soc/request/list/row.html
--- a/app/soc/templates/soc/request/list/row.html Sun Oct 25 16:27:49 2009 -0700
+++ b/app/soc/templates/soc/request/list/row.html Sun Oct 25 16:28:43 2009 -0700
@@ -3,11 +3,11 @@
diff -r cdc652533fcc -r b89af35c74d3 app/soc/templates/soc/request/process_invite.html
--- a/app/soc/templates/soc/request/process_invite.html Sun Oct 25 16:27:49 2009 -0700
+++ b/app/soc/templates/soc/request/process_invite.html Sun Oct 25 16:28:43 2009 -0700
@@ -17,7 +17,7 @@
{% block body %}
-You have been invited to become a {{ entity.role_verbose }} for {{entity.scope.name }}.
+You have been invited to become a {{ role_name }} for {{ entity.group.name }}.
Please select your response.
@@ -25,7 +25,7 @@
-
+
diff -r cdc652533fcc -r b89af35c74d3 app/soc/templates/soc/request/process_request.html
--- a/app/soc/templates/soc/request/process_request.html Sun Oct 25 16:27:49 2009 -0700
+++ b/app/soc/templates/soc/request/process_request.html Sun Oct 25 16:28:43 2009 -0700
@@ -17,9 +17,9 @@
{% block body %}
-{% ifequal request_status "new" %}
- This is the request from {{ user_in_request.name }}({{ entity.link_id }})
- to become a {{ entity.role_verbose }} for {{entity.scope.name }}.
+{% ifnotequal request_status "group_accepted" %}
+ This is the request from {{ entity.user.name }}({{ entity.user.link_id }})
+ to become a {{ role_verbose }} for {{entity.group.name }}.
Please select your response by using the buttons below.
@@ -27,17 +27,17 @@
-
-
-
+
+
+
{% else %}
- This is the invitation to {{ user_in_request.name }}({{ entity.link_id }}) to become a
- {{ entity.role_verbose }} for {{entity.scope.name }}.
+ This is the invitation to {{ entity.user.name }}({{ entity.user.link_id }}) to become a
+ {{ role_verbose }} for {{entity.group.name }}.
If you would like to withdraw this invite please press the withdraw button below.
@@ -45,10 +45,10 @@
-
+
-{% endifequal %}
+{% endifnotequal %}
{% endblock body %}