X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/075fb07f19c2f20cd3b6818b973e7aebebdacc9f..6e374f03fd5a0b9c7725f8268dd9c7d57d49ee89:/wolnelektury/templates/base.html
diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 48f13adb2..6a8bf8ff2 100644
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -1,11 +1,9 @@
-
-
- {% load i18n compressed catalogue_tags sponsor_tags %}
- {% load reporting_stats %}
+
+
+ {% load cache compressed i18n %}
+ {% load catalogue_tags reporting_stats sponsor_tags %}
-
{% block title %}{% trans "Wolne Lektury" %} ::
@@ -31,25 +29,27 @@
<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 infopage 'o-projekcie' 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 %}?next={{ request.path }}"
id="login" class="ajaxable">
@@ -72,19 +72,21 @@
- <form id="search-area" action="/fullsearch/">
+ <form id="search-area" action="/fullsearch/" class="hidelabels">
- <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">
+ <label for="search">{{search_form.q.label}}</label>
+ {{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>
@@ -93,16 +95,9 @@
<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">
@@ -131,9 +126,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>.
@@ -152,8 +149,8 @@
{% sponsor_page "footer" %}
</div>
+ </div>
- </div>{# end main-content #}
{# template #}