Minor css fix.

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index aeed403..62d34bb 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -17,7 +17,8 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView

-from club.models import Membership
+from club.forms import ScheduleForm
+from club.models import Club, Membership

 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea


@@ -35,7 +36,7 @@ def catalogue(request):
     return render(request, 'catalogue/catalogue.html', {
         'books': Book.objects.filter(findable=True, parent=None),
         'pictures': Picture.objects.all(),
     return render(request, 'catalogue/catalogue.html', {
         'books': Book.objects.filter(findable=True, parent=None),
         'pictures': Picture.objects.all(),

-        'collections': Collection.objects.all(),
+        'collections': Collection.objects.filter(listed=True),

         'active_menu_item': 'all_works',
     })
 
         'active_menu_item': 'all_works',
     })
 


@@ -65,7 +66,10 @@ def daisy_list(request):
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)

-    return render(request, 'catalogue/collection.html', {'collection': coll})
+    return render(request, 'catalogue/collection.html', {
+        'collection': coll,
+        'active_menu_item': 'collections',
+    })

 
 
 def differentiate_tags(request, tags, ambiguous_slugs):
 
 
 def differentiate_tags(request, tags, ambiguous_slugs):


@@ -284,11 +288,15 @@ def book_detail(request, slug):
 
     return render(
         request,
 
     return render(
         request,

-        'catalogue/book_detail.html',
+        'catalogue/2021/book_detail.html' if request.EXPERIMENTS['layout'] == 'new' else 'catalogue/book_detail.html',

         {
             'book': book,
             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
             'active_menu_item': 'books',
         {
             'book': book,
             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
             'active_menu_item': 'books',

+            'club_form': ScheduleForm() if book.preview else None,
+            'club': Club.objects.first() if book.preview else None,
+
+            'EXPERIMENTS_SWITCHABLE_layout': True,

         })
 
 
         })
 
 


@@ -351,7 +359,7 @@ def import_book(request):
                 _("An error occurred: %(exception)s\n\n%(tb)s") % {
                     'exception': exception, 'tb': tb
                 },
                 _("An error occurred: %(exception)s\n\n%(tb)s") % {
                     'exception': exception, 'tb': tb
                 },

-                mimetype='text/plain'
+                content_type='text/plain'

             )
         return HttpResponse(_("Book imported successfully"))
     return HttpResponse(_("Error importing file: %r") % book_import_form.errors)
             )
         return HttpResponse(_("Book imported successfully"))
     return HttpResponse(_("Error importing file: %r") % book_import_form.errors)


@@ -449,16 +457,17 @@ def tag_catalogue(request, category):
 
 
 def collections(request):
 
 
 def collections(request):

-    objects = Collection.objects.all()
+    objects = Collection.objects.filter(listed=True)

 
     if len(objects) > 3:
 
     if len(objects) > 3:

-        best = random.sample(list(objects), 3)
+        best = random.sample(list(objects), 4)

     else:
         best = objects
 
     return render(request, 'catalogue/collections.html', {
         'objects': objects,
         'best': best,
     else:
         best = objects
 
     return render(request, 'catalogue/collections.html', {
         'objects': objects,
         'best': best,

+        'active_menu_item': 'collections'

     })
 
 
     })