remotes/origin/stage6
Alexander Burdeinyi 9 years ago
parent 89ad969fa5
commit 89fa80c915
  1. 2
      emencia/django/newsletter/mailer.py
  2. 9
      emencia/django/newsletter/templates/newsletter/AutomaticEmail.html
  3. 663
      emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
  4. 399
      emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html
  5. 2
      proj/middleware.py

@ -117,6 +117,8 @@ dailymail_attahcments = {
'expo': 'newsletter/images/expo.png',
# 'news2': 'newsletter/images/news2.jpg',
'b': 'newsletter/images/b.png',
'arrow': 'newsletter/images/arrow.png',
'white_arrow': 'newsletter/images/white_arrow.png',
'site_logo': 'newsletter/images/site_logo.png',
'instagram': 'newsletter/images/instagram.png',
'youtube': 'newsletter/images/youtube.png',

@ -107,7 +107,7 @@
<tr>
<td style="color: #3399cc; font-size: 17px; padding: 3px 0px 3px 0px;">
<img src="cid:calendar' %}" alt="">
<img src="cid:calendar" alt="">
{{ obj.get_dates }}, {{ obj.get_event_place_name }}
</td>
</tr>
@ -241,7 +241,7 @@
<tr>
<td class="color1" style="font-size: 14px; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="cid:m1' %}" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
<img src="cid:m1" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
@ -507,6 +507,7 @@
</table>
{% url 'newsletter-authmailingsettings' uidb36=uidb36 token=token as settings_url %}
<!-- Управление подпиской -->
<table width="100%;">
<tr>
@ -519,7 +520,7 @@
<tr>
<td align="center" style="padding-bottom: 35px; border-bottom: 1px solid #f3f3f3;">
<a href="{% if uidb36 and token %}http://{{ domain }}{% url 'newsletter-authmailingsettings' uidb36=uidb36 token=token %}{% endif %}" style="display: inline-block; padding: 7px 20px 7px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "Настроить" %}</a>
<a href="{% if uidb36 and token %}http://{{ domain }}{{ settings_url }}{% endif %}" style="display: inline-block; padding: 7px 20px 7px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "Настроить" %}</a>
</td>
</tr>
</table>
@ -590,7 +591,7 @@
<td style="padding-top: 35px; padding-left: 20px; padding-right: 20px; font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;" align="center">{% trans "Вы получили это письмо, так как подписаны на рассылку" %} <a href="https://www.expomap.ru" style="color: #ff6600;">www.expomap.ru</a></td>
</tr>
<tr>
<td align="center" style="font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;"><a href="#" style="color: #ff6600;">{% trans "Переслать другу" %}</a> {% trans "или" %} <a href="{% if uidb36 and token %}http://{{ domain }}{% url 'newsletter-authmailingsettings' uidb36=uidb36 token=token %}{% endif %}" style="color: #ff6600;">{% trans "Отписаться" %}</a></td>
<td align="center" style="font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;"><a href="#" style="color: #ff6600;">{% trans "Переслать другу" %}</a> {% trans "или" %} <a href="{% if uidb36 and token %}http://{{ domain }}{{ settings_url }}{% endif %}" style="color: #ff6600;">{% trans "Отписаться" %}</a></td>
</tr>
<tr>
<td align="center" style="padding-bottom: 30px; font-family: Arial, sans-serif; font-size: 13px; color: #999999;">&copy; 2008 — 2016 Expomap.ru</td>

@ -0,0 +1,663 @@
{% load i18n %}
{#{% load static %}#}
{#{% load thumbnail %}#}
{# <a href="http://{{ domain }}{% url 'events:main' %}?{{ moscow_filter_url }}">{% trans "ПОСМОТРЕТЬ ВСЕ" %} ></a> #}
{# <a href="http://{{ domain }}{% url 'events:main' %}?{{ russia_filter_url }}">{% trans "ПОСМОТРЕТЬ ВСЕ" %} ></a> #}
{# <a href="http://{{ domain }}{% url 'events:main' %}?{{ foreign_filter_url }}">{% trans "ПОСМОТРЕТЬ ВСЕ" %} ></a> #}
{# <a href="http://{{ domain }}{% url 'newsletter-authmailingsettings' uidb36=uidb36 token=token %}">{% trans "НАСТРОИТЬ" %} ></a> #}
<style type="text/css" media="screen">
body{height:100%!important;margin:0;padding:0;width:100%!important;}
table{border-collapse:collapse;}
img,a img{border:0;outline:none;text-decoration:none;}
h1,h2,h3,h4,h5,h6{margin:0;padding:0;}
p{margin:0;padding:0;}
a{word-wrap:break-word;}
table,td{mso-table-lspace:0pt;mso-table-rspace:0pt;}
#outlook a{padding:0;}
img{-ms-interpolation-mode:bicubic;}
body,table,td,p,a,li,blockquote{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;}
.hundered{width:100%!important;}
.tag{font-size: 13px; color: #999999;}
.tag:hover{text-decoration: none;}
.color1{color: #33ccff;}
.color2{color: #cc3399;}
.color3{color: #99cc66;}
.color4{color: #ff6600;}
.event_title{
font-family: Arial,sans-serif;
font-size: 17px;
line-height: 21px;
font-weight: bold;
text-transform: uppercase;
color: #333333;
text-decoration: none;
}
.event_image{
display: block;
border: 1px solid #eaeaea;
text-align: center;
width: 110px;
height: 110px;
background-color: #ffffff;
line-height: 108px;
}
.event_image img{
vertical-align: middle;
}
.foreign_image{
display: block;
width: 128px;
height: 128px;
line-height: 128px;
background-color: #fff;
border: 1px solid #eaeaea;
text-align: center;
}
.foreign_image img{
display: inline-block;
vertical-align: middle;
}
@media screen and (max-width: 600px) {
.mobile100 {width:100% !important;}
}
@media screen and (max-width: 479px) {
.mobile_479_hide{display: none;}
.mobile_479_padding_none{padding-left: 10px !important; padding-right: 10px !important;}
}
</style>
<!-- BACKGROUND -->
<table border="0" cellspacing="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;">
<!-- LAOYUT BODY -->
{% comment %}
<table border="0" cellspacing="0" cellpadding="0" style="width: 600px; font-family: Arial, sans-serif;">
<tr>
<td align="center" valign="top" style="background-color: #f8f8f6;">
{% endcomment %}
<!-- PADDING LEFT&RIGHT -->
<table border="0" cellspacing="0" class="mld-element mld-container" style="width:100%;">
<tr>
<td align="left" valign="top" style="padding:0px 0px 0px 0px; background-color: #ffffff; border-bottom: 1px solid #f3f3f3">
<table border="0" cellspacing="0" cellpadding="0" style="width: 600px; margin: 0 auto;">
<tr>
<td align="left" style="padding: 13px 0px 13px 0px;">
<img src="cid:logo1" alt="">
</td>
<td align="right" style="padding: 13px 24px 13px 0px">
<img src="cid:logo2" alt="">
</td>
</tr>
</table>
</td>
</tr>
</table>
{% if recommended %}
{% with recommended.object as obj %}
<!-- recommendation -->
<table border="0" cellspacing="0" style="width:100%;">
<tr>
<td align="center" style="padding:45px 0px 40px 0px;">
<table style="width: 100%;">
<tr>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 15px;">{% trans "Самые важные события для вас" %}</td>
</tr>
</table>
<table style="width: 600px; margin: 0 auto;">
<tr>
<td valign="top" style="width: 225px;">
{# {% thumbnail obj.get_logo '281' as im %}#}
<a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img src="cid:recommended{{ obj.pk }}"/></a>
{# {% endthumbnail %}#}
</td>
<td valign="top" align="left" style="padding-left: 22px;">
<table style="wigth: 100%;">
<tr>
<td valign="middle" style="color: #cc3399; font-size: 13px; text-transform: uppercase; padding: 3px 0px 3px 0px;">
<img src="cid:marker" alt="" style="display: inline-block; vertical-align: middle; margin-right: 5px;">
{{ obj.get_event_place_name }}
</td>
</tr>
<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>
</tr>
<tr>
<td style="color: #3399cc; font-size: 17px; padding: 3px 0px 3px 0px;">
<img src="cid:calendar" alt="">
{{ obj.get_dates }}, {{ obj.get_event_place_name }}
</td>
</tr>
<tr>
<td style="color: #333333; font-size: 16px; padding: 3px 0px 3px 0px;">
{{ obj.main_title|safe }}
</td>
</tr>
<tr>
<td style="color: #999999; font-size: 13px; padding: 3px 0px 15px 0px;">
{% for tag in obj.tags %}
<a href="http://{{ domain }}{{ obj.catalog }}tag/{{ tag.url }}" class="tag">{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
{% endfor %}
</td>
</tr>
<tr>
<td align="center" 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>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endwith %}
{% endif %}
{% if moscow %}
<!-- Moscow -->
<table border="0" cellspacing="0" style="width:100%; background-color: #ffffff; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;">
<tr>
<td>
<table border="0" cellspacing="0" style="width: 600px; margin: 0 auto;">
<tr>
<td style="padding: 30px 0px 40px 0px;">
<table style="width: 100%;">
<tr>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 15px;">{% trans "в москве" %}</td>
</tr>
</table>
{% for sqs_obj in moscow %}
{% with sqs_obj.object as obj %}
<table style="width: 100%; margin-top: 20px;">
<tr {% if not forloop.last %}style="border-bottom: 1px solid #eaeaea;"{% endif %}>
<td valign="top" style="width: 110px;">
<a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_image">
{# {% thumbnail obj.get_logo '90x90' as im %}#}
<img style="" src="cid:moscow_{{ obj.event_type }}_{{ obj.pk }}"/>
{# {% endthumbnail %}#}
</a>
</td>
<td style="padding-left: 20px; width: 470px;">
<table style="width: 100%;">
<tr>
<td style="padding-bottom: 5px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_title">{{ 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: 7px;">
<img src="cid:calendar" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
</td>
</tr>
<tr>
<td style="color: #cc3399; font-size: 14px; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="cid:marker" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
</tr>
<tr>
<td style="padding-bottom: 20px; padding-top: 10px;">
<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" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endwith %}
{% endfor %}
<table style="width: 100%;">
<tr>
<td align="center" style="padding-top: 25px;">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ moscow_filter_url }}" style="display: inline-block; padding: 8px 23px 7px 29px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "посмотреть все" %}<img src="cid:white_arrow" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endif %}
{% if russia %}
<!-- RF -->
<table border="0" cellspacing="0" style="width:100%;">
<tr>
<td style="background-color: #f8f8f6; padding: 30px 0px 40px 0px;">
<table border="0" cellspacing="0" style="width: 600px; margin: 0 auto;">
<tr>
<td>
<table style="width: 100%;">
<tr>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 15px;">{% trans "В России" %}</td>
</tr>
</table>
{% for sqs_obj in russia %}
{% with sqs_obj.object as obj %}
<table style="width: 100%; margin-top: 18px;">
<tr {% if not forloop.last %}style="border-bottom: 1px solid #eaeaea;"{% endif %}>
<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 style="width: 100%;">
<tr>
{% if forloop.first %}
<td class="color3" style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="cid:m3" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
{% elif forloop.counter == 2 %}
<td class="color2" style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="cid:m2" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
{% elif forloop.counter == 3 %}
<td class="color1" style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="cid:m1" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
{% endif %}
</tr>
<tr>
<td style="padding-bottom: 5px;"><a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_title">{{ 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;">
<img src="cid:calendar" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
</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>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endwith %}
{% endfor %}
<table style="width: 100%;">
<tr>
<td align="center" style="padding-top: 25px;">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ russia_filter_url }}" style="display: inline-block; padding: 8px 23px 7px 29px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "все события" %}<img src="cid:white_arrow" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endif %}
{% if foreign %}
<!-- foreign -->
<table border="0" cellspacing="0" style="width:100%; background-color: #fff; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;">
<tr>
<td>
<table style="width: 600px; margin: 0 auto;">
<tr>
<td align="center" style="padding-top: 45px; padding-bottom: 30px; font-family: Arial, sans-serif; font-size: 25px; color: #333333; text-transform: uppercase; font-weight: bold;">{% trans "За рубежом" %}</td>
</tr>
<tr>
<td>
<table style="width: 100%;">
<tr>
{% for sqs_obj in foreign %}
{% with sqs_obj.object as obj %}
<td valign="top">
<table style="width: 130px; margin: 0 auto;">
<tr>
<td style="padding-bottom: 15px; text-align: center;">
<a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="foreign_image">
{# {% thumbnail obj.get_logo '120x120' as im %}#}
<img src="cid:foreign_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}"/>
{# {% endthumbnail %}#}
</a>
</td>
</tr>
<tr>
<td class="color{{ forloop.counter }}" style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px;">
{% if obj.get_event_place_name %}
<img src="cid:m{{ forloop.counter }}" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
</tr>
<tr>
<td style="padding-bottom: 10px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_title">{{ obj.name|safe }}</a></td>
</tr>
<tr>
<td style="color: #3399cc; font-size: 13px; line-height: 14px; padding-bottom: 5px;">
<img src="cid:calendar" alt="" style="display: inline-block; vertical-align: middle; margin-top: -2px; margin-right: 4px;">
{{ obj.get_dates }}
</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">{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
{% endfor %}
</td>
</tr>
</table>
</td>
{% endwith %}
{% endfor %}
</tr>
</table>
</td>
</tr>
<tr>
<td align="center" style="padding-top: 30px; padding-bottom: 40px;">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ foreign_filter_url }}" style="display: inline-block; padding: 8px 23px 7px 29px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "Посмотреть все" %}<img src="cid:white_arrow" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endif %}
{# -------------- БАНЕР --------------- #}
{% if newsletter.banner %}
{# {% thumbnail newsletter.banner '129x600' as im %}#}
<img src="cid:inside_image" alt="">
{# {% endthumbnail %}#}
{% endif %}
{% if news %}
<!-- Новости событий -->
<table style="width: 100%;">
<tr>
<td>
<table 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">
{# {% thumbnail news.logo "272" as im %}#}
<a href="http://{{ domain }}{{ news.get_permanent_url }}"><img src="cid:news{{ news.pk }}" alt=""></a>
{# {% endthumbnail %}#}
</td>
<td valign="top" style="padding-right: 15px;">
<table>
<tr>
<td style="padding-bottom: 8px;"><a href="http://{{ domain }}{{ news.get_permanent_url }}" class="event_title">{{ news.main_title|safe }}</a></td>
</tr>
<tr>
<td valign="middle" style="color: #3399cc; font-size: 17px; padding-bottom: 8px;">
<img src="cid:calendar" alt="" style="margin-right: 4px;">
{{ news.publish_date|date:"d E Y" }}
</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>
<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>
</tr>
</table>
{% endif %}
<hr style="width: 565px; margin: 0 auto; background-color: #e6e6e5; height: 1px; border: 0;">
{% if blog %}
<!-- Новенькое из блога -->
<table style="width: 100%;">
{% comment %}
<tr>
<td 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>
{% endcomment %}
<tr>
<td style="padding-bottom: 40px;">
<table 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>
<tr>
<td style="width: 300px; text-align: center; padding-bottom: 40px;" valign="top">
{# {% thumbnail blog.logo "272" as im %}#}
<a href="http://{{ domain }}{{ blog.get_permanent_url }}"><img src="cid:blog{{ blog.pk }}" alt=""></a>
{# {% endthumbnail %}#}
</td>
<td valign="top" style="padding-right: 15px;">
<table>
<tr>
<td style="padding-bottom: 15px;" valign="top"><a href="http://{{ domain }}{{ blog.get_permanent_url }}" class="event_title">{{ blog.main_title|safe }}</a></td>
</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>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endif %}
<!-- Ссылки на соцсети -->
<table width="100%" style="background-color: #ffffff; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;">
<tr>
<td>
<table border="0" cellpadding="0" style="width: 600px; margin: 0 auto;">
<tr>
<td align="center" style="width: 240px; font-family: Arial, sans-serif; font-size: 17px; font-weight: bold; color: #333333; text-transform: uppercase;">{% trans "Следуйте за нами" %}:
</td>
<td align="center" style="padding-top: 20px; padding-bottom: 20px;">
<a href="https://instagram.com/expomap/" style="text-decoration: none;"><img src="cid:instagram" alt=""></a>
<a href="https://www.youtube.com/user/expomaptv" style="text-decoration: none; margin-left: 13px;"><img src="cid:youtube" alt=""></a>
<a href="https://www.facebook.com/Expomap" style="text-decoration: none; margin-left: 13px;"><img src="cid:facebook" alt=""></a>
<a href="http://www.linkedin.com/company/expomap-ru/" style="text-decoration: none; margin-left: 13px;"><img src="cid:linkedin" alt=""></a>
<a href="http://vk.com/expomap" style="text-decoration: none; margin-left: 13px;"><img src="cid:vk" alt=""></a>
<a href="https://twitter.com/expomap_ru" style="text-decoration: none; margin-left: 13px;"><img src="cid:twitter" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
<!-- Управление подпиской -->
<table width="600px; margin: 0 auto;">
<tr>
<td align="center" style="text-align: center; font-family: Arial, sans-serif; color: #333333; font-size: 17px; font-weight: bold; text-transform: uppercase; padding-top: 35px; padding-bottom: 20px;">{% trans "Управление подпиской:" %}</td>
</tr>
<tr>
<td align="center" style="font-family: Arial, sans-serif; color: #999999; font-size: 13px; line-height: 19px; padding-left: 30px; padding-right: 30px; padding-bottom: 20px;">{% trans "Вы можете настроить включение различных блоков информации в свое письмо, выбратьфильтры по темам, странам и городам, а также выбрать комфортную периодичность получения писем." %}</td>
</tr>
<tr>
<td align="center" style="padding-bottom: 35px; border-bottom: 1px solid #f3f3f3;">
<a href="{% if uidb36 and token %}http://{{ domain }}{% url 'newsletter-authmailingsettings' uidb36=uidb36 token=token %}{% endif %}" 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>
<!-- Thanks -->
<table style="width: 100%; background-color: #ffffff;">
<tr>
<td style="padding-top: 26px; padding-bottom: 26px; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3">
<table style="width: 600px; margin: 0 auto;">
<tr>
<td align="center" style="width: 50%; border-right: 1px solid #ff6900;">
<table>
<tr>
<td style="padding-bottom: 26px;"><img src="cid:site_logo" alt=""></td>
</tr>
<tr>
<td style="font-family: Arial, sans-serif; font-size: 18px; color: #333333"> {% trans "Хорошего Вам дня!" %} </td>
</tr>
</table>
</td>
<td style="padding-left: 20px; padding-right: 20px;">
<table>
<tr>
<td style="font-family: Arial, sans-serif; color: #333333; font-size: 14px; line-height: 1.5; padding-top: 10px;">
{% trans "Поисковик деловых событий" %} <br>
<a href="#" style="color: #ff6600;">expomap.ru</a> <br>
<a href="#" style="color: #ff6600;">mail@expomap.ru</a>
</td>
</tr>
<tr>
<td style="font-family: Arial, sans-serif; color: #333333; font-size: 14px; line-height: 1.5; padding-bottom: 10px;">
{% trans "По вопросам участия в выставках звоните" %}: <br>
+7 (499) 999 -12-07
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
<!-- Menu -->
<table style="width: 100%; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;">
<tr>
<td style="font-size: 15px;color: #666666;">
<table style="width: 600px; margin: 0 auto;">
<tr>
<td style="padding-top: 15px; padding-bottom: 15px; padding-left: 15px;" align="center"><a href="http://{{ domain }}/expo/" style="font-size: 15px;color: #666666; text-decoration: none;">{% trans "Выставки" %}</a></td>
<td>/</td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center"><a href="http://{{ domain }}/conference/" style="font-size: 15px;color: #666666; text-decoration: none;">{% trans "Конференции" %}</a></td>
<td>/</td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center"><a href="http://{{ domain }}/service/participation/" style="font-size: 15px;color: #ff6600; text-decoration: none;">{% trans "Участие в выставках" %}</a></td>
<td>/</td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center"><a href="http://{{ domain }}/news/" style="font-size: 15px;color: #666666; text-decoration: none;">{% trans "Новости" %}</a></td>
<td>/</td>
<td style="padding-top: 15px; padding-bottom: 15px; padding-right: 15px;" align="center"><a href="http://{{ domain }}/blogs/" style="font-size: 15px;color: #666666; text-decoration: none;">{% trans "Статьи" %}</a></td>
</tr>
</table>
</td>
</tr>
</table>
<!-- footer -->
<table style="width: 100%; background-color: #ffffff; border-top: 1px solid #f3f3f3;">
<tr>
<td style="padding-top: 35px; padding-left: 20px; padding-right: 20px; font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;" align="center">{% trans "Вы получили это письмо, так как подписаны на рассылку" %} <a href="#" style="color: #ff6600;">https://www.expomap.ru</a></td>
</tr>
<tr>
<td align="center" style="font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;"><a href="#" style="color: #ff6600;">{% trans "Переслать другу" %}</a> {% trans "или" %} <a href="#" style="color: #ff6600;">{% trans "Отписаться" %}</a></td>
</tr>
<tr>
<td align="center" style="padding-bottom: 30px; font-family: Arial, sans-serif; font-size: 13px; color: #999999;">&copy; 2008 — 2016 Expomap.ru</td>
</tr>
</table>
{% comment %}
</td>
</tr>
</table>
{% endcomment %}
</td>
</tr>
</table>

@ -37,6 +37,35 @@
text-decoration: none;
}
.event_image{
display: block;
border: 1px solid #eaeaea;
text-align: center;
width: 110px;
height: 110px;
background-color: #ffffff;
line-height: 108px;
}
.event_image img{
vertical-align: middle;
}
.foreign_image{
display: block;
width: 128px;
height: 128px;
line-height: 128px;
background-color: #fff;
border: 1px solid #eaeaea;
text-align: center;
}
.foreign_image img{
display: inline-block;
vertical-align: middle;
}
@media screen and (max-width: 600px) {
.mobile100 {width:100% !important;}
}
@ -72,7 +101,7 @@
<td align="left" valign="top" style="padding:0px 0px 0px 0px; background-color: #ffffff; border-bottom: 1px solid #f3f3f3">
<table border="0" cellspacing="0" cellpadding="0" style="width: 600px; margin: 0 auto;">
<tr>
<td align="left" style="padding: 13px 0px 13px 24px;">
<td align="left" style="padding: 13px 0px 13px 0px;">
<img src="{% static 'newsletter/images/logo1.png' %}" alt="">
</td>
@ -90,17 +119,17 @@
<!-- recommendation -->
<table border="0" cellspacing="0" style="width:100%;">
<tr>
<td align="center" style="padding:30px 23px 40px 23px;">
<td align="center" style="padding:45px 0px 40px 0px;">
<table style="width: 100%;">
<tr>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 15px;">{% trans "Самые важные события для вас" %}</td>
</tr>
</table>
<table>
<table style="width: 600px; margin: 0 auto;">
<tr>
<td valign="top" style="width: 225px;">
{% thumbnail obj.get_logo '281x225' as im %}
{% thumbnail obj.get_logo '281' as im %}
<a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img src="{{ im.url }}"/></a>
{% endthumbnail %}
</td>
@ -115,7 +144,7 @@
</tr>
<tr>
<td style="color: #333333; font-size: 25px; font-weight: bold; padding: 3px 0px 3px 0px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}">{{ 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: bold; text-decoration: none;">{{ obj.name|safe }}</a></td>
</tr>
<tr>
@ -132,7 +161,7 @@
</tr>
<tr>
<td style="color: #999999; font-size: 13px; padding: 3px 0px 3px 0px;">
<td style="color: #999999; font-size: 13px; padding: 3px 0px 15px 0px;">
{% for tag in obj.tags %}
<a href="http://{{ domain }}{{ obj.catalog }}tag/{{ tag.url }}" class="tag">{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
{% endfor %}
@ -141,7 +170,7 @@
<tr>
<td align="center" 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 "посмотреть Подробнее" %}</a>
<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="{% static 'newsletter/images/white_arrow.png' %}"></a>
</td>
</tr>
</table>
@ -156,68 +185,77 @@
{% if moscow %}
<!-- Moscow -->
<table border="0" cellspacing="0" style="width:100%;">
<table border="0" cellspacing="0" style="width:100%; background-color: #ffffff; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;">
<tr>
<td style="background-color: #ffffff; padding: 30px 23px 40px 23px;">
<table style="width: 100%;">
<td>
<table border="0" cellspacing="0" style="width: 600px; margin: 0 auto;">
<tr>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 15px;">{% trans "в москве" %}</td>
</tr>
</table>
{% for sqs_obj in moscow %}
{% with sqs_obj.object as obj %}
<table style="width: 100%; margin-top: 15px;">
<tr {% if not forloop.last %}style="border-bottom: 1px solid #eaeaea;"{% endif %}>
<td valign="top" style="width: 110px;">
{% thumbnail obj.get_logo '109x114' as im %}
<a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img style="border: 1px solid #eaeaea;" src="{{ im.url }}"/></a>
{% endthumbnail %}
</td>
<td style="padding-left: 20px;">
<td style="padding: 30px 0px 40px 0px;">
<table style="width: 100%;">
<tr>
<td style="color: #333333; text-transform: uppercase; font-size: 17px; font-weight: bold; padding-bottom: 5px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}">{{ 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;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
</td>
</tr>
<tr>
<td style="color: #cc3399; font-size: 14px; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="{% static 'newsletter/images/marker.png' %}" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
</tr>
<tr>
<td style="padding-bottom: 15px; padding-top: 10px;">
<a href="http://{{ domain }}{{ obj.get_permanent_url }}" style="display: inline-block; padding: 7px 20px 7px 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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
</td>
</tr>
<tr>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 15px;">{% trans "в москве" %}</td>
</tr>
</table>
{% for sqs_obj in moscow %}
{% with sqs_obj.object as obj %}
<table style="width: 100%; margin-top: 20px;">
<tr {% if not forloop.last %}style="border-bottom: 1px solid #eaeaea;"{% endif %}>
<td valign="top" style="width: 110px;">
<a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_image">
{% thumbnail obj.get_logo '90x90' as im %}
<img style="" src="{{ im.url }}"/>
{% endthumbnail %}
</a>
</td>
<td style="padding-left: 20px; width: 470px;">
<table style="width: 100%;">
<tr>
<td style="padding-bottom: 5px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_title">{{ 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: 7px;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
</td>
</tr>
<tr>
<td style="color: #cc3399; font-size: 14px; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="{% static 'newsletter/images/marker.png' %}" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
</tr>
<tr>
<td style="padding-bottom: 20px; padding-top: 10px;">
<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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endwith %}
{% endfor %}
<table style="width: 100%;">
<tr>
<td align="center" style="padding-top: 25px;">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ moscow_filter_url }}" style="display: inline-block; padding: 8px 23px 7px 29px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "посмотреть все" %}<img src="{% static 'newsletter/images/white_arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endwith %}
{% endfor %}
<table style="width: 100%;">
<tr>
<td align="center">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ moscow_filter_url }}" style="display: inline-block; padding: 7px 20px 7px 20px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "посмотреть все" %}<img src="{% static 'newsletter/images/white_arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endif %}
@ -228,63 +266,88 @@
<!-- RF -->
<table border="0" cellspacing="0" style="width:100%;">
<tr>
<td style="background-color: #f8f8f6; padding: 30px 23px 40px 23px;">
<table style="width: 100%;">
<td style="background-color: #f8f8f6; padding: 30px 0px 40px 0px;">
<table border="0" cellspacing="0" style="width: 600px; margin: 0 auto;">
<tr>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 15px;">{% trans "В России" %}</td>
</tr>
</table>
{% for sqs_obj in russia %}
{% with sqs_obj.object as obj %}
<table style="width: 100%; margin-top: 15px;">
<tr {% if not forloop.last %}style="border-bottom: 1px solid #eaeaea;"{% endif %}>
<td valign="top">
{% thumbnail obj.get_logo '109x114' as im %}
<a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img style="border: 1px solid #eaeaea;" src="{{ im.url }}"/></a>
{% endthumbnail %}
</td>
<td style="padding-left: 20px;">
<td>
<table style="width: 100%;">
<tr>
<td class="color{{ forloop.counter }}" style="font-size: 14px; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="/static/newsletter/images/m{{ forloop.counter }}.png" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
</tr>
<tr>
<td style="color: #333333; text-transform: uppercase; font-size: 17px; font-weight: bold; padding-bottom: 5px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></td>
</tr>
<tr>
<td style="font-size: 14px; color: #999999; padding-bottom: 5px;">{{ obj.main_title|safe }}</td>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 15px;">{% trans "В России" %}</td>
</tr>
<tr>
<td style="color: #3399cc; font-size: 14px; padding-bottom: 3px;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
</table>
{% for sqs_obj in russia %}
{% with sqs_obj.object as obj %}
<table style="width: 100%; margin-top: 18px;">
<tr {% if not forloop.last %}style="border-bottom: 1px solid #eaeaea;"{% endif %}>
<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="{{ im.url }}"/>
{% endthumbnail %}
</a>
</td>
<td style="padding-left: 20px; width: 470px;">
<table style="width: 100%;">
<tr>
{% if forloop.first %}
<td class="color3" style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="/static/newsletter/images/m3.png" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
{% elif forloop.counter == 2 %}
<td class="color2" style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="/static/newsletter/images/m2.png" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
{% elif forloop.counter == 3 %}
<td class="color1" style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px;">
{% if obj.get_event_place_name %}
<img src="/static/newsletter/images/m1.png" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
{% endif %}
</tr>
<tr>
<td style="padding-bottom: 5px;"><a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_title">{{ 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;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
</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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endwith %}
{% endfor %}
<table style="width: 100%;">
<tr>
<td style="padding-bottom: 15px; padding-top: 10px;">
<a href="#" style="display: inline-block; padding: 7px 20px 7px 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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
<td align="center" style="padding-top: 25px;">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ russia_filter_url }}" style="display: inline-block; padding: 8px 23px 7px 29px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "все события" %}<img src="{% static 'newsletter/images/white_arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
{% endwith %}
{% endfor %}
<table style="width: 100%;">
<tr>
<td align="center">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ russia_filter_url }}" style="display: inline-block; padding: 7px 20px 7px 20px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "все события" %}<img src="{% static 'newsletter/images/white_arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
@ -297,62 +360,70 @@
{% if foreign %}
<!-- foreign -->
<table border="0" cellspacing="0" style="width:100%; background-color: #fff;">
<tr>
<td align="center" style="padding-top: 45px; padding-bottom: 30px; font-family: Arial, sans-serif; font-size: 25px; color: #333333; text-transform: uppercase; font-weight: bold;">{% trans "За рубежом" %}</td>
</tr>
<table border="0" cellspacing="0" style="width:100%; background-color: #fff; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;">
<tr>
<td>
<table style="width: 100%;">
<table style="width: 600px; margin: 0 auto;">
<tr>
<td align="center" style="padding-top: 45px; padding-bottom: 30px; font-family: Arial, sans-serif; font-size: 25px; color: #333333; text-transform: uppercase; font-weight: bold;">{% trans "За рубежом" %}</td>
</tr>
<tr>
{% for sqs_obj in foreign %}
{% with sqs_obj.object as obj %}
<td valign="top">
<table style="width: 130px; margin: 0 auto;">
<tr>
<td style="padding-bottom: 15px;">
{% thumbnail obj.get_logo '109x114' as im %}
<a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img style="border: 1px solid #eaeaea;" src="{{ im.url }}"/></a>
{% endthumbnail %}
</td>
</tr>
<tr>
<td class="color{{ forloop.counter }}" style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px;">
{% if obj.get_event_place_name %}
<img src="{{ STATIC_URL }}newsletter/images/m{{ forloop.counter }}.png" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
</tr>
<tr>
<td style="font-family: Arial, sans-serif; color: #333333; font-size: 17px; font-weight: bold; padding-bottom: 10px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></td>
</tr>
<tr>
<td style="color: #3399cc; font-size: 12px; padding-bottom: 5px;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
</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">{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
<td>
<table style="width: 100%;">
<tr>
{% for sqs_obj in foreign %}
{% with sqs_obj.object as obj %}
<td valign="top">
<table style="width: 130px; margin: 0 auto;">
<tr>
<td style="padding-bottom: 15px; text-align: center;">
<a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="foreign_image">
{% thumbnail obj.get_logo '120x120' as im %}
<img src="{{ im.url }}"/>
{% endthumbnail %}
</a>
</td>
</tr>
<tr>
<td class="color{{ forloop.counter }}" style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px;">
{% if obj.get_event_place_name %}
<img src="{{ STATIC_URL }}newsletter/images/m{{ forloop.counter }}.png" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>
</tr>
<tr>
<td style="padding-bottom: 10px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_title">{{ obj.name|safe }}</a></td>
</tr>
<tr>
<td style="color: #3399cc; font-size: 13px; line-height: 14px; padding-bottom: 5px;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; vertical-align: middle; margin-top: -2px; margin-right: 4px;">
{{ obj.get_dates }}
</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">{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
{% endfor %}
</td>
</tr>
</table>
</td>
{% endwith %}
{% endfor %}
</td>
</tr>
</table>
</tr>
</table>
</td>
{% endwith %}
{% endfor %}
</tr>
</table>
</td>
</tr>
<tr>
<td align="center" style="padding-top: 30px; padding-bottom: 40px;">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ foreign_filter_url }}" style="display: inline-block; padding: 7px 20px 7px 20px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "Посмотреть все" %}<img src="{% static 'newsletter/images/white_arrow.png' %}" alt=""></a>
<tr>
<td align="center" style="padding-top: 30px; padding-bottom: 40px;">
<a href="http://{{ domain }}{% url 'events:main' %}?{{ foreign_filter_url }}" style="display: inline-block; padding: 8px 23px 7px 29px; border: 1px solid #ff6600; color: #ffffff; background-color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "Посмотреть все" %}<img src="{% static 'newsletter/images/white_arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
</td>
</tr>
</table>
@ -393,11 +464,11 @@
</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|striptags }}</td>
<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>
<a href="http://{{ domain }}/news/" style="display: inline-block; padding: 7px 20px 7px 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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
<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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
@ -445,7 +516,7 @@
<tr>
<td>
<a href="http://{{ domain }}{{ blog.get_permanent_url }}" style="display: inline-block; padding: 7px 20px 7px 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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
<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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
</td>
</tr>
</table>
@ -469,11 +540,11 @@
<td align="center" style="padding-top: 20px; padding-bottom: 20px;">
<a href="#" style="text-decoration: none;"><img src="{% static 'newsletter/images/instagram.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 10px;"><img src="{% static 'newsletter/images/youtube.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 10px;"><img src="{% static 'newsletter/images/facebook.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 10px;"><img src="{% static 'newsletter/images/linkedin.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 10px;"><img src="{% static 'newsletter/images/vk.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 10px;"><img src="{% static 'newsletter/images/twitter.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 13px;"><img src="{% static 'newsletter/images/youtube.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 13px;"><img src="{% static 'newsletter/images/facebook.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 13px;"><img src="{% static 'newsletter/images/linkedin.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 13px;"><img src="{% static 'newsletter/images/vk.png' %}" alt=""></a>
<a href="#" style="text-decoration: none; margin-left: 13px;"><img src="{% static 'newsletter/images/twitter.png' %}" alt=""></a>
</td>
</tr>
</table>
@ -494,7 +565,7 @@
<tr>
<td align="center" style="padding-bottom: 35px; border-bottom: 1px solid #f3f3f3;">
<a href="{% if uidb36 and token %}http://{{ domain }}{% url 'newsletter-authmailingsettings' uidb36=uidb36 token=token %}{% endif %}" style="display: inline-block; padding: 7px 20px 7px 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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
<a href="{% if uidb36 and token %}http://{{ domain }}{% url 'newsletter-authmailingsettings' uidb36=uidb36 token=token %}{% endif %}" 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="{% static 'newsletter/images/arrow.png' %}" alt=""></a>
</td>
</tr>
</table>

@ -120,7 +120,7 @@ MIDDLEWARE_CLASSES += ('core_utils.middleware.SpacelessMiddleware',)
class SpacelessMiddleware(object):
""" trim spaces between tags if not in DEBUG """
def process_response(self, request, response):
if response.get('Content-Type').startswith('text/html'):
if response.get('Content-Type', '').startswith('text/html'):
cont = strip_spaces_between_tags(response.content)
response.content = re.sub(r'^\s+<','<', cont)
return response

Loading…
Cancel
Save