From 66de568c699e58b2f86175fc96a0a6459ae1ea16 Mon Sep 17 00:00:00 2001
From: Yingtong Li <runassudo@yingtongli.me>
Date: Sun, 17 Mar 2019 23:24:18 +1100
Subject: [PATCH] Fix display of images/more in bulletin

---
 sspromotions/jinja2/sspromotions/email/bulletin.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sspromotions/jinja2/sspromotions/email/bulletin.html b/sspromotions/jinja2/sspromotions/email/bulletin.html
index 89e7d6f..11f06bb 100644
--- a/sspromotions/jinja2/sspromotions/email/bulletin.html
+++ b/sspromotions/jinja2/sspromotions/email/bulletin.html
@@ -76,6 +76,7 @@
 			<tr> <!-- Main Digest content -->
 				<th class="small-12 large-{% if item.image %}8{% else %}12 first{% endif %} columns last">
 					<b><h5>{{ item.title }}</h5></b>
+					{% if item.image %}<img src="https://{{ settings.ALLOWED_HOSTS[0] }}{{ MEDIA_URL }}{{ item.image }}" alt="{{ item.title }}" style="max-height: 10em; float: left; margin-right: 1em;">{% endif %}
 					<p>{{ item.content | markdown }}</p>
 					{% if item.link %}<p><a href="{{ item.link }}">Read more &#x203A;</a></p>{% endif %}
 					{% if not loop.last %}<hr>{% endif %}
@@ -90,9 +91,10 @@
 		{{ gap }}
 		{% for item in more %}
 			<tr>
-				<th class="small-12 large-4 columns{% if loop.first %} first{% endif %}{% if loop.last %} last{% endif %}">
-					{% if item.image %}{% if item.link %}<a href="{{ item.link }}">{% endif %}<img src="https://{{ settings.ALLOWED_HOSTS[0] }}{{ MEDIA_URL }}{{ item.image }}" alt="{{ item.title }}" style="max-height: 10em;">{% if item.link %}</a>{% endif %}<br>{% endif %}
-					<p>{{ item.content|striptags|truncate(200) }}</p>
+				<th class="small-12 large-4 columns first last">
+					<b><h5>{{ item.title }}</h5></b>
+					{% if item.image %}<img src="https://{{ settings.ALLOWED_HOSTS[0] }}{{ MEDIA_URL }}{{ item.image }}" alt="{{ item.title }}" style="max-height: 10em; float: left; margin-right: 1em;">{% endif %}
+					<p>{{ item.content | truncate(200) | markdown }}</p>
 					<p><a href="https://{{ settings.ALLOWED_HOSTS[0] }}{{ url('bulletin_preview') }}?full">Read more &#x203A;</a></p>
 				</th>
 			</tr>