X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f3e8dfa015744bd72796fdd8eff0d81f863cdc46..6753452b63d937fd05ad485edc650565f5fa064e:/src/wolnelektury/templates/main_page.html

diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html
index d68c2cc7f..369d6f603 100644
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -1,8 +1,8 @@
 {% extends "base/base.html" %}
+{% load latest_blog_posts from blog %}
 {% load carousel from social_tags %}
-{% load static from staticfiles %}
+{% load static %}
 {% load i18n catalogue_tags infopages_tags %}
-{% load ssi_include from ssify %}
 {% load cache %}
 {% load funding_tags %}
 {% get_current_language as LANGUAGE_CODE %}
@@ -11,11 +11,6 @@
 {% block title %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 {% block ogtitle %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 
-{% block extrahead %}
-{{ block.super }}
-{% include "hotjar.html" %}
-{% endblock %}
-
 {% block body %}
   {% spaceless %}
     {% carousel 'main' %}
@@ -28,7 +23,7 @@
             {{ book.mini_box }}
           {% endfor %}
         </div>
-        <a href="{% url "book_list" %}">
+	<a href="{% if recommended_collection %}{{ recommended_collection.get_absolute_url }}{% else %}{% url "book_list" %}{% endif %}">
           <div class="note white-box normal-text" style="font-size: 18px">
             {% trans "and many other books, poems, pictures, audiobooks…" %}
           </div>
@@ -36,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>
@@ -50,32 +76,15 @@
           {% endcache %}
         {% endif %}
       </div>
-      <a class="more" href="{% url 'theme_catalogue' %}">{% trans "See motifs catalog" %}</a>
-    </section>
-
-    {% if collection %}
-      <section>
-        <h1>{% trans "Collections" %}</h1>
-        {% cache 3600 collection_box collection.pk LANGUAGE_CODE %}
-          {% include 'catalogue/collection_box.html' %}
-        {% endcache %}
-        <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>
 
     <section class="infopages-box">
       <h1>{% trans "News" %}</h1>
-      {% ssi_include 'latest_blog_posts' %}
+      {% cache 1800 latest_blog_posts %}
+        {% latest_blog_posts %}
+      {% endcache %}
     </section>
 
     <section class="infopages-box">
@@ -83,15 +92,17 @@
 
       <ul>
         <li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
-        <!--li><a href="http://turniej.wolnelektury.pl">Turniej Elektrybałtów</a></li-->
         <li><a href="{% url 'reporting_catalogue_pdf' %}">{% trans "Download the catalogue in PDF format." %}</a></li>
+	<li><a href="{% url 'gallery' %}">{% trans "Art" %}</a></li>
+        <li><a href="{% url 'catalogue' %}">{% trans "All works" %}</a></li>
+
         <li><a href="{% url 'dictionary_notes' %}">{% trans "Footnotes" %}</a></li>
         <li><a href="{% url 'suggest_publishing' %}" id="suggest-publishing" class="ajaxable">{% trans "Missing a book?" %}</a></li>
         <li><a href="{% url 'publish_plan' %}">{% trans "Publishing plan" %}</a></li>
         <li><a href="{% url 'api' %}">API</a></li>
         <li><a href="{% url 'oaipmh' %}">OAI-PMH</a></li>
         <li><a href="{% url 'lesmianator' %}" lang="pl">Leśmianator</a></li>
-        <li><a href="http://polski.wolnelektury.pl" lang="pl">Materiały do nauki j. polskiego</a></li>
+        <li><a href="https://polski.wolnelektury.pl" lang="pl">Przewodnik dla piszących i czytających</a></li>
         <li><a href="{% url 'subscribe' %}">{% trans "Newsletter" %}</a></li>
       </ul>
     </section>
@@ -104,7 +115,7 @@
       </ul>
 
       <div class="social-links">
-        <a href="https://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268" title='Wolne Lektury @ Facebook'>
+        <a href="https://www.facebook.com/wolnelektury/" title='Wolne Lektury @ Facebook'>
           <img src="{% static "img/social/f.png" %}" alt="Wolne Lektury @ Facebook" />
         </a>
         <a href="https://nk.pl/profile/30441509" title='Wolne Lektury @ NK'>