limited stopwords + better search by author + remove descendant results

[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 deea0a5..7912c24 100755 (executable)
--- a/src/wolnelektury/templates/main_page.html
+++ b/src/wolnelektury/templates/main_page.html
@@ -1,8 +1,10 @@
 {% extends "base/base.html" %}
 {% load static from staticfiles %}
 {% extends "base/base.html" %}
 {% load static from staticfiles %}

-{% load i18n catalogue_tags infopages_tags social_tags %}
+{% load i18n catalogue_tags infopages_tags %}

 {% load ssi_include from ssify %}
 {% load cache %}
 {% load ssi_include from ssify %}
 {% 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,46 +12,47 @@
 
 {% 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 }}
+    {% if cite %}
+      {% cache 3600 main_cite cite.pk %}
+        {% include "social/cite_promo.html" with main=True %}
+      {% endcache %}
+    {% endif %}

 
     <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 %}
             {% cache 86400 book_mini_box book.pk %}
               {% include 'catalogue/book_mini_box.html' %}
             {% endcache %}
       <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 %#}

           {% 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 %}
           {% cache 86400 book_mini_box book.pk %}
             {% include 'catalogue/book_mini_box.html' %}
           {% endcache %}
         {% 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 %#}

         {% 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>
+      <a class="more" href="{% url 'theme_catalogue' %}">{% trans "See motifs catalog" %}</a>

     </section>
 
     {% comment %}
     </section>
 
     {% comment %}


@@ -88,9 +91,11 @@
 
     {% 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>
+        {% 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>
     {% endif %}
 


@@ -100,7 +105,6 @@
           {% cache 86400 book_mini_box book.pk %}
             {% include 'catalogue/book_mini_box.html' %}
           {% endcache %}
           {% cache 86400 book_mini_box book.pk %}
             {% include 'catalogue/book_mini_box.html' %}
           {% endcache %}

-          {#% ssi_include 'catalogue_book_mini' pk=book.pk %#}

         {% 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>


@@ -126,6 +130,7 @@
         <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="{% 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="{% url 'subscribe' %}">{% trans "Newsletter" %}</a></li>

       </ul>
     </section>
 
       </ul>
     </section>
 


@@ -151,10 +156,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 %}