From 0b4af7e40fd28455484e4620781bb8239e89a02d Mon Sep 17 00:00:00 2001
From: Yingtong Li <runassudo@yingtongli.me>
Date: Tue, 5 Mar 2019 20:17:06 +1100
Subject: [PATCH] Fix email display problems

---
 .../jinja2/sspromotions/email/bulletin.html   | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/sspromotions/jinja2/sspromotions/email/bulletin.html b/sspromotions/jinja2/sspromotions/email/bulletin.html
index 81484e0..89e7d6f 100644
--- a/sspromotions/jinja2/sspromotions/email/bulletin.html
+++ b/sspromotions/jinja2/sspromotions/email/bulletin.html
@@ -74,18 +74,13 @@
 		{{ gap }}
 		{% for item in group.bulletin_items %}
 			<tr> <!-- Main Digest content -->
-				{% if item.image %}
-					<th class="small-12 large-3 columns first">
-						{% if item.link %}<a href="{{ item.link }}">{% endif %}<img src="{{ MEDIA_URL }}{{ item.image }}" alt="{{ item.title }}">{% if item.link %}</a>{% endif %}
-					</th>
-				{% endif %}
 				<th class="small-12 large-{% if item.image %}8{% else %}12 first{% endif %} columns last">
 					<b><h5>{{ item.title }}</h5></b>
 					<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 %}
 				</th>
 			</tr>
-			{% if not loop.last %}<hr>{% endif %}
 		{% endfor %}
 	{% endfor %}
 	{% if more %}
@@ -93,19 +88,15 @@
 			<p>More from MUMUS:</p>
 		</th></tr>
 		{{ gap }}
-		<tr> <!-- Digest Content 3 columns-->
-			<table class="row"><tbody><tr>
-				{% for item in more %}
-					<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="{{ MEDIA_URL }}{{ item.image }}" alt="{{ item.title }}">{% if item.link %}</a>{% endif %}<br>{% endif %}
-						<b><h5>{{ item.title }}</h5></b>
-						<p>{{ item.content|striptags|truncate(100) }}</p>
-						{% if item.link %}<p><a href="{{ item.link }}">Read more &#x203A;</a></p>{% endif %}
-						<p style="font-size: 8pt;"><a href="https://{{ settings.ALLOWED_HOSTS[0] }}{{ url('membership') }}">Subscribe to {{ item.group.name }}</a></p>
-					</th>
-				{% endfor %}
-			</tr></tbody></table>
-		</tr>
+		{% 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>
+					<p><a href="https://{{ settings.ALLOWED_HOSTS[0] }}{{ url('bulletin_preview') }}?full">Read more &#x203A;</a></p>
+				</th>
+			</tr>
+		{% endfor %}
 	{% endif %}
 {% endblock content %}