blog: Update announcement email to new template

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/blog/messages/announcement.html b/src/templates/blog/messages/announcement.html
index 5e039be10b36a61664a48ee135e0ff517358bd20..62971aa09c5d9d81422ad8d73475de7a0256b11e 100644 (file)
--- a/src/templates/blog/messages/announcement.html
+++ b/src/templates/blog/messages/announcement.html
@@ -1,33 +1,30 @@
 {% extends "../../messages/base-promo.html" %}
 
-{% block content %}
-    <p>
-        {{ _("there is a new post from %s on the IPFire Blog:") % post.author }}
-    </p>
+{% block title %}{{ post.title }}{% end block %}
+
+{# Preview text shown in the inbox preview... #}
+{% block preview %}{{ post.excerpt }}{% end block %}
 
-    <p>
-        <strong>{{ post.title }}</strong>
-    </p>
+{% block content %}
+       <tr class="section">
+               <td>
+                       <h1>
+                               {{ post.title }}
+                       </h1>
 
-    {% if post.excerpt %}
-        <blockquote>{{ post.excerpt }}</blockquote>
-    {% end %}
+                       <p>
+                               {{ post.excerpt }}
+                       </p>
 
-       <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-               <tbody>
-                       <tr>
-                               <td align="left">
-                                       <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                                               <tbody>
-                                                       <tr>
-                                                               <td>
-                                    <a href="https://www.ipfire.org/blog/{{ post.slug }}" target="_blank">{{ _("Click Here To Read More") }}</a>
-                                </td>
-                                                       </tr>
-                                               </tbody>
-                                       </table>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
+                       <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0">
+                               <tr class="button">
+                                       <td>
+                                                <a class="primary" href="https://www.ipfire.org/blog/{{ post.slug }}">
+                                                       {{ _("Read The Full Post On Our Blog") }}
+                                                </a>
+                                       </td>
+                               </tr>
+                       </table>
+               </td>
+       </tr>
 {% end block %}

diff --git a/src/templates/messages/main.sass b/src/templates/messages/main.sass
index 3116f79141579c2f446ea2ec375d556fc30b9b4b..bc0830ed73a6d87f0fba83e818b862abbf116ad4 100644 (file)
--- a/src/templates/messages/main.sass
+++ b/src/templates/messages/main.sass
@@ -225,13 +225,6 @@ table
                                                        &:hover
                                                                text-decoration: underline
 
-                                       // Optionally make the text large
-                                       &.text-large
-                                               td
-                                                       p
-                                                               font-size: $font-size-large
-                                                               line-height: $line-height-large
-
                                // Buttons
                                tr.button
                                        td