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
old mode 100755 (executable)
new mode 100644 (file)
index deea0a5..1bec4c2
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -1,8 +1,11 @@
 {% extends "base/base.html" %}
 {% extends "base/base.html" %}

-{% load static from staticfiles %}
-{% load i18n catalogue_tags infopages_tags social_tags %}
-{% load ssi_include from ssify %}
+{% load latest_blog_posts from blog %}
+{% load carousel from social_tags %}
+{% load static %}
+{% load i18n catalogue_tags infopages_tags %}

 {% load cache %}
 {% load cache %}

+{% load funding_tags %}
+{% get_current_language as LANGUAGE_CODE %}

 
 
 {% block title %}{% trans "Wolne Lektury internet library" %}{% endblock %}
 
 
 {% block title %}{% trans "Wolne Lektury internet library" %}{% endblock %}


@@ -10,97 +13,53 @@
 
 {% block body %}
   {% spaceless %}
 
 {% block body %}
   {% spaceless %}

-    {% choose_cite as cite_pk %}
-    {{ cite_pk.if }}
-      {% ssi_include 'social_cite_main' pk=cite_pk %}
-    {{ cite_pk.endif }}
+    {% carousel 'main' %}

 
     <section id="main-library">
 
     <section id="main-library">

-      <h1>W naszej cyfrowej bibliotece znajdziesz</h1>
+      <h1>{% trans "In our digital library you will find" %}</h1>

       <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 %}
-            {#% ssi_include 'catalogue_book_mini' pk=b.pk %#}
+            {{ book.mini_box }}

           {% endfor %}
         </div>
         <a href="{% url "book_list" %}">
           <div class="note white-box normal-text" style="font-size: 18px">
           {% endfor %}
         </div>
         <a href="{% url "book_list" %}">
           <div class="note white-box normal-text" style="font-size: 18px">

-            i wiele innych książek, wierszy, obrazów, audiobooków…
+            {% trans "and many other books, poems, pictures, audiobooks…" %}

           </div>
         </a>
       </div>
     </section>
 
     <section id="main-theme">
           </div>
         </a>
       </div>
     </section>
 
     <section id="main-theme">

-      <h1>Motywy i tematy</h1>
+      <h1>{% trans "Motifs and themes" %}</h1>

       <div class="white-box normal-text">
         <h2>{% trans "Theme" %}: {{ theme }}</h2>
       <div class="white-box normal-text">
         <h2>{% trans "Theme" %}: {{ theme }}</h2>

-        <p>Utwory, w których występuje ten motyw:</p>
+        <p>{% trans "Explore works with the same theme" %}</p>

         {% for book in theme_books %}
         {% for book in theme_books %}

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

         {% endfor %}
         {% if theme_fragment %}
         {% endfor %}
         {% if theme_fragment %}

-          {% ssi_include 'catalogue_fragment_promo' pk=theme_fragment.pk %}
+          {% cache 3600 fragment_promo theme_fragment.pk %}
+            {% include 'catalogue/fragment_promo.html' with fragment=theme_fragment %}
+          {% endcache %}

         {% endif %}
       </div>
         {% endif %}
       </div>

-      <a class="more" href="{% url 'theme_catalogue' %}">Zobacz katalog motywów</a>
-    </section>
-
-    {% comment %}
-    <section class="tag-box-section">
-      <h1>Autorzy</h1>
-      <a class="tag-box" href="{{ author.get_absolute_url }}">
-        {% ssi_include "catalogue_tag_box" pk=author.pk %}
-      </a>
-      <a class="more" href="{% url 'author_catalogue' %}">Zobacz katalog autorów</a>
+      <a class="more" href="{% url 'theme_catalogue' %}">{% trans "See motifs catalog" %}</a>

     </section>
 
     </section>
 

-    <section class="tag-box-section">
-      <h1>Gatunki</h1>
-      <a class="tag-box" href="{{ genre.get_absolute_url }}">
-        {% ssi_include "catalogue_tag_box" pk=genre.pk %}
-      </a>
-      <a class="more" href="{% url 'genre_catalogue' %}">Zobacz katalog gatunków</a>
-    </section>
-
-    <section class="tag-box-section">
-      <h1>Rodzaje</h1>
-      <a class="tag-box" href="{{ kind.get_absolute_url }}">
-        {% ssi_include "catalogue_tag_box" pk=kind.pk %}
-      </a>
-      <a class="more" href="{% url 'kind_catalogue' %}">Zobacz katalog rodzajów</a>
-    </section>
-
-    <section class="tag-box-section">
-      <h1>Epoki</h1>
-      <a class="tag-box" href="{{ epoch.get_absolute_url }}">
-        {% ssi_include "catalogue_tag_box" pk=epoch.pk %}
-      </a>
-      <a class="more" href="{% url 'epoch_catalogue' %}">Zobacz katalog epok</a>
-    </section>
-    {% endcomment %}
-

     {% if collection %}
       <section>
     {% if collection %}
       <section>

-        <h1>Kolekcje</h1>
-        {% ssi_include 'catalogue_collection_box' pk=collection.pk %}
-        <a class="more" href="{% url 'catalogue_collections' %}">Zobacz katalog kolekcji</a>
+        <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 %}
       </section>
     {% endif %}
 
     <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 %}
-          {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}
+          {{ 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>


@@ -109,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">


@@ -117,15 +78,18 @@
 
       <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>
 
       </ul>
     </section>
 


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


@@ -151,10 +115,13 @@
 
 {% block add_footer %}
   {% spaceless %}
 
 {% block add_footer %}
   {% spaceless %}

-    {{ cite_pk.if }}
-      <p>{% trans "Image used:" %}
-        {% ssi_include 'social_cite_info' pk=cite_pk %}
+    {% if cite %}
+      <p>
+        {% trans "Image used:" %}
+        {% cache 3600 cite_info cite.pk %}
+          {% include 'social/cite_info.html' %}
+        {% endcache %}

       </p>
       </p>

-    {{ cite_pk.endif }}
+    {% endif %}

   {% endspaceless %}
 {% endblock %}
   {% endspaceless %}
 {% endblock %}