stats view fix

[wolnelektury.git] / src / wolnelektury / templates / main_page.html

diff --git a/src/wolnelektury/templates/main_page.html b/src/wolnelektury/templates/main_page.html
index c1e6a9c..1bec4c2 100644 (file)
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -1,8 +1,8 @@
 {% extends "base/base.html" %}
 {% extends "base/base.html" %}

+{% load latest_blog_posts from blog %}

 {% load carousel from social_tags %}
 {% load carousel from social_tags %}

-{% load static from staticfiles %}
+{% load static %}

 {% load i18n catalogue_tags infopages_tags %}
 {% load i18n catalogue_tags infopages_tags %}

-{% load ssi_include from ssify %}

 {% load cache %}
 {% load funding_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 {% 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 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' %}
 {% block body %}
   {% spaceless %}
     {% carousel 'main' %}


@@ -25,9 +20,7 @@
       <div class="main-library-row">
         <div class="covers">
           {% for book in best %}
       <div class="main-library-row">
         <div class="covers">
           {% for book in best %}

-            {% cache 86400 book_mini_box book.pk %}
-              {% include 'catalogue/book_mini_box.html' %}
-            {% endcache %}
+            {{ book.mini_box }}

           {% endfor %}
         </div>
         <a href="{% url "book_list" %}">
           {% endfor %}
         </div>
         <a href="{% url "book_list" %}">


@@ -44,9 +37,7 @@
         <h2>{% trans "Theme" %}: {{ theme }}</h2>
         <p>{% trans "Explore works with the same theme" %}</p>
         {% for book in theme_books %}
         <h2>{% trans "Theme" %}: {{ theme }}</h2>
         <p>{% trans "Explore works with the same theme" %}</p>
         {% for book in theme_books %}

-          {% cache 86400 book_mini_box book.pk %}
-            {% include 'catalogue/book_mini_box.html' %}
-          {% endcache %}
+          {{ book.mini_box }}

         {% endfor %}
         {% if theme_fragment %}
           {% cache 3600 fragment_promo theme_fragment.pk %}
         {% endfor %}
         {% if theme_fragment %}
           {% cache 3600 fragment_promo theme_fragment.pk %}


@@ -60,9 +51,7 @@
     {% if collection %}
       <section>
         <h1>{% trans "Collections" %}</h1>
     {% if collection %}
       <section>
         <h1>{% trans "Collections" %}</h1>

-        {% cache 3600 collection_box collection.pk LANGUAGE_CODE %}
-          {% include 'catalogue/collection_box.html' %}
-        {% endcache %}
+       {{ collection.box }}

         <a class="more" href="{% url 'catalogue_collections' %}">{% trans "See collections catalog" %}</a>
       </section>
     {% endif %}
         <a class="more" href="{% url 'catalogue_collections' %}">{% trans "See collections catalog" %}</a>
       </section>
     {% endif %}


@@ -70,9 +59,7 @@
     <section>
       <h1>{% trans "Recent publications" %}</h1>
         {% for book in last_published %}
     <section>
       <h1>{% trans "Recent publications" %}</h1>
         {% for book in last_published %}

-          {% cache 86400 book_mini_box book.pk %}
-            {% include 'catalogue/book_mini_box.html' %}
-          {% endcache %}
+          {{ book.mini_box }}

         {% endfor %}
       <a class="more" href="{% url 'recent_list' %}">{% trans "More recent publications" %}</a>
     </section>
         {% endfor %}
       <a class="more" href="{% url 'recent_list' %}">{% trans "More recent publications" %}</a>
     </section>


@@ -81,7 +68,9 @@
 
     <section class="infopages-box">
       <h1>{% trans "News" %}</h1>
 
     <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">
     </section>
 
     <section class="infopages-box">


@@ -89,15 +78,17 @@
 
       <ul>
         <li><a href="{% url 'suggest' %}" id="suggest" class="ajaxable">{% trans "Report a bug or suggestion" %}</a></li>
 
       <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 '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="{% 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>
         <li><a href="{% url 'subscribe' %}">{% trans "Newsletter" %}</a></li>
       </ul>
     </section>


@@ -110,7 +101,7 @@
       </ul>
 
       <div class="social-links">
       </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'>
           <img src="{% static "img/social/f.png" %}" alt="Wolne Lektury @ Facebook" />
         </a>
         <a href="https://nk.pl/profile/30441509" title='Wolne Lektury @ NK'>