From d3676316f3c74bf00f5cef49c412ab136a1bfd63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 29 Oct 2013 17:18:54 +0100
Subject: [PATCH] Fixed Project emails

---
 ...reate_project_notification-body-html.jinja | 19 +++++++-
 ...reate_project_notification-body-text.jinja |  7 ++-
 .../create_project_notification-subject.jinja |  2 +-
 ...stroy_project_notification-body-html.jinja | 12 ++++-
 ...stroy_project_notification-body-text.jinja |  4 +-
 ...destroy_project_notification-subject.jinja |  2 +-
 ...pdate_project_notification-body-html.jinja | 45 ++++++++++++++++---
 ...pdate_project_notification-body-text.jinja | 19 ++++++--
 .../update_project_notification-subject.jinja |  2 +-
 9 files changed, 93 insertions(+), 19 deletions(-)

diff --git a/greenmine/projects/templates/emails/create_project_notification-body-html.jinja b/greenmine/projects/templates/emails/create_project_notification-body-html.jinja
index 0eda2fcb..e76422b6 100644
--- a/greenmine/projects/templates/emails/create_project_notification-body-html.jinja
+++ b/greenmine/projects/templates/emails/create_project_notification-body-html.jinja
@@ -1,2 +1,19 @@
-# TODO: {{ changer }} {{ object }}
+{% set final_url = resolve_front_url("project-admin", object.id) %}
+{% set final_url_name = "Greenmine - View Project #{0}".format(object.slug) %}
 
+{% block body %}
+<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
+    <tr>
+        <td>
+            <h1>Project: {{ object.project.name }}</h1>
+            <h2>Project #{{ object.slug }}: {{ object.name }}</h2>
+            <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
+        </td>
+    </tr>
+</table>
+{% endblock %}
+{% block footer %}
+<p style="padding: 10px; border-top: 1px solid #eee;">
+    More info at: <a href="{{ final_url }}" style="color: #666;">{{ final_url_name }}</a>
+</p>
+{% endblock %}
diff --git a/greenmine/projects/templates/emails/create_project_notification-body-text.jinja b/greenmine/projects/templates/emails/create_project_notification-body-text.jinja
index 0eda2fcb..47ec4ac1 100644
--- a/greenmine/projects/templates/emails/create_project_notification-body-text.jinja
+++ b/greenmine/projects/templates/emails/create_project_notification-body-text.jinja
@@ -1,2 +1,7 @@
-# TODO: {{ changer }} {{ object }}
+{% set final_url = resolve_front_url("project-admin", object.id) %}
+{% set final_url_name = "Greenmine - View Project #{0}".format(object.slug) %}
 
+- Project #{{ object.slug }}: {{ object.name }}
+- Created by {{ changer.get_full_name() }}
+
+** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/greenmine/projects/templates/emails/create_project_notification-subject.jinja b/greenmine/projects/templates/emails/create_project_notification-subject.jinja
index 7feee926..bf0726c2 100644
--- a/greenmine/projects/templates/emails/create_project_notification-subject.jinja
+++ b/greenmine/projects/templates/emails/create_project_notification-subject.jinja
@@ -1 +1 @@
-Create the new project "{{ object }}"
+[{{ object.name }}] Created the project #{{ object.slug }}
diff --git a/greenmine/projects/templates/emails/destroy_project_notification-body-html.jinja b/greenmine/projects/templates/emails/destroy_project_notification-body-html.jinja
index 0eda2fcb..09448adc 100644
--- a/greenmine/projects/templates/emails/destroy_project_notification-body-html.jinja
+++ b/greenmine/projects/templates/emails/destroy_project_notification-body-html.jinja
@@ -1,2 +1,12 @@
-# TODO: {{ changer }} {{ object }}
+{% extends "emails/base.jinja" %}
 
