From 320c2165e53bb619eb8b7709f9fe4c12c9ecbed5 Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Mon, 12 Dec 2016 18:59:58 +0200 Subject: [PATCH 01/18] email fix --- .../newsletter/templates/newsletter/AutomaticEmail_v2.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index 2ee7cfec..fc684fba 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -20,14 +20,14 @@ 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;} + a[class*="tag"]{font-size: 13px; color: #999999;} + a[class*="tag"]:hover{text-decoration: none;} .color1{color: #33ccff;} .color2{color: #cc3399;} .color3{color: #99cc66;} .color4{color: #ff6600;} - .event_title{ + a[class*="event_title"]{ font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; From 83494e66ad742ede896c54e2e4449779eff05c7f Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Mon, 12 Dec 2016 19:19:49 +0200 Subject: [PATCH 02/18] email fix --- .../templates/newsletter/AutomaticEmail_v2.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index fc684fba..5a881b99 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -144,7 +144,8 @@ - {{ obj.name|safe }} + + {{ obj.name|safe }} @@ -210,7 +211,7 @@ - + @@ -314,7 +315,7 @@ - + @@ -394,7 +395,7 @@ - + @@ -406,7 +406,7 @@ From bfb41fe6366f12a5272fdafc7483a3b168b3c344 Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Tue, 13 Dec 2016 08:50:21 +0200 Subject: [PATCH 04/18] email fixes --- .../newsletter/AutomaticEmail_v2.html | 876 +++++++++--------- 1 file changed, 427 insertions(+), 449 deletions(-) diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index 1de5fd48..ac67078d 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -86,577 +86,555 @@
{{ obj.name|safe }}{{ obj.name|safe }}
{{ obj.name|safe }}{{ obj.name|safe }}
{{ obj.name|safe }}{{ obj.name|safe }}
From 8a1691f5e3bddda33d0d2dc73c4d181cc89136df Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Tue, 13 Dec 2016 08:41:56 +0200 Subject: [PATCH 03/18] email fixes --- .../newsletter/templates/newsletter/AutomaticEmail_v2.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index 5a881b99..1de5fd48 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -164,7 +164,7 @@
{% for tag in obj.tags %} - {{ tag.name }}{% if not forloop.last %},{% endif %} + {{ tag.name }}{% if not forloop.last %},{% endif %} {% endfor %}
{% for tag in obj.tags %} - {{ tag.name }}{% if not forloop.last %},{% endif %} + {{ tag.name }}{% if not forloop.last %},{% endif %} {% endfor %}
- - {% comment %} - - + +
- + +
- {% endcomment %} + + + + + + + +
+ + + +
+
- - + {% if recommended %} + {% with recommended.object as obj %} + +
+ +
+ - +
- - - - - - -
- - - -
- 		{% trans "Самые важные события для вас" %}
- {% if recommended %} - {% with recommended.object as obj %} - - +
- + +
- - - - -
{% trans "Самые важные события для вас" %}
- - - - + -
+ {# {% thumbnail obj.get_logo '281' as im %}#} - + {# {% endthumbnail %}#} - - - - - + +
- - {{ obj.get_event_place_name }} -
+ + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - -
+ + {{ obj.get_event_place_name }} +
- {{ obj.name|safe }}
+ {{ obj.name|safe }}
- - {{ obj.get_dates_v2 }}, {{ obj.get_event_place_name }} -
+ + {{ obj.get_dates_v2 }}, {{ obj.get_event_place_name }} +
- {{ obj.main_title|safe }} -
+ {{ obj.main_title|safe }} +
- {% for tag in obj.tags %} - {{ tag.name }}{% if not forloop.last %},{% endif %} - {% endfor %} -
+ {% for tag in obj.tags %} + {{ tag.name }}{% if not forloop.last %},{% endif %} + {% endfor %} +
- {% trans "посмотреть Подробнее" %} -
+
+ {% trans "посмотреть Подробнее" %}
- {% endwith %} - {% endif %} +
+ {% endwith %} + {% endif %} - {% if moscow %} - - + {% if moscow %} + +
+ +
+ - + + +
- + -
+ - +
- - - - -
{% trans "в москве" %}
- {% for sqs_obj in moscow %} - {% with sqs_obj.object as obj %} - - - + +
- + {% trans "в москве" %}
+ {% for sqs_obj in moscow %} + {% with sqs_obj.object as obj %} + + + - - -
+ {# {% thumbnail obj.get_logo '90x90' as im %}#} - + {# {% endthumbnail %}#} - - - - - - - - - - - - - - - - - - - - - - -
{{ obj.name|safe }}
{{ obj.main_title|safe }}
- - {{ obj.get_dates_v2 }} -
- {% if obj.get_event_place_name %} - - {{ obj.get_event_place_name }} - {% endif %} -
- {% trans "подробнее" %} -
-
- {% endwith %} - {% endfor %} + + 		- - - + + + + + + + + + + + + + + + + + + +
- {% trans "посмотреть все" %} -
{{ obj.name|safe }}
{{ obj.main_title|safe }}
+ + {{ obj.get_dates_v2 }} +
+ {% if obj.get_event_place_name %} + + {{ obj.get_event_place_name }} + {% endif %} +
+ {% trans "подробнее" %} +
+ {% endwith %} + {% endfor %} + + + + +
+ {% trans "посмотреть все" %} +
- {% endif %} +
+ {% endif %} - {% if russia %} - - + {% if russia %} + +
+ +
+ - + +
- +
+ - + +
+ {% trans "В России" %}
+ {% for sqs_obj in russia %} + {% with sqs_obj.object as obj %} + + + + + +
+ +{# {% thumbnail obj.get_logo '100x100' as im %}#} + +{# {% endthumbnail %}#} + + - + {% if forloop.first %} + + {% elif forloop.counter == 2 %} + + {% elif forloop.counter == 3 %} + + {% endif %} -
{% trans "В России" %} + {% if obj.get_event_place_name %} + + {{ obj.get_event_place_name }} + {% endif %} + + {% if obj.get_event_place_name %} + + {{ obj.get_event_place_name }} + {% endif %} + + {% if obj.get_event_place_name %} + + {{ obj.get_event_place_name }} + {% endif %} +
- {% for sqs_obj in russia %} - {% with sqs_obj.object as obj %} - - - - + + + + + + + + + -
- -{# {% thumbnail obj.get_logo '100x100' as im %}#} - -{# {% endthumbnail %}#} - - - - - {% if forloop.first %} - - {% elif forloop.counter == 2 %} - - {% elif forloop.counter == 3 %} - - {% endif %} - - - - - - - - - - - - - - - - - -
- {% if obj.get_event_place_name %} - - {{ obj.get_event_place_name }} - {% endif %} - - {% if obj.get_event_place_name %} - - {{ obj.get_event_place_name }} - {% endif %} - - {% if obj.get_event_place_name %} - - {{ obj.get_event_place_name }} - {% endif %} -
{{ obj.name|safe }}
{{ obj.main_title|safe }}
- - {{ obj.get_dates_v2 }} -
- {% trans "подробнее" %} -
+ +
{{ obj.name|safe }}
{{ obj.main_title|safe }}
+ + {{ obj.get_dates_v2 }}
- {% endwith %} - {% endfor %} - -
- {% trans "все события" %} + + {% trans "подробнее" %}
+
+ {% endwith %} + {% endfor %} + + +
+ {% trans "все события" %}
+
- {% endif %} +
+ {% endif %} - {% if foreign %} - - + {% if foreign %} + +
+ +
+ - + +
- - - - + + + + + + + +
{% trans "За рубежом" %}
{% trans "За рубежом" %}
+ - + {% endwith %} + {% endfor %}
- - - {% for sqs_obj in foreign %} - {% with sqs_obj.object as obj %} - - - - - + +
- - - - {% endwith %} + + + + + + + + + + + + + + -
- + {% for sqs_obj in foreign %} + {% with sqs_obj.object as obj %} + + + + - - - - - - - - - - - - - -
+ {# {% thumbnail obj.get_logo '120x120' as im %}#} - + {# {% endthumbnail %}#} - -
- {% if obj.get_event_place_name %} - - {{ obj.get_event_place_name }} - {% endif %} -
{{ obj.name|safe }}
- - {{ obj.get_dates_v2 }} -
- {% for tag in obj.tags %} - {{ tag.name }}{% if not forloop.last %},{% endif %} - {% endfor %} -
-
+ {% if obj.get_event_place_name %} + + {{ obj.get_event_place_name }} + {% endif %} +
{{ obj.name|safe }}
+ + {{ obj.get_dates_v2 }} +
+ {% for tag in obj.tags %} + {{ tag.name }}{% if not forloop.last %},{% endif %} {% endfor %} -
-
- {% trans "Посмотреть все" %} +
+ {% trans "Посмотреть все" %} +
- {% endif %} +
+ {% endif %} {# -------------- БАНЕР --------------- #} - {% if newsletter.banner %} + {% if newsletter.banner %} {# {% thumbnail newsletter.banner '129x600' as im %}#} - + {# {% endthumbnail %}#} - {% endif %} + {% endif %} - {% if news %} - - - - From 840b437fce0045bb46c504f73ec1fb39e56466fd Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Tue, 13 Dec 2016 09:19:12 +0200 Subject: [PATCH 05/18] email fixes --- .../newsletter/AutomaticEmail_v2.html | 89 +++++++++---------- 1 file changed, 42 insertions(+), 47 deletions(-) diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index ac67078d..c00d3810 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -270,7 +270,7 @@
- - - - - - + +
{% trans "Новости событий" %}
+ {% if news %} + + + + + +
+ + + + + + + - - -
{% trans "Новости событий" %}
{# {% thumbnail news.logo "272" as im %}#} - + {# {% endthumbnail %}#} - - - - - - - - - - - - - - -
{{ news.main_title|safe }}
- - {{ news.publish_date|date:"d E Y" }} -
{{ news.preview|safe|truncatewords_html:25 }}
- {% trans "Все новости" %} -
-
+ 		+ + + + + + -
{{ news.main_title|safe }}
+ + {{ news.publish_date|date:"d E Y" }}
- {% endif %} - -
- - {% if blog %} - - - {% comment %} - + - {% endcomment %} + + + +
{% trans "Новенькое из блога" %}{{ news.preview|safe|truncatewords_html:25 }}
+ {% trans "Все новости" %} +
+
+
+ {% endif %} +
+ + {% if blog %} + + + + + + +
+ - + +
- - - - - - + + + + -
{% trans "Новенькое из блога" %}
+ {% trans "Новенькое из блога" %}
{# {% thumbnail blog.logo "272" as im %}#} - + {# {% endthumbnail %}#} - - - - - + +
{{ blog.main_title|safe }}
+ + + + - - - + + + - - - -
{{ blog.main_title|safe }}
{{ blog.preview|safe|striptags }}
{{ blog.preview|safe|striptags }}
- {% trans "посмотреть Подробнее" %} -
+
+ {% trans "посмотреть Подробнее" %}
- {% endif %} +
+ {% endif %} - - - - - -
- - - - - - -
{% trans "Следуйте за нами" %}: - - - - - - - -
-
+ + + + + +
+ + + + + + +
{% trans "Следуйте за нами" %}: + + + + + + + +
+
- - - - - + +
{% trans "Управление подпиской:" %}
+ + + - - - + + + - - - -
{% trans "Управление подпиской:" %}
{% trans "Вы можете настроить включение различных блоков информации в свое письмо, выбратьфильтры по темам, странам и городам, а также выбрать комфортную периодичность получения писем." %}
{% trans "Вы можете настроить включение различных блоков информации в свое письмо, выбратьфильтры по темам, странам и городам, а также выбрать комфортную периодичность получения писем." %}
- {% trans "Настроить" %} -
+
+ {% trans "Настроить" %} +
- - + +
+ + + +
+ -
- + - -
+ - - - + +
- - - - - - - - -
{% trans "Хорошего Вам дня!" %}
- 		- - - - + + - - - -
- {% trans "Поисковик деловых событий" %}
- expomap.ru
- mail@expomap.ru -
- {% trans "По вопросам участия в выставках звоните" %}:
- +7 (499) 999 -12-07 -
-
{% trans "Хорошего Вам дня!" %}
+ 		+ + + + - -
+ {% trans "Поисковик деловых событий" %}
+ expomap.ru
+ mail@expomap.ru +
- - + + +
- - - - - - - - - - - - -
{% trans "Выставки" %}/{% trans "Конференции" %}/{% trans "Участие в выставках" %}/{% trans "Новости" %}/{% trans "Статьи" %}
+
+ {% trans "По вопросам участия в выставках звоните" %}:
+ +7 (499) 999 -12-07 +
+
- - - - - - - - - - - -
{% trans "Вы получили это письмо, так как подписаны на рассылку" %} https://www.expomap.ru
{% trans "Переслать другу" %} {% trans "или" %} {% trans "Отписаться" %}
© 2008 — 2016 Expomap.ru
- - {% comment %} - + + + + +
+ + + + + + + + + + + + +
{% trans "Выставки" %}/{% trans "Конференции" %}/{% trans "Участие в выставках" %}/{% trans "Новости" %}/{% trans "Статьи" %}
+ + + + + + + + + + + +
{% trans "Вы получили это письмо, так как подписаны на рассылку" %} https://www.expomap.ru
{% trans "Переслать другу" %} {% trans "или" %} {% trans "Отписаться" %}
© 2008 — 2016 Expomap.ru
- {% endcomment %}
{% for sqs_obj in russia %} {% with sqs_obj.object as obj %} - +
+ +
@@ -424,57 +424,52 @@ {# -------------- БАНЕР --------------- #} {% if newsletter.banner %} -{# {% thumbnail newsletter.banner '129x600' as im %}#} - -{# {% endthumbnail %}#} + {% endif %} {% if news %} - - - - + +
- + +
- - - - - -
{% trans "Новости событий" %}
-{# {% thumbnail news.logo "272" as im %}#} + + + + + + + + - - -
{% trans "Новости событий" %}
-{# {% endthumbnail %}#} - - - - - - - - - - - - - - -
{{ news.main_title|safe }}
- - {{ news.publish_date|date:"d E Y" }} -
{{ news.preview|safe|truncatewords_html:25 }}
- {% trans "Все новости" %} -
-
-
+ 		+ + + + + + + + + + + + + +
{{ news.main_title|safe }}
+ + {{ news.publish_date|date:"d E Y" }} +
{{ news.preview|safe|truncatewords_html:25 }}
+ {% trans "Все новости" %} +
+
+
+
{% endif %} -
- {% if blog %} @@ -541,7 +536,7 @@ -
+
@@ -559,7 +554,7 @@ -
{% trans "Управление подпиской:" %}
+
@@ -589,7 +584,7 @@
{% trans "По вопросам участия в выставках звоните" %}:
- +7 (499) 999 -12-07 + +7 (499) 999-12-07
From c21fda465758b9e7ff2dd27d8f881b06cf3dd00e Mon Sep 17 00:00:00 2001 From: ya_dim4ik Date: Tue, 13 Dec 2016 09:34:16 +0200 Subject: [PATCH 06/18] email fixes --- .../newsletter/AutomaticEmail_v2.html | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index c00d3810..db6dfe9f 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -1,11 +1,4 @@ {% load i18n %} -{#{% load static %}#} -{#{% load thumbnail %}#} - -{# {% trans "ПОСМОТРЕТЬ ВСЕ" %} > #} -{# {% trans "ПОСМОТРЕТЬ ВСЕ" %} > #} -{# {% trans "ПОСМОТРЕТЬ ВСЕ" %} > #} -{# {% trans "НАСТРОИТЬ" %} > #}