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 @@
- | {% trans "Самые важные события для вас" %} |
+ {% trans "Самые важные события для вас" %} |
-
- {# {% endthumbnail %}#}
- |
+
+ {# TODO: Сменить размер картинки на 170x170 #}
+ {# {% endthumbnail %}#}
+ |
- {% if obj.get_event_place_name %}
-
-
-
-
-  |
- {{ obj.get_event_place_name }} |
-
-
- |
-
- {% endif %}
- |
- {{ obj.name|safe }} |
+
+ {{ obj.name|safe }}
+ |
-
-
-
-  |
- {{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %} |
-
-
- |
+
+ {{ obj.main_title|safe }}
+ |
- |
- {{ obj.main_title|safe }}
- |
+
+
+
+  |
+ {{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %} |
+
+
+ |
+ {% comment %}
|
{% for tag in obj.tags %}
@@ -161,6 +152,20 @@
{% endfor %}
|
+ {% endcomment %}
+
+ {% if obj.get_event_place_name %}
+
+
+
+
+  |
+ {{ obj.get_event_place_name }} |
+
+
+ |
+
+ {% endif %}
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 @@
expomap.ru ›
{% trans 'Настройте рассылку от Expomap' %}
+ {% trans 'для' %} {{ request.user }}
@@ -187,46 +188,7 @@
-
-{# {% if not object.subscriber %}#}
-{# #}
-{# #}
-{# {% trans "Вы не являетесь подписчиком. Чтобы подписаться, выберите интересующие Вас данные." %}#}
-{# #}
-{# {% endif %}#}
| | |