X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=templates%2Finfluences%2Femail%2Finfluence_changed.html;h=29403015ed37152452f1fb9df548bf495520607f;hb=53c4ceab45f1e53527f78ba01e174be076594272;hp=6431ff0f8e15bbc739d8fde66c8c59e3f9ce7ef5;hpb=20fb5061c0d608e17c474a26bc8e19478c92132d;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/templates/influences/email/influence_changed.html b/templates/influences/email/influence_changed.html
index 6431ff0..2940301 100644
--- a/templates/influences/email/influence_changed.html
+++ b/templates/influences/email/influence_changed.html
@@ -1,19 +1,43 @@
-{% load i18n%}{% autoescape off %}From: Inschrijfsysteem <inschrijf@evolution-events.nl>
-Subject: {% if created %}{% blocktrans %}Influence "{{ influence }}" submitted.{% endblocktrans %}{% else %}{% blocktrans %}Influence "{{ influence }}" was changed.{% endblocktrans %}{% endif%}
-
-{% if recipients.0.first_name %}{% blocktrans with recipients.0.first_name as name %}Hello {{ name }}{% endblocktrans %}{% else %}{% trans "L.S." %}{% endif %},
+{% load gapless %}{% gapless %}
+{% load i18n %}
+{% autoescape off %}
+From: Xerxes (Evolution Events)<xerxes@evolution-events.nl>
+X-Mailer: Xerxes
+{% if created %}
+Subject: {% blocktrans %}Influence "{{ influence }}" submitted.{% endblocktrans %}
+{% else %}
+Subject: {% blocktrans %}Influence "{{ influence }}" was changed.{% endblocktrans %}
+{% endif%}
+\\
+{% if recipients.0.first_name %}
+{% blocktrans with recipients.0.first_name as name %}Hello {{ name }}{% endblocktrans %},
+{% else %}
+{% trans "L.S." %},
+{% endif %}
+\\
 {% filter wordwrap:72 %}
-{% blocktrans with influence.created as creation_date %}You have submitted an influence on {{ creation_date }}.{% endblocktrans %}
-{% if not created %}{% blocktrans %}The influence has been modified. The current status is{%endblocktrans %}:{% else %}{% blocktrans %}You submitted{% endblocktrans%}:{% endif %}
+{% blocktrans with influence.created|date:"j F Y" as creation_date %}
+You have submitted an influence on {{ creation_date }}.
+{% endblocktrans %}
+{% if not created %}
+{% blocktrans %}The influence has been modified. The current status is{%endblocktrans %}:{% else %}{% blocktrans %}You submitted{% endblocktrans%}:
+{% endif %}
 {% endfilter %}
+\\
 {% filter ljust:20%}{% trans "Character" %}:{%endfilter%}{{ influence.character }}
 {% filter ljust:20%}{% trans "Contact" %}:{%endfilter%}{{ influence.contact }}
 {% filter ljust:20%}{% trans "Summary" %}:{%endfilter%}{{ influence.summary }}
 {% filter ljust:20%}{% trans "Status" %}:{%endfilter%}{{ influence.get_status_display }}
 {% filter ljust:20%}{% trans "Long term" %}:{%endfilter%}{{ influence.longterm|yesno|capfirst }}
 {% trans "Description" %}:
-{% filter wordwrap:72 %}{{ influence.description }}{% endfilter %}
+{% filter wordwrap:72 %}
+{{ influence.description }}
+{% endfilter %}
 {% if influence.result %}
 {% trans "Result" %}:
-{% filter wordwrap:72 %}{{ influence.result }}{% endfilter %}
-{% endif %}{% endautoescape %}
+{% filter wordwrap:72 %}
+{{ influence.result }}
+{% endfilter %}
+{% endif %}
+{% endautoescape %}
+{% endgapless %}