fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix
[wolnelektury.git] / wolnelektury / templates / base.html
diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 04330f2..c9cfe15 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -1,11 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-       {% load i18n compressed catalogue_tags sponsor_tags %}
-    {% load reporting_stats %}
+<!DOCTYPE html>
+<html>
+       {% load cache compressed i18n %}
+    {% load catalogue_tags reporting_stats sponsor_tags %}
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-        <meta http-equiv="Content-Style-Type" content="text/css" />
         <meta name="description" 
             content="{% block metadescription %}Darmowe opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
         <title>{% block title %}{% trans "Wolne Lektury" %} :: 
         <meta name="description" 
             content="{% block metadescription %}Darmowe opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
         <title>{% block title %}{% trans "Wolne Lektury" %} :: 
@@ -31,25 +29,27 @@
 
             <div id="tagline">
                 <span>
 
             <div id="tagline">
                 <span>
-                {% count_books book_count %}
-                {% url book_list as b %}
-                {% url book_list as r %}
-                {% blocktrans count book_count as c %}
-                <a href='{{b}}'>{{c}}</a> free reading you have <a href='{{r}}'>right to</a>
-                {% plural %}
-                <a href='{{b}}'>{{c}}</a> free readings you have <a href='{{r}}'>right to</a>
-                {% endblocktrans %}
+                {% cache 60 tagline LANGUAGE_CODE %}
+                    {% url book_list as b %}
+                    {% url book_list as r %}
+                        {% count_books book_count %}
+                    {% blocktrans count book_count as c %}
+                    <a href='{{b}}'>{{c}}</a> free reading you have <a href='{{r}}'>right to</a>
+                    {% plural %}
+                    <a href='{{b}}'>{{c}}</a> free readings you have <a href='{{r}}'>right to</a>
+                    {% endblocktrans %}
+                {% endcache %}
                 </span>
             </div>
 
             <p id="user-info" class="mono">
                 {% if user.is_authenticated %}
                     {% trans "Welcome" %}, <strong>{{ user.username }}</strong>
                 </span>
             </div>
 
             <p id="user-info" class="mono">
                 {% if user.is_authenticated %}
                     {% trans "Welcome" %}, <strong>{{ user.username }}</strong>
-                    | <a href="{% url user_shelves %}" id="user-shelves-link">{% trans "Your shelves" %}</a>
+                    | <a href="{% url social_my_shelf %}" id="user-shelves-link">{% trans "My shelf" %}</a>
                     {% if user.is_staff %}
                     | <a href="/admin/">{% trans "Administration" %}</a>
                     {% endif %}
                     {% if user.is_staff %}
                     | <a href="/admin/">{% trans "Administration" %}</a>
                     {% endif %}
-                    | <a href="{% url logout %}?next={{ request.get_full_path }}">{% trans "Logout" %}</a>
+                    | <a href="{% url logout %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
                 {% else %}
                     <a href="{% url login %}?next={{ request.path }}"
                         id="login" class="ajaxable">
                 {% else %}
                     <a href="{% url login %}?next={{ request.path }}"
                         id="login" class="ajaxable">
@@ -74,17 +74,18 @@
 
             <form id="search-area" action="/fullsearch/">
                 
 
             <form id="search-area" action="/fullsearch/">
                 
-                <span id="search-field" class="grid-line">
-                    <input title="np. Leśmian" name="q" autocomplete="off" data-source="/fullsearch/hint/">
-                </span><span id="search-button">
+                <div id="search-field" class="grid-line">
+                 {{search_form.q}}
+<!--                    <input title="np. Leśmian" name="q" autocomplete="off" data-source="/fullsearch/hint/">-->
+                </div><div id="search-button">
                     <button type='submit'><span class="mono">{% trans "Search" %}</span></button>
                     <button type='submit'><span class="mono">{% trans "Search" %}</span></button>
-                </span>
+                </div>
                 
                 
+                <div class="clearboth"></div>
             </form>
 
 
 
             </form>
 
 
 
-            <div class="clearboth"></div>
         </div>
         </div>
 
         </div>
         </div>
 
@@ -93,16 +94,9 @@
         <div id="main-content">
 
             <div id="nav-line">
         <div id="main-content">
 
             <div id="nav-line">
-            <ul id="catalogue">
-                <li><a href="{% url catalogue %}#autorzy"><span class='mono'>{% trans "Authors" %}</span></a></li>
-                <li><a href="{% url catalogue %}#gatunki"><span class='mono'>{% trans "Genres" %}</span></a></li>
-                <li><a href="{% url catalogue %}#rodzaje"><span class='mono'>{% trans "Kinds" %}</span></a></li>
-                <li><a href="{% url catalogue %}#epoki"><span class='mono'>{% trans "Epochs" %}</span></a></li>
-                <li><a href="{% url catalogue %}#motywy"><span class='mono'>{% trans "Themes" %}</span></a></li>
-                <li><a href="{% url book_list %}"><span class='mono'>{% trans "All books" %}</span></a></li>
-                <li><a href="{% url audiobook_list %}"><span class='mono'>{% trans "Audiobooks" %}</span></a></li>
-                <li><a href="{% url daisy_list %}"><span class='mono'>{% trans "DAISY" %}</span></a></li>
-            </ul>
+               {% cache 60 catalogue-menu LANGUAGE_CODE %}
+                       {% catalogue_menu %}
+               {% endcache %}
 
             <form action="{% url django.views.i18n.set_language %}" method="post">
             <div id="lang-menu">
 
             <form action="{% url django.views.i18n.set_language %}" method="post">
             <div id="lang-menu">