Now showing the message contained in Requests on the correct pages.
authorLennard de Rijk <ljvderijk@gmail.com>
Mon, 26 Oct 2009 10:25:01 -0700
changeset 3062 4b5a7e5746a0
parent 3061 9b1d389be2ce
child 3063 0b69dd9a5252
Now showing the message contained in Requests on the correct pages. Note that facilities to edit your message, and to perhaps change the message when accepting a request still need to be provided. Fixes Issue 385.
app/soc/templates/soc/request/process_invite.html
app/soc/templates/soc/request/process_request.html
--- a/app/soc/templates/soc/request/process_invite.html	Mon Oct 26 10:15:28 2009 -0700
+++ b/app/soc/templates/soc/request/process_invite.html	Mon Oct 26 10:25:01 2009 -0700
@@ -15,12 +15,21 @@
 {% load forms_helpers %}
 
 {% block body %}
+<div="text">
+You have been invited to become a {{ role_name }} for {{ entity.group.name }}.<br/>
+
+{% if entity.message %}
 <p>
-<div="text"> 
-You have been invited to become a {{ role_name }} for {{ entity.group.name }}. 
-Please select your response.
+<i>Invitation Message:</i><br/>
+{{entity.message|linebreaks }}
+</p>
+{% endif %}
+
+<p>
+If you wish to accept this invitation please click the Accept button and fill out the required information.
+If you wish to reject this invitation please click the Reject button, this invitation will then disappear from your invitation list.
+</p>
 </div>
-</p>
 
 <tr>
   <td>
--- a/app/soc/templates/soc/request/process_request.html	Mon Oct 26 10:15:28 2009 -0700
+++ b/app/soc/templates/soc/request/process_request.html	Mon Oct 26 10:25:01 2009 -0700
@@ -20,6 +20,14 @@
 {% ifnotequal request_status "group_accepted" %}
   This is the request from <b>{{ entity.user.name }}({{ entity.user.link_id }})</b> 
   to become a <b>{{ role_verbose }}</b> for <b>{{entity.group.name }}</b>.</br>
+
+  {% if entity.message %}
+    <p>
+      <i>Request Message:</i>
+      {{ entity.message|linebreaks }}
+    </p>
+  {% endif %}
+
   Please select your response by using the buttons below.
 </div>
 </p>