#3208 + raphael.js

[wolnelektury.git] / apps / picture / views.py

diff --git a/apps/picture/views.py b/apps/picture/views.py
index dcc3807..c39969a 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -6,11 +6,13 @@ from django.template import RequestContext
 from django.core.paginator import Paginator
 from picture.models import Picture
 
 from django.core.paginator import Paginator
 from picture.models import Picture
 

-
-def picture_list(request, filter=None, template_name='catalogue/picture_list.html'):
+# was picture/picture_list.html list (without thumbs)
+def picture_list(request, filter=None, get_filter=None, template_name='catalogue/picture_list.html', cache_key=None, context=None):

     """ generates a listing of all books, optionally filtered with a test function """
 
     """ generates a listing of all books, optionally filtered with a test function """
 

-    pictures_by_author, orphans = Picture.picture_list()
+    if get_filter:
+        filt = get_filter()
+    pictures_by_author, orphans = Picture.picture_list(filt)

     books_nav = SortedDict()
     for tag in pictures_by_author:
         if pictures_by_author[tag]:
     books_nav = SortedDict()
     for tag in pictures_by_author:
         if pictures_by_author[tag]:


@@ -20,8 +22,12 @@ def picture_list(request, filter=None, template_name='catalogue/picture_list.htm
         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

-def picture_list_thumb(request, filter=None, template_name='picture/picture_list_thumb.html'):
-    picture_list = Picture.objects.all()
+def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html', cache_key=None, context=None):
+    book_list = Picture.objects.all()
+    if filter:
+        book_list = book_list.filter(filter)
+    if get_filter:
+        book_list = book_list.filter(get_filter())

     return render_to_response(template_name, locals(),
                               context_instance=RequestContext(request))
 
     return render_to_response(template_name, locals(),
                               context_instance=RequestContext(request))
 


@@ -32,7 +38,10 @@ def picture_detail(request, slug):
     for tag in picture.tags.iterator():
         categories.setdefault(tag.category, []).append(tag)
 
     for tag in picture.tags.iterator():
         categories.setdefault(tag.category, []).append(tag)
 

-    picture_themes = []
+    themes = categories.get('theme', [])
+    things = categories.get('thing', [])
+
+    extra_info = picture.extra_info

 
     return render_to_response("picture/picture_detail.html", locals(),
                               context_instance=RequestContext(request))
 
     return render_to_response("picture/picture_detail.html", locals(),
                               context_instance=RequestContext(request))