# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1256577901 25200
# Node ID 4b5a7e5746a0245d4a772b06ff1448f229534a1f
# Parent  9b1d389be2cef319e05e65308a9b58a4629eebac
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.

diff -r 9b1d389be2ce -r 4b5a7e5746a0 app/soc/templates/soc/request/process_invite.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>
diff -r 9b1d389be2ce -r 4b5a7e5746a0 app/soc/templates/soc/request/process_request.html
--- 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>