Make the notifications look less bloated by not adhering to the linebreaks in the template but only to the HTML in them.
authorLennard de Rijk <ljvderijk@gmail.com>
Mon, 16 Mar 2009 17:58:55 +0000
changeset 1891 563d6e544011
parent 1890 a8a5da24212c
child 1892 51cdacd67ef1
Make the notifications look less bloated by not adhering to the linebreaks in the template but only to the HTML in them. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed
app/soc/templates/soc/group/messages/accepted.html
app/soc/templates/soc/notification/messages/base.html
app/soc/templates/soc/notification/messages/invitation.html
app/soc/templates/soc/notification/public.html
--- a/app/soc/templates/soc/group/messages/accepted.html	Mon Mar 16 16:27:21 2009 +0000
+++ b/app/soc/templates/soc/group/messages/accepted.html	Mon Mar 16 17:58:55 2009 +0000
@@ -14,6 +14,6 @@
 {% endcomment %}
 
 {% block content %}
-Your {{ application_type }} for "{{ group_name }}" has been accepted.
+Your {{ application_type }} for "{{ group_name }}" has been accepted.<br />
 Please click <a href="{{ url }}">here</a> to fill in the necessary information and create your {{ group_type }}.
 {% endblock %}
--- a/app/soc/templates/soc/notification/messages/base.html	Mon Mar 16 16:27:21 2009 +0000
+++ b/app/soc/templates/soc/notification/messages/base.html	Mon Mar 16 17:58:55 2009 +0000
@@ -13,15 +13,23 @@
 {% endcomment %}
 
 <div id="greeting">
+  <p>
 	{% block greeting %}
 	Hi {{ to_name }},
 	{% endblock %}
+  </p>
 </div>
 
+
+
 <div id="content">
+  <p>
 	{% block content %}{% endblock %}
+  </p>
 </div>
 
 <div id="signature">
+  <p>
 	{% block signature %}Greetings, <br />{{ sender_name }}{% endblock %}
+  </p>
 </div>
\ No newline at end of file
--- a/app/soc/templates/soc/notification/messages/invitation.html	Mon Mar 16 16:27:21 2009 +0000
+++ b/app/soc/templates/soc/notification/messages/invitation.html	Mon Mar 16 17:58:55 2009 +0000
@@ -13,6 +13,6 @@
 limitations under the License.
 {% endcomment %}
 {% block content %}
-You have been invited by {{ sender_name }} to become a {{ role_verbose }} for {{ group }}.
+You have been invited by {{ sender_name }} to become a {{ role_verbose }} for {{ group }}.<br />
 Please click <a href="{{ invitation_url }}">here</a> to fill in the necessary information and accept the invitation.
 {% endblock %}
--- a/app/soc/templates/soc/notification/public.html	Mon Mar 16 16:27:21 2009 +0000
+++ b/app/soc/templates/soc/notification/public.html	Mon Mar 16 17:58:55 2009 +0000
@@ -40,7 +40,7 @@
 	{{ entity.fields.message.label }}:
  </td>
  <td class="formfieldvalue">
-	{{ entity.message|safe|linebreaks }}
+	{{ entity.message|safe }}
  </td>
 
 <tr>