fixed 'Actions and ...'

Guest007 · Feb 23, 2014 · 32ecfba · 32ecfba
1 parent 0d2fde6
commit 32ecfba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/articles/models.py b/articles/models.py
@@ -26,7 +26,7 @@ class Article(models.Model):
     published_at = models.DateField(auto_now_add=True, verbose_name="Date of publication")
     is_active = models.BooleanField(default=False, db_index=True, verbose_name="Active")
     logo = models.ImageField(upload_to='logo/', blank=True, null=True, verbose_name="Logo")
-    card = models.ImageField(upload_to='card/', blank=True, null=True, verbose_name="Card")
+    card = models.ImageField(upload_to='card/', blank=True, null=True, verbose_name="Изображение карты или изображение для 'Акции и Спецпредложения'")
 
     class Meta:
         verbose_name = "Article"

diff --git a/templates/tags/tag.active_news_block.html b/templates/tags/tag.active_news_block.html
@@ -5,7 +5,8 @@
 {% for item in objects %}
 <li>
     <a href="/article/{{ item.slug }}">{{ item.title }}</a>
-    <span>{{ item.content|safe|truncatewords_html:35 }}</span>
+    <img src="/media/{{ item.card }}" width="280px">
+    <span>{{ item.annotation|safe|truncatewords_html:35 }}</span>
 </li>
 
 {% endfor %}