some fixes from ui checks

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

diff --git a/apps/picture/views.py b/apps/picture/views.py
index 24457e2..94f4e20 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -1,35 +1,60 @@
-from picture.models import Picture
+
 from django.contrib.auth.decorators import permission_required
 from django.utils.datastructures import SortedDict
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
+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 """
 
-    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.setdefault(tag.sort_key[0], []).append(tag)
 
-            #    import pdb; pdb.set_trace()
     return render_to_response(template_name, locals(),
         context_instance=RequestContext(request))
 
 
-def picture_detail(request, picture):
-    picture = get_object_or_404(Picture, slug=picture)
+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())
+    book_list = list(book_list)
+    book_list.sort(lambda a,b: cmp(a.extra_info['authors'][0], b.extra_info['authors'][0]))
+    return render_to_response(template_name, locals(),
+                              context_instance=RequestContext(request))
+
+def picture_detail(request, slug):
+    picture = get_object_or_404(Picture, slug=slug)
 
     categories = SortedDict()
-    for tag in picture.tags:
+    for tag in picture.tags.iterator():
         categories.setdefault(tag.category, []).append(tag)
 
-    picture_themes = []
+    themes = categories.get('theme', [])
+    things = categories.get('thing', [])
 
-    return render_to_response("catalogue/picture_detail.html", locals(),
+    extra_info = picture.extra_info
+
+    return render_to_response("picture/picture_detail.html", locals(),
+                              context_instance=RequestContext(request))
+
+
+def picture_viewer(request, slug):
+    picture = get_object_or_404(Picture, slug=slug)
+    
+    return render_to_response("picture/picture_viewer.html", locals(),
                               context_instance=RequestContext(request))
+                              
 
 # =========
 # = Admin =
@@ -56,3 +81,5 @@ def import_picture(request):
         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
+
+