Merge branch 'stage6' of bitbucket.org:Bonus_05/expomap into stage6

remotes/origin/stage6
Alexander Burdeinyi 9 years ago
commit 3110b2fbab
  1. 37
      emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html

@ -121,7 +121,7 @@
</tr>
<tr>
<td style="font-size:14px; color:#999999; padding: 3px 0px 3px 0px;">
<td style="font-size:14px; color:#333333; padding: 3px 0px 3px 0px;">
{{ obj.main_title|safe }}
</td>
</tr>
@ -465,7 +465,7 @@
<a href="http://{{ domain }}{{ news.get_permanent_url }}"><img src="cid:news{{ news.pk }}" alt=""></a>
</td>
<td valign="top" style="padding-right: 15px;">
<td valign="top" style="padding-left: 15px;">
<table cellspacing="0" cellpadding="0" border="0">
<tr>
<td style="padding-bottom: 8px;"><a href="http://{{ domain }}{{ news.get_permanent_url }}" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ news.main_title|safe }}</a></td>
@ -483,12 +483,8 @@
</tr>
<tr>
<td style="font-family: Arial, sans-serif; color: #999999; font-size: 13px; padding-bottom: 20px; line-height: 1.5;">{{ news.preview|safe|truncatewords_html:25 }}</td>
</tr>
<tr>
<td style="padding-top: 10px;">
<a href="http://{{ domain }}{{ news.get_permanent_url }}" style="display: inline-block; padding: 7px 17px 6px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "подробнее" %} <img src="cid:arrow" alt=""></a>
<td style="font-family: Arial, sans-serif; color: #999999; font-size: 13px; padding-bottom: 20px; line-height: 1.5;">
{{ news.preview|safe|truncatewords_html:25 }} <a href="http://{{ domain }}{{ news.get_permanent_url }}" style="color: #ff6600; text-decoration: none;">...&gt;&gt;&gt;</a>
</td>
</tr>
</table>
@ -496,7 +492,7 @@
</tr>
<tr>
<td style="padding-top: 20px;">
<td colspan="2" align="center" style="padding-bottom: 40px;">
<a href="http://{{ domain }}/news/" style="display: inline-block; padding: 7px 17px 6px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "Все новости" %} <img src="cid:arrow" alt=""></a>
</td>
</tr>
@ -504,7 +500,9 @@
</td>
</tr>
</table>
{% endif %}
{% if blog and news %}
<hr style="width: 565px; margin: 0 auto; background-color: #e6e6e5; height: 1px; border: 0;">
{% endif %}
@ -515,8 +513,9 @@
<td style="padding-bottom: 40px;">
<table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin: 0 auto;">
<tr>
<td colspan="2" align="center" style="padding-top: 30px; padding-bottom: 30px; font-family: Arial, sans-serif; font-size: 30px; font-weight: bold; text-transform: uppercase; color: #333333">{% trans "Новенькое из блога" %}</td>
</tr>
<td colspan="2" align="center" style="padding-top: 30px; padding-bottom: 30px; font-family: Arial, sans-serif; font-size: 30px; font-weight: bold; text-transform: uppercase; color: #333333">{% trans "Новенькое из блога" %}</td>
</tr>
<tr>
<td style="width: 300px; text-align: center; padding-bottom: 40px;" valign="top">
<a href="http://{{ domain }}{{ blog.get_permanent_url }}"><img src="cid:blog{{ blog.pk }}" alt=""></a>
@ -529,17 +528,21 @@
</tr>
<tr>
<td style="font-family: Arial, sans-serif; color: #999999; font-size: 13px; padding-bottom: 20px; line-height: 1.5;">{{ blog.preview|safe|striptags }}</td>
</tr>
<tr>
<td>
<a href="http://{{ domain }}{{ blog.get_permanent_url }}" style="display: inline-block; padding: 7px 17px 6px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "посмотреть Подробнее" %} <img src="cid:arrow" alt=""></a>
<td style="font-family: Arial, sans-serif; color: #999999; font-size: 13px; padding-bottom: 20px; line-height: 1.5;">
{{ blog.preview|safe|striptags }}
<a href="http://{{ domain }}{{ blog.get_permanent_url }}" style="color: #ff6600; text-decoration: none;">...&gt;&gt;&gt;</a>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="2" align="center">
{# TODO: подставить ссылку на все статью #}
<a href="#" style="display: inline-block; padding: 7px 17px 6px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "Все статьи" %} <img src="cid:arrow" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>

Loading…
Cancel
Save