X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/066ffa84ce4d577668b1a49140fb7facc19451c3..24dbfdfdd3ab807494beed62f1a890519d13ed63:/wolnelektury/templates/base.html

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 9d490ae3f..c9cfe1533 100644
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -1,20 +1,17 @@
-<!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 %}
+<!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" />
-        <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>{% trans "Wolne Lektury internet library" %}
-            {% block titleextra %}{% endblock %}</title>
+        <title>{% block title %}{% trans "Wolne Lektury" %} :: 
+            {% block titleextra %}{% endblock %}{% endblock %}</title>
         <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/png" />
         <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury" href="{{ STATIC_URL }}opensearch.xml" />
         {% compressed_css "all" %}
-        <script type="text/javascript">var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";</script>
-        {% compressed_js "jquery" %}
-        {% compressed_js "all" %}
+
         {% block extrahead %}
         {% endblock %}
     </head>
@@ -22,7 +19,7 @@
 
         {% block bodycontent %}
 
-        <div id="header" class="grid-line">
+        <div id="header">
 
         <div id="header-content">
             <div id="logo">
@@ -31,19 +28,36 @@
             </div>
 
             <div id="tagline">
-                <a href=''>1666</a> darmowych lektur do ktÃ³rych masz <a href=''>prawo</a>
+                <span>
+                {% 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>
-                    | <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 %}
-                    | <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 %}" class="login-register-link">{% trans "Sign in" %} / {% trans "Register" %}</a>
+                    <a href="{% url login %}?next={{ request.path }}"
+                        id="login" class="ajaxable">
+                            {% trans "Sign in" %}</a>
+                    /
+                    <a href="{% url register %}?next={{ request.path }}"
+                        id="register" class="ajaxable">
+                            {% trans "Register" %}</a>
                 {% endif %}
             </p>
 
@@ -58,19 +72,20 @@
 
 
 
-            <form id="search">
+            <form id="search-area" action="/fullsearch/">
                 
-                <span id="search-field" class="grid-line">
-                    <input title="np. LeÅmian" name="q" autocomplete="off">
-                </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>
-                </span>
+                </div>
                 
+                <div class="clearboth"></div>
             </form>
 
 
 
-            <div class="clearboth"></div>
         </div>
         </div>
 
@@ -79,25 +94,18 @@
         <div id="main-content">
 
             <div id="nav-line">
-            <ul id="catalogue">
-                <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>
-                <li><a href="{% url catalogue %}#autorzy"><span class='mono'>{% trans "Authors" %}</span></a></li>
-                <li><a href="{% url catalogue %}#epoki"><span class='mono'>{% trans "Epochs" %}</span></a></li>
-                <li><a href="{% url catalogue %}#rodzaje"><span class='mono'>{% trans "Kinds" %}</span></a></li>
-                <li><a href="{% url catalogue %}#gatunki"><span class='mono'>{% trans "Genres" %}</span></a></li>
-                <li><a href="{% url catalogue %}#motywy"><span class='mono'>{% trans "Themes" %}</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">
-                <span id='lang-button' class='mono-small'>
+                <span id='lang-button' class='mono'>
                     {% trans "Language versions" %}</span>
                 <div id="lang-menu-items">
                 {% for lang in LANGUAGES %}
                     <button type="submit" name="language"
-                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} {% if forloop.last %}last{% endif %}"
+                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} mono"
                         value="{{ lang.0 }}">{{ lang.1 }}</button>
                 {% endfor %}
                 </div>
@@ -117,9 +125,11 @@
 
         <div class="clearboth"></div>
 
+        </div>{# end main-content #}
 
 
         <div id="footer">
+        <div id="footer-content">
             <p>
             	{% blocktrans %}
 				Wolne Lektury is a project lead by <a href="http://nowoczesnapolska.org.pl/">Modern Poland Foundation</a>.
@@ -138,35 +148,29 @@
 
 			{% sponsor_page "footer" %}
         </div>
+        </div>
 
-        </div>{# end main-content #}
 
 
-        <!--div id="login-register-window">
-            <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
+        {# template #}
+        <div id="ajaxable-window" class='dialog-window'>
+            <div class="header mono"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
             <div class="target">
-                <form method="post" action="{% url login %}" id="login-form" class="cuteform">
-                    <h2>{% trans "Sign in" %} / <a href="#" id="show-registration-form" style="font-size: 0.85em; font-weight: normal">{% trans "Register" %}</a></h2>
-                    <p><span id="id_login-__all__"></span></p>
-                    <ol>
-                        {% authentication_form %}
-                        <li><input type="submit" value="{% trans "Sign in" %}" /></li>
-                    </ol>
-                </form>
-                <form method="post" action="{% url register %}" id="registration-form" class="cuteform" style="display: none;">
-                    <h2><a href="#" id="show-login-form" style="font-size: 0.85em; font-weight: normal">{% trans "Sign in" %}</a> / {% trans "Register" %}</h2>
-                    <p><span id="id_registration-__all__"></span></p>
-                    <ol>
-                        {% user_creation_form %}
-                        <li><input type="submit" value="{% trans "Register" %}" /></li>
-                    </ol>
-                </form>
+                <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
             </div>
-        </div-->
+        </div>
 
 
         {% endblock bodycontent %}
 
+
+        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+        <script type="text/javascript">
+            var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
+            var STATIC_URL = "{{ STATIC_URL }}";
+        </script>
+        {% compressed_js "base" %}
+
         <!--{{ piwik_tag|safe }}
         <script type="text/javascript">
         var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
