From 8ab782a7c3446f0b3296a0f0caac73fd9f1bef71 Mon Sep 17 00:00:00 2001
From: ya_dim4ik <ya.dim4ik@gmail.com>
Date: Thu, 22 Dec 2016 17:55:47 +0200
Subject: [PATCH] email fixes

---
 .../newsletter/AutomaticEmail_v2.html         | 102 ++++++++++--------
 1 file changed, 55 insertions(+), 47 deletions(-)

diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
index 677975c4..633ee3ae 100644
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
@@ -72,12 +72,6 @@
 
 <!-- BACKGROUND -->
 <table cellspacing="0" cellpadding="0" border="0" style="width:100%; background-color: #f8f8f6; font-family: Arial;">
-    {% comment %}
-    <tr>
-        <td>&nbsp;</td>
-    </tr>
-    {% endcomment %}
-
     <tr class="mld-body mld-body-1">
         <td align="center" valign="top" style="background-color: #f8f8f6; border-top: 1px solid #f3f3f3;">
 
@@ -122,22 +116,22 @@
                                     <table cellspacing="0" cellpadding="0" border="0" style="wigth: 100%;">
                                         <tr>
                                             <td style="padding: 3px 0px 3px 0px;">
-                                                <a href="http://{{ domain }}{{ obj.get_permanent_url }}" style="color: #333333; font-size: 25px; font-weight: normal; text-decoration: none;">{{ obj.name|safe }}</a>
+                                                <a href="http://{{ domain }}{{ obj.get_permanent_url }}" style="color: #333333; font-size: 25px; font-weight: bold; text-decoration: none;">{{ obj.name|safe }}</a>
                                             </td>
                                         </tr>
 
                                         <tr>
-                                            <td style="color: #333333; font-size: 16px; padding: 3px 0px 3px 0px;">
+                                            <td style="font-size:14px; color:#999999; padding: 3px 0px 3px 0px;">
                                                 {{ obj.main_title|safe }}
                                             </td>
                                         </tr>
 
                                         <tr>
-                                            <td style="color: #3399cc; font-size: 17px; padding: 3px 0px 3px 0px;">
+                                            <td style="color: #3399cc; font-size: 14px; padding: 3px 0px 3px 0px;">
                                                 <table border="0" cellpadding="0" cellspacing="0">
                                                     <tr>
                                                         <td style="padding-right: 9px;"><img src="cid:calendar" style="margin-top: -2px; alt="></td>
-                                                        <td>{{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %}</td>
+                                                        <td>{{ obj.get_dates_v2 }}</td>
                                                     </tr>
                                                 </table>
                                             </td>
@@ -264,8 +258,6 @@
             </table>
             {% endif %}
 
-
-
             {% if russia %}
             <!-- RF -->
             <table cellspacing="0" cellpadding="0" border="0" style="width:100%;">
@@ -348,6 +340,7 @@
 
                                                     <tr>
                                                         <td style="padding-bottom: 18px; padding-top: 10px;">
+                                                            {# TODO: Подставить href в ссылку #}
                                                             <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>
@@ -374,8 +367,6 @@
             </table>
             {% endif %}
 
-
-
             {% if foreign %}
             <!-- foreign -->
             <table cellspacing="0" cellpadding="0" border="0" style="width:100%; background-color: #fff; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;">
@@ -453,53 +444,70 @@
 
 {#         --------------     БАНЕР    ---------------        #}
             {% if newsletter.banner %}
-                <a href="{{ newsletter.banner_url }}"><img src="cid:inside_image" alt=""></a>
+                <table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">
+                    <tr>
+                        <td><a href="{{ newsletter.banner_url }}"><img src="cid:inside_image" alt=""></a></td>
+                    </tr>
+                </table>
             {% endif %}
 
             {% if news %}
                 <!-- Новости событий -->
                 <table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">
                     <tr>
-                      <td>
-                        <table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin: 0 auto;">
-                        <tr>
-                          <td colspan="2" align="center" style="padding-top: 40px; 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: 30px;" valign="top">
-                                <a href="http://{{ domain }}{{ news.get_permanent_url }}"><img src="cid:news{{ news.pk }}" alt=""></a>
-                            </td>
-
-                            <td valign="top" style="padding-right: 15px;">
-                              <table cellspacing="0" cellpadding="0" border="0">
+                        <td>
+                            <table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin: 0 auto;">
                                 <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>
-                                </tr>
-                                <tr>
-                                  <td style="color: #3399cc; font-size: 17px; padding-bottom: 8px;">
-                                      <table border="0" cellpadding="0" cellspacing="0">
-                                          <tr>
-                                              <td style="padding-right: 8px;"><img src="cid:calendar" alt=""></td>
-                                              <td>{{ news.publish_date|date:"d E Y" }}</td>
-                                          </tr>
-                                      </table>
-                                  </td>
+                                    <td colspan="2" align="center" style="padding-top: 40px; 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="font-family: Arial, sans-serif; color: #999999; font-size: 13px; padding-bottom: 20px; line-height: 1.5;">{{ news.preview|safe|truncatewords_html:25 }}</td>
+                                    <td style="width: 170px; text-align: center; padding-bottom: 30px;" valign="top">
+                                        {# TODO: Сделать картинку 170х170 #}
+                                        <a href="http://{{ domain }}{{ news.get_permanent_url }}"><img src="cid:news{{ news.pk }}" alt=""></a>
+                                    </td>
+
+                                    <td valign="top" style="padding-right: 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>
+                                            </tr>
+
+                                            <tr>
+                                                <td style="color: #3399cc; font-size: 14px; padding-bottom: 8px;">
+                                                    <table border="0" cellpadding="0" cellspacing="0">
+                                                        <tr>
+                                                            <td style="padding-right: 8px;"><img src="cid:calendar" alt=""></td>
+                                                            <td>{{ news.publish_date|date:"d E Y" }}</td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </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;">
+                                                    {# TODO: Подставить href в ссылку #}
+                                                    <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>
+
                                 <tr>
-                                  <td>
-                                    <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>
+                                    <td style="padding-top: 20px;">
+                                        <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>
-                              </table>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
+                            </table>
+                        </td>
                     </tr>
                 </table>
+
                 <hr style="width: 565px; margin: 0 auto; background-color: #e6e6e5; height: 1px; border: 0;">
             {% endif %}