# HG changeset patch # User Lennard de Rijk # Date 1237226335 0 # Node ID 563d6e5440112e7696274c296a675fe7f710e010 # Parent a8a5da24212c43473f7b8addb84d118954d52374 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 diff -r a8a5da24212c -r 563d6e544011 app/soc/templates/soc/group/messages/accepted.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.
Please click here to fill in the necessary information and create your {{ group_type }}. {% endblock %} diff -r a8a5da24212c -r 563d6e544011 app/soc/templates/soc/notification/messages/base.html --- 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 %}
+

{% block greeting %} Hi {{ to_name }}, {% endblock %} +

+ +
+

{% block content %}{% endblock %} +

+

{% block signature %}Greetings,
{{ sender_name }}{% endblock %} +

\ No newline at end of file diff -r a8a5da24212c -r 563d6e544011 app/soc/templates/soc/notification/messages/invitation.html --- 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 }}.
Please click here to fill in the necessary information and accept the invitation. {% endblock %} diff -r a8a5da24212c -r 563d6e544011 app/soc/templates/soc/notification/public.html --- 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 }}: - {{ entity.message|safe|linebreaks }} + {{ entity.message|safe }}