From 0214cc7a123b1ab969500da0fb33204e454292f9 Mon Sep 17 00:00:00 2001
From: ya_dim4ik <ya.dim4ik@gmail.com>
Date: Wed, 21 Dec 2016 16:57:06 +0200
Subject: [PATCH] email fix

---
 .../newsletter/AutomaticEmail_v2.html         | 63 ++++++++++---------
 static/mailing_settings/css/main.css          | 13 +++-
 .../client/accounts/mailing_settings.html     | 40 +-----------
 3 files changed, 47 insertions(+), 69 deletions(-)

diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
index ed70e22d..1f01491e 100644
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
@@ -108,52 +108,43 @@
                     <td align="center" style="padding:45px 0px 40px 0px;">
                         <table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">
                             <tr>
-                                <td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 35px;">{% trans "Самые важные события для вас" %}</td>
+                                <td align="center" style="color: #333333; font-size: 28px; font-weight: normal; text-transform: uppercase; padding-bottom: 35px;">{% trans "Самые важные события для вас" %}</td>
                             </tr>
                         </table>
 
                         <table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin: 0 auto;">
                             <tr>
-                              <td valign="top" style="width: 225px;">
-                                  <a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img src="cid:recommended{{ obj.pk }}" style="margin-top: -2px;"/></a>{#                                            {% endthumbnail %}#}
-                              </td>
+                                <td valign="top" style="width: 170px;">
+                                    {# TODO: Сменить размер картинки на 170x170 #}
+                                    <a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img src="cid:recommended{{ obj.pk }}" style="margin-top: -2px;"/></a>{#                                            {% endthumbnail %}#}
+                                </td>
 
                                 <td valign="top" align="left" style="padding-left: 22px;">
                                     <table cellspacing="0" cellpadding="0" border="0" style="wigth: 100%;">
-                                        {% if obj.get_event_place_name %}
-                                            <tr>
-                                              <td valign="middle" style="color: #cc3399; font-size: 13px; text-transform: uppercase; padding: 3px 0px 3px 0px;">
-                                                  <table border="0" cellpadding="0" cellspacing="0">
-                                                      <tr>
-                                                          <td style="padding-right: 8px;"><img src="cid:marker" alt=""></td>
-                                                          <td>{{ obj.get_event_place_name }}</td>
-                                                      </tr>
-                                                  </table>
-                                              </td>
-                                            </tr>
-                                        {% endif %}
                                         <tr>
-                                          <td style="padding: 3px 0px 3px 0px;">
-                                              <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>
+                                            <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>
+                                            </td>
                                         </tr>
 
                                         <tr>
-                                          <td style="color: #3399cc; font-size: 17px; 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>
-                                                  </tr>
-                                              </table>
-                                          </td>
+                                            <td style="color: #333333; font-size: 16px; padding: 3px 0px 3px 0px;">
+                                                {{ obj.main_title|safe }}
+                                            </td>
                                         </tr>
 
                                         <tr>
-                                          <td style="color: #333333; font-size: 16px; padding: 3px 0px 3px 0px;">
-                                            {{ obj.main_title|safe }}
-                                          </td>
+                                            <td style="color: #3399cc; font-size: 17px; 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>
+                                                    </tr>
+                                                </table>
+                                            </td>
                                         </tr>
 
+                                        {% comment %}
                                         <tr>
                                           <td style="color: #999999; font-size: 13px; padding: 3px 0px 15px 0px;">
                                             {% for tag in obj.tags %}
@@ -161,6 +152,20 @@
                                             {% endfor %}
                                           </td>
                                         </tr>
+                                        {% endcomment %}
+
+                                        {% if obj.get_event_place_name %}
+                                            <tr>
+                                                <td valign="middle" style="color: #cc3399; font-size: 13px; text-transform: uppercase; padding: 3px 0px 3px 0px;">
+                                                    <table border="0" cellpadding="0" cellspacing="0">
+                                                        <tr>
+                                                            <td style="padding-right: 8px;"><img src="cid:marker" alt=""></td>
+                                                            <td>{{ obj.get_event_place_name }}</td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                        {% endif %}
 
                                         <tr>
                                             <td style="padding: 6px 0px 0px 0px;">
diff --git a/static/mailing_settings/css/main.css b/static/mailing_settings/css/main.css
index f794686a..3def7537 100644
--- a/static/mailing_settings/css/main.css
+++ b/static/mailing_settings/css/main.css
@@ -69,7 +69,7 @@
 
 .page_header{
     background: url(../images/header.jpg) no-repeat top fixed;
-    padding: 16px 0 88px;
+    padding: 16px 0 35px;
 }
 
 h1{
@@ -111,6 +111,17 @@ h3{
     transition: color .3s;
 }
 
+.page_header p{
+    padding-top: 25px;
+    font-size: 22px;
+    color: #fff;
+    text-align: center;
+}
+
+.page_header p span{
+    color: #FF6600;
+}
+
 .themes_block,
 .period_block{
     background-color: #fbfbfb;
diff --git a/templates/client/accounts/mailing_settings.html b/templates/client/accounts/mailing_settings.html
index 5327a6db..81ab20b9 100644
--- a/templates/client/accounts/mailing_settings.html
+++ b/templates/client/accounts/mailing_settings.html
@@ -21,6 +21,7 @@
                     <a href="/" class="back_to_site">expomap.ru <span>&#8250;</span></a>
                 </div>
                 <h1>{% trans 'Настройте рассылку от Expomap' %}</h1>
+                <p>{% trans 'для' %} <span>{{ request.user }}</span></p>
             </div>
         </header>
 
@@ -187,46 +188,7 @@
 
         <script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.4/jquery.fancybox.pack.min.js" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.min.js" defer></script>
-        <script type="application/javascript">
-//            var checked_r_cities = [ {{ checked_r_cities|join:', ' }} ];
-//            var checked_f_countries = [ {{ checked_f_countries|join:', ' }} ];
-//            var checked_th = [ {{ checked_th|join:', ' }} ];
-//            var checked_tg = [ {{ checked_tg|join:', ' }} ];
-
-//            var user_choice = {
-//                th: {
-//                    1: "Авиакосмическая промышленность",
-//                    94: "АПК и пищевая индустрия"
-//                },
-//                tg: {
-//
-//                },
-//                r_cities: {
-//                    "-1034272": "Алушта",
-//                    "-2880021": "Астрахань",
-//                    "-2883930": "Белгород"
-//                },
-//                area: {
-//                    4: "Европа"
-//                },
-//                co: {
-//                    16: "Бангладеш",
-//                    194: "Вьетнам"
-//                }
-//            };
-        </script>
         <script src="{% static 'mailing_settings/js/main.js' %}" defer></script>
-{#        {% if not object.subscriber %}#}
-{#            <script>#}
-{#                $(document).ready(function() {#}
-{#                    var popupUnsibscribed = $('#unsibscribed');#}
-{#				    $.fancybox(popupUnsibscribed, fbPopupOptions);#}
-{#                });#}
-{#            </script>#}
-{#            <div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">#}
-{#                {% trans "Вы не являетесь подписчиком. Чтобы подписаться, выберите интересующие Вас данные." %}#}
-{#            </div>#}
-{#        {% endif %}#}
     </body>
 </html>