+{% block body %}
+<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
+    <tr>
+        <td>
+            <h2>Project #{{ object.slug }}: {{ object.name }}</h2>
+            <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
+        </td>
+    </tr>
+</table>
+{% endblock %}
diff --git a/greenmine/projects/templates/emails/destroy_project_notification-body-text.jinja b/greenmine/projects/templates/emails/destroy_project_notification-body-text.jinja
index 0eda2fcb..75d8013b 100644
--- a/greenmine/projects/templates/emails/destroy_project_notification-body-text.jinja
+++ b/greenmine/projects/templates/emails/destroy_project_notification-body-text.jinja
@@ -1,2 +1,2 @@
-# TODO: {{ changer }} {{ object }}
-
+- Project #{{ object.slug }}: {{ object.name }}
+- Deleted by {{ changer.get_full_name() }}
diff --git a/greenmine/projects/templates/emails/destroy_project_notification-subject.jinja b/greenmine/projects/templates/emails/destroy_project_notification-subject.jinja
index dab1e425..afbcef2e 100644
--- a/greenmine/projects/templates/emails/destroy_project_notification-subject.jinja
+++ b/greenmine/projects/templates/emails/destroy_project_notification-subject.jinja
@@ -1 +1 @@
-Deleted the project "{{ object }}"
+[{{ object.name }}] Deleted the project #{{ object.slug }}
diff --git a/greenmine/projects/templates/emails/update_project_notification-body-html.jinja b/greenmine/projects/templates/emails/update_project_notification-body-html.jinja
index e5708f8b..615ec30a 100644
--- a/greenmine/projects/templates/emails/update_project_notification-body-html.jinja
+++ b/greenmine/projects/templates/emails/update_project_notification-body-html.jinja
@@ -1,8 +1,39 @@
-<p>Updated fields by {{ changer }}:</p>
-<ul>
-{% for field in changed_fields_dict.values() %}
-    <li><b>{{ field.verbose_name}}</b>: from "{{ field.old_value}}" to "{{ field.new_value}}".</li>
-{% endfor %}
-</ul>
-{# TODO Print the "object" details #}
+{% extends "emails/base.jinja" %}
 
+{% set final_url = resolve_front_url("project-admin", object.id) %}
+{% set final_url_name = "Greenmine - View Project #{0}".format(object.slug) %}
+
+{% block body %}
+<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
+    <tr>
+        <td>
+            <h2>Project #{{ object.slug }}: {{ object.name }}</h2>
+            <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
+            <p>Updated fields:
+            {% for field in changed_fields_dict.values() %}
+                <b>{{ field.verbose_name }}</b>{% if not loop.last %},{% endif %}
+            {% endfor %}
+            </p>
+
+        {# TODO: Improvemments in some methods to use that:  #}
+        {#         - WatchedMixin._get_changed_field_old_value() #}
+        {#         - WatchedMixin._get_changed_field_new_value() #}
+        {#
+            <ul>
+            {% for field in changed_fields_dict.values() %}
+                <li>
+                    <b>{{ field.verbose_name}}</b>: from <i>{{ field.old_value}}</i>
+                                                      to <i>{{ field.new_value}}</i>.
+                </li>
+            {% endfor %}
+            </ul>
+        #}
+        </td>
+    </tr>
+</table>
+{% endblock %}
+{% block footer %}
+<p style="padding: 10px; border-top: 1px solid #eee;">
+    More info at: <a href="{{ final_url }}" style="color: #666;">{{ final_url_name }}</a>
+</p>
+{% endblock %}
diff --git a/greenmine/projects/templates/emails/update_project_notification-body-text.jinja b/greenmine/projects/templates/emails/update_project_notification-body-text.jinja
index 9ac8d7b2..89fa5539 100644
--- a/greenmine/projects/templates/emails/update_project_notification-body-text.jinja
+++ b/greenmine/projects/templates/emails/update_project_notification-body-text.jinja
@@ -1,9 +1,20 @@
-Updated fields by {{ changer }}:
+{% set final_url = resolve_front_url("project-admin", object.id) %}
+{% set final_url_name = "Greenmine - View Project #{0}".format(object.slug) %}
 
+- Project #{{ object.slug }}: {{ object.name }}
+- Updated by {{ changer.get_full_name() }}
+- Updated fields:
 {% for field in changed_fields_dict.values() %}
-    ** {{ field.verbose_name}}: from "{{ field.old_value}}" to "{{ field.new_value}}".
+    {{ field.verbose_name }}{% if not loop.last %}, {% endif %}
 {% endfor %}
 
-{# TODO Print the "object" details #}
-
+{# TODO: Improvemments in some methods to use that:  #}
+{#         - WatchedMixin._get_changed_field_old_value() #}
+{#         - WatchedMixin._get_changed_field_new_value() #}
+{#
+{% for field in changed_fields_dict.values() %}
+    * {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
+{% endfor %}
+#}
 
+** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/greenmine/projects/templates/emails/update_project_notification-subject.jinja b/greenmine/projects/templates/emails/update_project_notification-subject.jinja
index 46a629e2..1e16e55a 100644
--- a/greenmine/projects/templates/emails/update_project_notification-subject.jinja
+++ b/greenmine/projects/templates/emails/update_project_notification-subject.jinja
@@ -1 +1 @@
-Updated the project "{{ object }}"
+[{{ object.name }}] Updated the project #{{ object.slug }}