Moved fragment metadata to the right.

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

diff --git a/templates/catalogue/main_page.html b/templates/catalogue/main_page.html
index 44fe7d4..0c58ada 100644 (file)
--- a/templates/catalogue/main_page.html
+++ b/templates/catalogue/main_page.html
@@ -1,13 +1,11 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

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

 
 {% block bodyid %}main-page{% endblock %}
 
 {% block extrahead %}
     <script type="text/javascript" charset="utf-8">
         $(function() {
 
 {% block bodyid %}main-page{% endblock %}
 
 {% block extrahead %}
     <script type="text/javascript" charset="utf-8">
         $(function() {

-            $('#id_q').labelify({labelledClass: 'blur'});
-            

             $('#categories-list ul').columnize({width: 180});
             $('#themes-list ul').columnize({width: 180});
         });
             $('#categories-list ul').columnize({width: 180});
             $('#themes-list ul').columnize({width: 180});
         });


@@ -15,14 +13,18 @@
 {% endblock %}
 
 {% block body %}
 {% endblock %}
 
 {% block body %}

-    <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>
+    <div id="site-description">
+        {% chunk "site-description" %}
+    </div>
+    <div class="clearboth"></div>
+    <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">
         <div id="categories-list">
             {% if categories.set %}
     </form>
     
     <div id="tags-list">
         <div id="categories-list">
             {% if categories.set %}

-                <h2>Zestawy</h2>
+                <h2>Półki</h2>

                 <ul>
                 {% for set in categories.set %}
                     <li><a href="{% catalogue_url set %}">{{ set }}&nbsp;({{ set.count }})</a></li>
                 <ul>
                 {% for set in categories.set %}
                     <li><a href="{% catalogue_url set %}">{{ set }}&nbsp;({{ set.count }})</a></li>


@@ -70,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>                


@@ -81,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 %}