m

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:

emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html

@@ -612,7 +612,7 @@
                                         <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="www.expomap.ru" style="color: #ff6600;">expomap.ru</a> <br>
                                                 <a href="#" style="color: #ff6600;">mail@expomap.ru</a>
                                             </td>
                                         </tr>
@@ -666,7 +666,7 @@
                     </tr>
                 {% else %}
                     <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 "Вы получили это письмо, так как его переслал ваш друг" %} {{ contact.email }}. <a href="#" style="color: #ff6600;">https://www.expomap.ru</a></td>
+                        <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 "Вы получили это письмо, так как его переслал ваш друг" %} {{ contact.email }}. <a href="www.expomap.ru" style="color: #ff6600;">https://www.expomap.ru</a></td>
                     </tr>
                 {% endif %}
                 <tr>

templates/client/includes/article/blog_list.html

@@ -4,7 +4,7 @@
 		{% for blog in object_list %}
 			<div class="cl-item">
 				<div class="acticle_list_big">
-					{% include 'includes/article/article_preview.html' with obj=blog %}
+					{% include 'client/includes/article/article_preview.html' with obj=blog %}
 					<h3><a href="{{ blog.get_permanent_url }}" title="">{{ blog.main_title }}</a></h3>
 					{{ blog.preview|safe }}
 					<strong><span>{{ blog.publish_date|date:"d E Y" }}</span>{% if blog.tag.all.exists %}{% include 'includes/article_tags.html' with obj=blog %}{% endif %}</strong>

templates/client/includes/article/news_list.html

@@ -4,7 +4,7 @@
 		<div class="cl-item">
 			<div class="acticle_list">
 				<a href="{{ news.get_permanent_url }}" title="">
-					{% include 'includes/article/news_preview.html' with obj=news %}</a>
+					{% include 'client/includes/article/news_preview.html' with obj=news %}</a>
 				<h3><a href="{{ news.get_permanent_url }}" title="">{{ news.main_title|safe  }}</a></h3>
 				{{ news.preview|safe }}
 				<strong><span>{{ news.publish_date|date:"d E Y" }}</span>{% with event=news.get_event %}{% if event %}<a href="{{ event.get_permanent_url }}" title=""><b>{{ event.name }}</b></a>{% endif %}{% endwith %}</strong>