From b4149f29d1f85f2bc48eb323d25a3bc909903fbf Mon Sep 17 00:00:00 2001
From: ya_dim4ik <ya.dim4ik@gmail.com>
Date: Tue, 13 Dec 2016 16:11:43 +0200
Subject: [PATCH 1/3] email fix

---
 .../newsletter/AutomaticEmail_v2.html         | 142 +++++++++---------
 1 file changed, 68 insertions(+), 74 deletions(-)

diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
index 6179dbca..a46dc677 100644
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
@@ -279,13 +279,30 @@
                                         <tr>
                                             <td valign="top" style="width: 110px;">
                                                 <a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_image">
-{#                                                              {% thumbnail obj.get_logo '100x100' as im %}#}
                                                     <img src="cid:russia_{{ obj.event_type }}_{{ obj.pk }}"/>
-{#                                                              {% endthumbnail %}#}
                                                 </a>
                                             </td>
                                             <td style="padding-left: 20px; width: 470px;">
                                                 <table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">
+                                                    <tr>
+                                                        <td style="padding-bottom: 5px;"><a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_title" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ obj.name|safe }}</a></td>
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td style="font-size: 14px; color: #999999; padding-bottom: 5px;">{{ obj.main_title|safe }}</td>
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td style="color: #3399cc; font-size: 14px; padding-bottom: 3px;">
+                                                            <table cellspacing="0" cellpadding="0" border="0">
+                                                                <tr>
+                                                                    <td style="padding-right: 14px;"><img src="cid:calendar" alt=""></td>
+                                                                    <td>{{ obj.get_dates_v2 }}</td>
+                                                                </tr>
+                                                            </table>
+                                                        </td>
+                                                    </tr>
+
                                                     <tr>
                                                         {% if forloop.first %}
                                                             <td style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px; color: #99cc66;">
@@ -323,25 +340,6 @@
                                                         {% endif %}
                                                     </tr>
 
-                                                    <tr>
-                                                        <td style="padding-bottom: 5px;"><a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_title" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ obj.name|safe }}</a></td>
-                                                    </tr>
-
-                                                    <tr>
-                                                        <td style="font-size: 14px; color: #999999; padding-bottom: 5px;">{{ obj.main_title|safe }}</td>
-                                                    </tr>
-
-                                                    <tr>
-                                                        <td style="color: #3399cc; font-size: 14px; padding-bottom: 3px;">
-                                                            <table cellspacing="0" cellpadding="0" border="0">
-                                                                <tr>
-                                                                    <td style="padding-right: 14px;"><img src="cid:calendar" alt=""></td>
-                                                                    <td>{{ obj.get_dates_v2 }}</td>
-                                                                </tr>
-                                                            </table>
-                                                        </td>
-                                                    </tr>
-
                                                     <tr>
                                                         <td style="padding-bottom: 18px; padding-top: 10px;">
                                                             <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>
@@ -384,59 +382,55 @@
 
                             <tr>
                                 <td>
-{#                                    <table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">#}
-{#                                        <tr>#}
-                                        {% for sqs_obj in foreign %}
-                                          {% with sqs_obj.object as obj %}
-{#                                            <td valign="top">#}
-                                              <table cellspacing="0" cellpadding="0" border="0" {% if not forloop.first %}style="padding-top: 20px; border-top: 1px solid #eaeaea;"{% endif %}>
-                                                <tr>
-                                                    <td valign="top" style="padding-bottom: 15px; text-align: center; width: 130px;">
-                                                        <a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="foreign_image">
-                                                              <img src="cid:foreign_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}"/>
-                                                        </a>
-                                                    </td>
-                                                    <td valign="top" style="padding-left: 20px; width: 450px;">
-                                                        <table border="0" cellspacing="0" cellpadding="0">
-                                                            <tr>
-                                                              <td style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px; {% if forloop.first %}color: #33ccff; {% elif forloop.counter == 2 %}color: #cc3399; {% elif forloop.counter == 3 %}color: #99cc66;{% elif forloop.counter == 4 %}color: #ff6600;{% endif %}">
-                                                              {% if obj.get_event_place_name %}
-                                                                  <table border="0" cellpadding="0" cellspacing="0">
-                                                                    <tr>
-                                                                        <td style="padding-right: 5px;"><img src="cid:m{{ forloop.counter }}" alt=""></td>
-                                                                        <td>{{ obj.get_event_place_name }}</td>
-                                                                    </tr>
-                                                                  </table>
-                                                              {% endif %}
-                                                              </td>
-                                                            </tr>
-                                                            <tr>
-                                                              <td style="padding-bottom: 10px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_title" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ obj.name|safe }}</a></td>
-                                                            </tr>
-                                                            <tr>
-                                                              <td style="color: #3399cc; font-size: 13px; line-height: 14px; padding-bottom: 5px;">
-                                                                  <table border="0" cellpadding="0" cellspacing="0">
-                                                                      <tr>
-                                                                          <td style="padding-right: 7px;"><img src="cid:calendar" alt=""></td>
-                                                                          <td>{{ obj.get_dates_v2 }}</td>
-                                                                      </tr>
-                                                                  </table>
-                                                              </td>
-                                                            </tr>
-                                                            <tr>
-                                                              <td style="font-size: 13px; color: #999999;">
-                                                                {% for tag in obj.tags %}<a href="http://{{ domain }}{{ obj.catalog }}tag/{{ tag.url }}" class="tag" style="font-size: 13px; color: #999999; text-decoration: none;">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
-                                                              </td>
-                                                            </tr>
-                                                        </table>
-                                                    </td>
-                                                </tr>
-                                              </table>
-{#                                            </td>#}
-                                          {% endwith %}
-                                        {% endfor %}
-{#                                        </tr>#}
-{#                                    </table>#}
+                                    {% for sqs_obj in foreign %}
+                                      {% with sqs_obj.object as obj %}
+                                          <table cellspacing="0" cellpadding="0" border="0" {% if not forloop.first %}style="padding-top: 20px; border-top: 1px solid #eaeaea;"{% endif %}>
+                                            <tr>
+                                                <td valign="top" style="padding-bottom: 15px; text-align: center; width: 130px;">
+                                                    <a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="foreign_image">
+                                                          <img src="cid:foreign_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}"/>
+                                                    </a>
+                                                </td>
+                                                <td valign="top" style="padding-left: 20px; width: 450px;">
+                                                    <table border="0" cellspacing="0" cellpadding="0">
+                                                        <tr>
+                                                          <td style="padding-bottom: 10px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_title" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ obj.name|safe }}</a></td>
+                                                        </tr>
+
+                                                        <tr>
+                                                          <td style="color: #3399cc; font-size: 13px; line-height: 14px; padding-bottom: 5px;">
+                                                              <table border="0" cellpadding="0" cellspacing="0">
+                                                                  <tr>
+                                                                      <td style="padding-right: 7px;"><img src="cid:calendar" alt=""></td>
+                                                                      <td>{{ obj.get_dates_v2 }}</td>
+                                                                  </tr>
+                                                              </table>
+                                                          </td>
+                                                        </tr>
+
+                                                        <tr>
+                                                          <td style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px; {% if forloop.first %}color: #33ccff; {% elif forloop.counter == 2 %}color: #cc3399; {% elif forloop.counter == 3 %}color: #99cc66;{% elif forloop.counter == 4 %}color: #ff6600;{% endif %}">
+                                                          {% if obj.get_event_place_name %}
+                                                              <table border="0" cellpadding="0" cellspacing="0">
+                                                                <tr>
+                                                                    <td style="padding-right: 5px;"><img src="cid:m{{ forloop.counter }}" alt=""></td>
+                                                                    <td>{{ obj.get_event_place_name }}</td>
+                                                                </tr>
+                                                              </table>
+                                                          {% endif %}
+                                                          </td>
+                                                        </tr>
+                                                        <tr>
+                                                          <td style="font-size: 13px; color: #999999;">
+                                                            {% for tag in obj.tags %}<a href="http://{{ domain }}{{ obj.catalog }}tag/{{ tag.url }}" class="tag" style="font-size: 13px; color: #999999; text-decoration: none;">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
+                                                          </td>
+                                                        </tr>
+                                                    </table>
+                                                </td>
+                                            </tr>
+                                          </table>
+                                      {% endwith %}
+                                    {% endfor %}
                                 </td>
                             </tr>
 

From 00d563be2a26e3dd9ad1bc4d8d9c6bc1064ef9fb Mon Sep 17 00:00:00 2001
From: ya_dim4ik <ya.dim4ik@gmail.com>
Date: Tue, 13 Dec 2016 16:19:51 +0200
Subject: [PATCH 2/3] email fix

---
 .../newsletter/templates/newsletter/AutomaticEmail_v2.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
index a46dc677..91729a50 100644
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
@@ -162,7 +162,7 @@
 
                                         <tr>
                                             <td style="padding: 6px 0px 0px 0px;">
-                                                <a href="http://{{ domain }}{{ obj.get_permanent_url }}" style="display: inline-block; padding: 10px 30px; background-color: #ff6600; border-radius: 5px; text-transform: uppercase; color: #fff; text-decoration: none; font-size: 13px;">{% trans "посмотреть Подробнее" %} <img src="cid:white_arrow"></a>
+                                                <a href="http://{{ domain }}{{ obj.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"></a>
                                             </td>
                                         </tr>
                                     </table>

From e611a3bf47a1e2b011c4f5d003db9d4afdc26e81 Mon Sep 17 00:00:00 2001
From: ya_dim4ik <ya.dim4ik@gmail.com>
Date: Tue, 13 Dec 2016 16:38:21 +0200
Subject: [PATCH 3/3] admin speakers fix

---
 templates/admin/_base.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/admin/_base.html b/templates/admin/_base.html
index 36cf2bfd..6d0e34a3 100644
--- a/templates/admin/_base.html
+++ b/templates/admin/_base.html
@@ -1,7 +1,7 @@
 {% extends "c_admin/base.html" %}
 {% load admin_static %}
 
-{% block span_num %}10{% endblock %}
+{% block span_num %}9{% endblock %}
 
 {% block extrastyle %}
     <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}" />
@@ -52,7 +52,7 @@
 
 {% block body %}
     <!-- Container -->
-    <div id="container">
+{#    <div id="container">#}
         {% block breadcrumbs %}
         {% endblock %}
 
@@ -78,6 +78,6 @@
         <!-- END Content -->
 
         {% block footer %}<div id="footer"></div>{% endblock %}
-    </div>
+{#    </div>#}
     <!-- END Container -->
 {% endblock %}