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 %} +
+ Project: {{ object.project.name }}+Project #{{ object.slug }}: {{ object.name }}+Created by {{ changer.get_full_name() }}. + |
+
+ More info at: {{ final_url_name }} +
+{% 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 %} +
+ Project #{{ object.slug }}: {{ object.name }}+Deleted by {{ changer.get_full_name() }} + |
+
Updated fields by {{ changer }}:
-
+ Project #{{ object.slug }}: {{ object.name }}+Updated by {{ changer.get_full_name() }}. +Updated fields: + {% for field in changed_fields_dict.values() %} + {{ field.verbose_name }}{% if not loop.last %},{% endif %} + {% endfor %} + + + {# TODO: Improvemments in some methods to use that: #} + {# - WatchedMixin._get_changed_field_old_value() #} + {# - WatchedMixin._get_changed_field_new_value() #} + {# +
|
+
+ More info at: {{ final_url_name }} +
+{% 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}}: 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 }}