taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing invitation tests

remotes/origin/enhancement/email-actions
Alejandro Alonso 2014-10-29 11:11:05 +01:00
parent 9a885eae6a
commit d36e7e7eaa
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taiga/projects/templates/emails/membership_invitation-body-html.jinja
View File

@ -7,18 +7,18 @@
<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body"> <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
<tr> <tr>
<td> <td>
<p>Hi,</p> <p>The Taiga.io Deputy System Admin is commanded by His Highness The Chief Lord Oompa Loompa to extend a membership invitation to {{ membership.email}} and delights in the pleasure of welcoming you to join {{ membership.invited_by.full_name }} and others in the team as a new and right honorable member in good standing of the project titled: '{{ membership.project }}'.</p>
<p>you have been invited to the project '{{ membership.project }}'.</p> <p>You may indicate your humble desire to accept this invitation by gently clicking here: {{ final_url }}</p>
<p>If you want to join to this project go to <a href="{{ final_url }}">this link</a>
for accept this invitation.</p>
{% if membership.invitation_extra_text %} {% if membership.invitation_extra_text %}
<p> <p>
Some words from your Taiga Ambassador:<br/> And now some words from the jolly good fellow or sistren who thought so kindly as to invite you:<br/>
{{ membership.invitation_extra_text }} {{ membership.invitation_extra_text }}
</p> </p>
{% endif %} {% endif %}
<p>Dress: Morning Suit, Uniform, Lounge Suit, Birthday Suit or hoodie.</p>
</td> </td>
</tr> </tr>
</table> </table>
@ -26,6 +26,6 @@
{% block footer %} {% block footer %}
<p style="padding: 10px; border-top: 1px solid #eee;"> <p style="padding: 10px; border-top: 1px solid #eee;">
More info at: <a href="{{ final_url }}" style="color: #666;">{{ final_url_name }}</a> Further details: <a href="{{ final_url }}" style="color: #666;">{{ final_url_name }}</a>
</p> </p>
{% endblock %} {% endblock %}

12
taiga/projects/templates/emails/membership_invitation-body-text.jinja
View File

@ -1,18 +1,18 @@
{% set final_url = resolve_front_url("invitation", membership.token) %} {% set final_url = resolve_front_url("invitation", membership.token) %}
{% set final_url_name = "Taiga - Invitation to join on {0} project.".format(membership.project) %} {% set final_url_name = "Taiga - Invitation to join on {0} project.".format(membership.project) %}
Hi, The Taiga.io Deputy System Admin is commanded by His Highness The Chief Lord Oompa Loompa to extend a membership invitation to {{ membership.email}} and delights in the pleasure of welcoming you to join {{ membership.invited_by.full_name }} and others in the team as a new and right honorable member in good standing of the project titled: '{{ membership.project }}'.
you have been invited to the project '{{ membership.project }}'. You may indicate your humble desire to accept this invitation by gently clicking here: {{ final_url }}
If you want to join to this project go to {{ final_url }} for accept this invitation.
{% if membership.invitation_extra_text %} {% if membership.invitation_extra_text %}
Some words from your Taiga Ambassador: And now some words from the jolly good fellow or sistren who thought so kindly as to invite you:
{{ membership.invitation_extra_text }} {{ membership.invitation_extra_text }}
{% endif %} {% endif %}
** More info at ({{ final_url }}) ** Dress: Morning Suit, Uniform, Lounge Suit, Birthday Suit or hoodie.
Further details: ({{ final_url }})