diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py
index 12c16c10..85f79411 100644
--- a/emencia/django/newsletter/mailer.py
+++ b/emencia/django/newsletter/mailer.py
@@ -131,7 +131,7 @@ dailymail_attahcments = {
context_attachments_size = {
'recommended': '170x170',
'news': '170x170',
- 'blog': '272x195',
+ 'blog': '170x170',
'moscow': '109x114',
'russia': '109x114',
'foreign': '109x114',
@@ -333,7 +333,10 @@ class NewsLetterSender(object):
def gen_attachment_logo(self, obj=None, prefix='logo_', resize=None, logo=None, **kwargs):
if obj is not None:
- logo = getattr(obj, 'logo')
+ if prefix == 'blog':
+ logo = obj.get_blog_preview2()
+ else:
+ logo = getattr(obj, 'logo')
if not logo:
logo_path = default_storage.path('newsletter/images/no-logo.png')
else:
diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
index f50cf414..f965056f 100644
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
@@ -612,7 +612,7 @@
{% trans "Поисковик деловых событий" %}
- expomap.ru
+ expomap.ru
mail@expomap.ru
|
@@ -666,7 +666,7 @@
{% else %}
- | {% trans "Вы получили это письмо, так как его переслал ваш друг" %} {{ contact.email }}. https://www.expomap.ru |
+ {% trans "Вы получили это письмо, так как его переслал ваш друг" %} {{ contact.email }}. https://www.expomap.ru |
{% endif %}
diff --git a/templates/client/includes/article/blog_list.html b/templates/client/includes/article/blog_list.html
index 64b68bad..b85827af 100644
--- a/templates/client/includes/article/blog_list.html
+++ b/templates/client/includes/article/blog_list.html
@@ -4,7 +4,7 @@
{% for blog in object_list %}
- {% include 'includes/article/article_preview.html' with obj=blog %}
+ {% include 'client/includes/article/article_preview.html' with obj=blog %}
{{ blog.preview|safe }}
{{ blog.publish_date|date:"d E Y" }}{% if blog.tag.all.exists %}{% include 'includes/article_tags.html' with obj=blog %}{% endif %}
diff --git a/templates/client/includes/article/news_list.html b/templates/client/includes/article/news_list.html
index 8171901d..5add00eb 100644
--- a/templates/client/includes/article/news_list.html
+++ b/templates/client/includes/article/news_list.html
@@ -4,7 +4,7 @@