X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/891a1e056e6066b28e000df16d69b21946338a57..cdcbbaea50438faa14771ee5e716f5ee71180ae3:/migdal/templatetags/migdal_tags.py

diff --git a/migdal/templatetags/migdal_tags.py b/migdal/templatetags/migdal_tags.py
index 5578c5d..c1b824c 100644
--- a/migdal/templatetags/migdal_tags.py
+++ b/migdal/templatetags/migdal_tags.py
@@ -5,18 +5,24 @@
 from django_comments_xtd.models import XtdComment
 from django.contrib import comments
 from django import template
-from migdal.models import Category
+from migdal import app_settings
+from migdal.models import Category, Entry
+from django.utils.translation import ugettext_lazy as _
 
 register = template.Library()
 
 
 @register.simple_tag(takes_context=True)
-def entry_begin(context, entry):
+def entry_begin(context, entry, detail=False):
     t = template.loader.select_template((
         'migdal/entry/%s/entry_begin.html' % entry.type,
         'migdal/entry/entry_begin.html',
     ))
-    context.update({'object': entry})
+    context = {
+        'request': context['request'],
+        'object': entry,
+        'detail': detail,
+    }
     return t.render(template.Context(context))
 
 
@@ -26,18 +32,39 @@ def entry_short(context, entry):
         'migdal/entry/%s/entry_short.html' % entry.type,
         'migdal/entry/entry_short.html',
     ))
-    context.update({'object': entry})
+    context = {
+        'request': context['request'],
+        'object': entry,
+    }
+    return t.render(template.Context(context))
+
+
+@register.simple_tag(takes_context=True)
+def entry_promobox(context, entry, counter):
+    t = template.loader.select_template((
+        'migdal/entry/%s/entry_promobox.html' % entry.type,
+        'migdal/entry/entry_promobox.html',
+    ))
+    context = {
+        'request': context['request'],
+        'object': entry,
+        'counter': counter,
+    }
     return t.render(template.Context(context))
 
 
 @register.inclusion_tag('migdal/categories.html', takes_context=True)
-def categories(context):
-    context.update({'object_list': Category.objects.all()})
+def categories(context, taxonomy):
+    context = {
+        'request': context['request'],
+        'object_list': Category.objects.filter(taxonomy=taxonomy
+                ).exclude(entry__isnull=True)
+    }
     return context
 
 
 @register.inclusion_tag('migdal/last_comments.html')
-def last_comments(limit=10):
+def last_comments(limit=app_settings.LAST_COMMENTS):
     return {'object_list': 
         XtdComment.objects.filter(is_public=True, is_removed=False).order_by('-submit_date')[:limit]}
 
@@ -47,4 +74,4 @@ def entry_comment_form(entry):
     return {
             'form': comments.get_form()(entry),
             'next': entry.get_absolute_url(),
-        }
\ No newline at end of file
+        }