Nicer collection boxes.

diff --git a/src/catalogue/templates/catalogue/collection_box.html b/src/catalogue/templates/catalogue/collection_box.html
index c32122f..214db8b 100644 (file)
--- a/src/catalogue/templates/catalogue/collection_box.html
+++ b/src/catalogue/templates/catalogue/collection_box.html
@@ -2,18 +2,17 @@
   {% load i18n %}
   <div class="collection-box white-box">
     <h2><a href="{{ collection.get_absolute_url }}">{% trans "Collection" %}: {{ collection }}</a></h2>
+    <p>
     {% if collection.description %}
       {{ collection.description|safe|truncatewords_html:40 }}
     {% endif %}
-    {% for book in collection.get_books|slice:":5" %}
-      {{ book.mini_box }}
-    {% endfor %}
-    {% with collection.get_books.count|add:-5 as more %}
-      {% if more > 0 %}
-        <a href="{{ collection.get_absolute_url }}">
-          {% blocktrans count c=more %}and one more{% plural %}and {{ c }} more{% endblocktrans %}
+    </p>
+    <div class="covers">
+      {% for book in collection.get_books|slice:":5" %}
+        <a href="{{ book.get_absolute_url }}">
+          <img src="{{ book.cover_thumb.url }}" alt="{{ book.pretty_title }}" title="{{ book.pretty_title }}">
         </a>
-      {% endif %}
-    {% endwith %}
+      {% endfor %}
+    </div>
   </div>
 {% endspaceless %}

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 904cdc5..38c6165 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -66,7 +66,10 @@ def daisy_list(request):
 
 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):
@@ -455,13 +458,14 @@ def collections(request):
     objects = Collection.objects.filter(listed=True)
 
     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,
+        'active_menu_item': 'collections'
     })
 
 

diff --git a/src/wolnelektury/static/scss/main/catalogue.scss b/src/wolnelektury/static/scss/main/catalogue.scss
index ba30e82..8148930 100644 (file)
--- a/src/wolnelektury/static/scss/main/catalogue.scss
+++ b/src/wolnelektury/static/scss/main/catalogue.scss
@@ -27,3 +27,21 @@
         @include size(padding, 26px);
     }
 }
+
+
+.collection-box {
+    display: inline-block;
+    vertical-align: top;
+
+    @media screen and (min-width:500px) {
+        width: 465px;
+    }
+
+    p {
+        height: 75px;
+        overflow: hidden;
+    }
+    .covers {
+        line-height: 0;
+    }
+}

diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html
index e1ec734..e1483b6 100644 (file)
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -120,8 +120,8 @@
                   <li{% if active_menu_item == 'audiobooks' %} class="active"{% endif %}>
                     <a href="{% url 'audiobook_list' %}">{% trans "Audiobooks" %}</a>
                   </li>
-                  <li{% if active_menu_item == 'all_works' %} class="active"{% endif %}>
-                    <a href="{% url 'catalogue' %}">{% trans "All works" %}</a>
+                  <li{% if active_menu_item == 'collections' %} class="active"{% endif %}>
+                    <a href="{% url 'catalogue_collections' %}">{% trans "Collections" %}</a>
                   </li>
                   <li>
                     <a href="{% url 'subscribe' %}">{% trans "Newsletter" %}</a>

diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html
index 1bec4c2..f47e1d2 100644 (file)
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -31,8 +31,39 @@
       </div>
     </section>
 
+    <section>
+      <h1>
+        <a  href="{% url 'recent_list' %}">
+          {% trans "Recent publications" %}
+          &rarr;
+        </a>
+      </h1>
+      {% for book in last_published %}
+        {{ book.mini_box }}
+      {% endfor %}
+    </section>
+
+    {% if collections %}
+      <section>
+        <h1>
+          <a href="{% url 'catalogue_collections' %}">
+            {% trans "Collections" %}
+            &rarr;
+          </a>
+        </h1>
+        {% for collection in collections %}
+         {{ collection.box }}
+        {% endfor %}
+      </section>
+    {% endif %}
+
     <section id="main-theme">
-      <h1>{% trans "Motifs and themes" %}</h1>
+      <h1>
+        <a href="{% url 'theme_catalogue' %}">
+          {% trans "Motifs and themes" %}
+          &rarr;
+        </a>
+      </h1>
       <div class="white-box normal-text">
         <h2>{% trans "Theme" %}: {{ theme }}</h2>
         <p>{% trans "Explore works with the same theme" %}</p>
@@ -45,23 +76,6 @@
           {% endcache %}
         {% endif %}
       </div>
-      <a class="more" href="{% url 'theme_catalogue' %}">{% trans "See motifs catalog" %}</a>
-    </section>
-
-    {% if collection %}
-      <section>
-        <h1>{% trans "Collections" %}</h1>
-       {{ collection.box }}
-        <a class="more" href="{% url 'catalogue_collections' %}">{% trans "See collections catalog" %}</a>
-      </section>
-    {% endif %}
-
-    <section>
-      <h1>{% trans "Recent publications" %}</h1>
-        {% for book in last_published %}
-          {{ book.mini_box }}
-        {% endfor %}
-      <a class="more" href="{% url 'recent_list' %}">{% trans "More recent publications" %}</a>
     </section>
 
     <div class="clearboth"></div>

diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py
index 48063d2..2cc0fd7 100644 (file)
--- a/src/wolnelektury/views.py
+++ b/src/wolnelektury/views.py
@@ -46,11 +46,8 @@ def main_page(request):
                     break
             break
 
-    # Choose a collection for main.
-    try:
-        ctx['collection'] = Collection.objects.filter(listed=True).order_by('?')[:1][0]
-    except IndexError:
-        pass
+    # Choose collections for main.
+    ctx['collections'] = Collection.objects.filter(listed=True).order_by('?')[:4]
 
     best = []
     best_places = 5