From e90ef3357b4fe1667247f8c961b2fb03f3e9619e Mon Sep 17 00:00:00 2001
From: Mike Dingjan <m.dingjan@lukkien.com>
Date: Wed, 2 Mar 2016 10:36:14 +0100
Subject: [PATCH] added base text template and some minor tweaks / cleanup

---
 .../wagtailadmin/notifications/approved.html          |  6 ++----
 .../templates/wagtailadmin/notifications/approved.txt |  5 +++--
 .../templates/wagtailadmin/notifications/base.html    |  9 ++++-----
 .../templates/wagtailadmin/notifications/base.txt     | 11 +++++++++++
 .../wagtailadmin/notifications/rejected.html          |  8 ++------
 .../templates/wagtailadmin/notifications/rejected.txt |  7 +++----
 .../wagtailadmin/notifications/submitted.html         |  8 +++++---
 .../wagtailadmin/notifications/submitted.txt          |  6 +++---
 8 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.txt

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html
index 0a4a70472..682034bfa 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.html
@@ -1,9 +1,7 @@
 {% extends 'wagtailadmin/notifications/base.html' %}
-
 {% load i18n %}
 
 {% block content %}
-    {% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %}
-
-    {% trans "You can view the page here:" %} <a href="{{ revision.page.full_url }}">{{ revision.page.full_url }}</a>
+    <p>{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %}</p>
+    <p>{% trans "You can view the page here:" %} <a href="{{ revision.page.full_url }}">{{ revision.page.full_url }}</a></p>
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.txt b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.txt
index 4840fef35..762907188 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.txt
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/approved.txt
@@ -1,7 +1,8 @@
+{% extends 'wagtailadmin/notifications/base.txt' %}
 {% load i18n %}
 
+{% block content %}
 {% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been approved.{% endblocktrans %}
 
 {% trans "You can view the page here:" %} {{ revision.page.full_url }}
-
-{% trans "Edit your notification preferences here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_account_notification_preferences' %}
+{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.html
index ead673de1..9234257bb 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.html
@@ -107,6 +107,10 @@ body[yahoo] .text {
                 <div style="font-size:18px; line-height:24px; color: #43B1B0; font-weight:bold; display:inline-block; width: 100%; margin-bottom:10px;">{% block title_content %}{% endblock %}</div>
                 {% endblock %}
 
+                {% block greeting %}
+                <p>{% blocktrans with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %}</p>
+                {% endblock %}
+
                 {% block content %}
                 {% endblock %}
 
@@ -124,10 +128,5 @@ body[yahoo] .text {
       </table></td>
   </tr>
 </table>
-<br /><br />
 </body>
 </html>
-
-
-
-
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.txt b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.txt
new file mode 100644
index 000000000..3dbdb70bc
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/base.txt
@@ -0,0 +1,11 @@
+{% load i18n %}
+
+{% block greeting %}
+{% blocktrans with username=user.get_short_name|default:user.get_username %}Hello {{ username }},{% endblocktrans %}
+{% endblock %}
+
+{% block content %}
+{% endblock %}
+
+
+{% trans "Edit your notification preferences here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_account_notification_preferences' %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html
index e853c7a8f..532245faa 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html
@@ -1,11 +1,7 @@
 {% extends 'wagtailadmin/notifications/base.html' %}
-
 {% load i18n %}
 
 {% block content %}
-    {% trans "Hello" %} {{ user.get_short_name|default:user.get_username }},
-
-    {% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}
-
-    {% trans "You can edit the page here:"%} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}">{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}</a>
+    <p>{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}</p>
+    <p>{% trans "You can edit the page here:"%} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}">{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}</a></p>
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.txt b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.txt
index 4d571be89..130e0cf44 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.txt
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.txt
@@ -1,9 +1,8 @@
+{% extends 'wagtailadmin/notifications/base.txt' %}
 {% load i18n %}
 
-{% trans "Hello" %} {{ user.get_short_name|default:user.get_username }},
-
+{% block content %}
 {% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}
 
 {% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}
-
-{% trans "Edit your notification preferences here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_account_notification_preferences' %}
+{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html
index a32941875..de5d7f0e2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html
@@ -3,8 +3,10 @@
 {% load i18n %}
 
 {% block content %}
-    {% blocktrans with page=revision.page|safe editor=revision.user.get_full_name|default:revision.user.get_username %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %}
+    <p>{% blocktrans with page=revision.page|safe editor=revision.user.get_full_name|default:revision.user.get_username %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %}</p>
 
-    {% trans "You can preview the page here:" %} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}">{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}</a>
-    {% trans "You can edit the page here:" %} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}">{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}</a>
+    <p>
+        {% trans "You can preview the page here:" %} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}">{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}</a><br/>
+        {% trans "You can edit the page here:" %} <a href="{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}">{{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}</a>
+    </p>
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.txt b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.txt
index c84478390..1dbebcfb9 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.txt
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.txt
@@ -1,9 +1,9 @@
+{% extends 'wagtailadmin/notifications/base.txt' %}
 {% load i18n %}
 
-
+{% block content %}
 {% blocktrans with page=revision.page|safe editor=revision.user.get_full_name|default:revision.user.get_username %}The page "{{ page }}" has been submitted for moderation by {{ editor }}.{% endblocktrans %}
 
 {% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}
 {% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}
-
-{% trans "Edit your notification preferences here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_account_notification_preferences' %}
+{% endblock %}