Accesibility fixes from the report.

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 398c61c..62d34bb 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -36,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',
     })
 


@@ -66,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):


@@ -285,13 +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',
             'club_form': ScheduleForm() if book.preview else None,
             'club': Club.objects.first() if book.preview else None,
         {
             '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,

         })
 
 
         })
 
 


@@ -452,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'

     })
 
 
     })