X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e9327dee290c524806c89e1c3cb546f95ee51e52..1ca6872afcca0bb6fb4c0c11fdad3b760a2362a1:/apps/picture/views.py

diff --git a/apps/picture/views.py b/apps/picture/views.py
index 24457e297..dcc380713 100644
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -1,8 +1,10 @@
-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'):
@@ -14,23 +16,35 @@ def picture_list(request, filter=None, template_name='catalogue/picture_list.htm
         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, template_name='picture/picture_list_thumb.html'):
+    picture_list = Picture.objects.all()
+    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 = []
 
-    return render_to_response("catalogue/picture_detail.html", locals(),
+    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 +70,5 @@ def import_picture(request):
         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
+
+