Merge branch 'preview'

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

diff --git a/src/picture/views.py b/src/picture/views.py
index b555056..6ace134 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -53,6 +53,7 @@ def picture_detail(request, slug):
         'picture': picture,
         'themes': theme_things.get('theme', []),
         'things': theme_things.get('thing', []),
         'picture': picture,
         'themes': theme_things.get('theme', []),
         'things': theme_things.get('thing', []),

+        'active_menu_item': 'gallery',

     }, context_instance=RequestContext(request))
 
 
     }, context_instance=RequestContext(request))
 
 


@@ -127,10 +128,9 @@ def import_picture(request):
 @ssi_included
 def picture_mini(request, pk, with_link=True):
     picture = get_object_or_404(Picture, pk=pk)
 @ssi_included
 def picture_mini(request, pk, with_link=True):
     picture = get_object_or_404(Picture, pk=pk)

-    author_str = ", ".join(tag.name for tag in picture.tags.filter(category='author'))

     return render(request, 'picture/picture_mini_box.html', {
         'picture': picture,
     return render(request, 'picture/picture_mini_box.html', {
         'picture': picture,

-        'author_str': author_str,
+        'author': picture.author_unicode(),

         'with_link': with_link,
     })
 
         'with_link': with_link,
     })
 


@@ -141,10 +141,7 @@ def picture_short(request, pk):
 
     return render(request, 'picture/picture_short.html', {
         'picture': picture,
 
     return render(request, 'picture/picture_short.html', {
         'picture': picture,

-        'main_link': picture.get_absolute_url(),
-        'request': request,
-        'tags': split_tags(picture.tags),
-        })
+    })

 
 
 @ssi_included
 
 
 @ssi_included