Changeset d768e47 for asadb/template/groups/diffs

Timestamp:

May 31, 2012, 2:29:50 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

df88ee9

Parents:

d0f076f

git-author:

Alex Dehnert <adehnert@…> (05/31/12 02:29:50)

git-committer:

Alex Dehnert <adehnert@…> (05/31/12 02:29:50)

Message:

Remove blank initial line from DB emails

It turns out that putting a newline between {% autoescape off %}
and the first line of email text results in an email consisting of a
blank line followed by the actual text. This removes that newline
in a bunch of the template emails. Fixes ASA Trac #116.

Location:

asadb/template/groups/diffs

Files:

• asa-official-update.txt (modified) (1 diff)
• asa-update-mail.txt (modified) (1 diff)
• new-group-accounts.txt (modified) (1 diff)
• new-group-announce.txt (modified) (1 diff)
• sao-update-mail.txt (modified) (1 diff)

asadb/template/groups/diffs/asa-official-update.txt

@@ -1 @@
-{% autoescape off %}
-We tried to add the following {{add|length}} addresses to {{listname}}, and remove the following {{delete|length}} addresses.{%if errors%} Some errors occurred.{%endif%}
+{% autoescape off %}We tried to add the following {{add|length}} addresses to {{listname}}, and remove the following {{delete|length}} addresses.{%if errors%} Some errors occurred.{%endif%}
 
 Errors:

asadb/template/groups/diffs/asa-update-mail.txt

@@ -1 @@
-{% autoescape off %}
-Hi ASA Exec,
+{% autoescape off %}Hi ASA Exec,
    The following {{num_groups}} groups have updated their information recently. In addition, {{care_about}} signatory updates (of types you care about) have occurred.
 

asadb/template/groups/diffs/new-group-accounts.txt

@@ -1 @@
-{% autoescape off %}
-Dear Athena Accounts,
+{% autoescape off %}Dear Athena Accounts,
 
 A new student activity has been formed.

asadb/template/groups/diffs/new-group-announce.txt

@@ -1 @@
-{% autoescape off %}
-On behalf of the Association of Student Activities (ASA) we welcome:
+{% autoescape off %}On behalf of the Association of Student Activities (ASA) we welcome:
 
    {{group.name}}

asadb/template/groups/diffs/sao-update-mail.txt

@@ -1 @@
-{% autoescape off %}
-Hi SAO,
+{% autoescape off %}Hi SAO,
    The following {{care_about}} signatory updates (of types you care about) have occurred. In addition, since we're sending mail anyway, the following {{num_groups}} groups have updated their information recently.