Added short_html method to Book model and removed (no longer used) book template...

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

diff --git a/templates/catalogue/main_page.html b/templates/catalogue/main_page.html
index 8fe16d1..221595f 100644 (file)
--- a/templates/catalogue/main_page.html
+++ b/templates/catalogue/main_page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

-{% load catalogue_tags chunks %}
+{% load catalogue_tags chunks cache %}

 
 {% block bodyid %}main-page{% endblock %}
 
 
 {% block bodyid %}main-page{% endblock %}
 


@@ -17,8 +17,8 @@
         {% chunk "site-description" %}
     </div>
     <div class="clearboth"></div>
         {% chunk "site-description" %}
     </div>
     <div class="clearboth"></div>

-    <form action="." method="get" accept-charset="utf-8" id="search-form">
-        <p>{{ form.q }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url catalogue.views.book_list %}">zobacz spis utworów</a> w naszym zbiorze</p>
+    <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
+        <p>{{ form.q }} {{ form.tags }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url catalogue.views.book_list %}">zobacz spis utworów</a> w naszym zbiorze</p>

     </form>
     
     <div id="tags-list">
     </form>
     
     <div id="tags-list">


@@ -72,7 +72,7 @@
             {% if categories.theme %}
                 <h2>Motywy</h2>
                 <ul>
             {% if categories.theme %}
                 <h2>Motywy</h2>
                 <ul>

-                {% for theme in categories.theme %}
+                {% for theme in fragment_tags %}

                     <li><a href="{% catalogue_url theme %}">{{ theme }}&nbsp;({{ theme.count }})</a></li>
                 {% endfor %}
                 </ul>                
                     <li><a href="{% catalogue_url theme %}">{{ theme }}&nbsp;({{ theme.count }})</a></li>
                 {% endfor %}
                 </ul>                


@@ -83,6 +83,8 @@
     
     <div id="latest-blog-posts">
         <h2>Aktualności z naszego bloga</h2>
     
     <div id="latest-blog-posts">
         <h2>Aktualności z naszego bloga</h2>

+        {% cache 1800 latest-blog-posts %}

         {% latest_blog_posts "http://wolnepodreczniki.pl/feed/?s=Wolne%20Lektury" %}
         {% latest_blog_posts "http://wolnepodreczniki.pl/feed/?s=Wolne%20Lektury" %}

+        {% endcache %}

     </div>
 {% endblock %}
     </div>
 {% endblock %}