Merge branch 'master' of git.general-servers.com:expomap/expomap into develop

templates/client/includes/article/news_logo_in_catalog.html

@@ -0,0 +1,10 @@
+{% load static %}
+{% load thumbnail %}
+
+{% if obj.logo %}
+    {% thumbnail obj.logo "40x40" format="PNG"  as im %}
+        <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" class="pic" alt="">
+    {% endthumbnail %}
+{% else %}
+    <img src="{% static 'client/img/no-logo.png' %}" class="pic" alt="" />
+{% endif %}

templates/client/includes/news.html

@@ -10,7 +10,7 @@
             <li>
                 <a href="{{ item.get_permanent_url }}">
                     <span class="nl-pict">
-                        {% include 'client/includes/article/news_on_main_logo.html' with obj=item %}
+                        {% include 'client/includes/article/news_logo_in_catalog.html' with obj=item %}
                     </span>
                     <span class="nl-body">
                         <span class="nl-text">{{ item.main_title }}</span>