X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/afdd9bc42c8e08e0e2fbade6b9c934a3d65f4885..219c3e795d8ec26614982fb6f7198b2cb8916f02:/wolnelektury/templates/base.html?ds=sidebyside
diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index d1bf19e8a..554e6d39b 100644
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -1,10 +1,9 @@
-
-
- {% load i18n compressed catalogue_tags sponsor_tags %}
+
+
+ {% load cache compressed i18n %}
+ {% load catalogue_tags reporting_stats sponsor_tags %}
-
{% block title %}{% trans "Wolne Lektury" %} ::
@@ -12,6 +11,11 @@
<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" %}
+ <!--[if IE]>
+ {% compressed_css "ie" %}
+ <![endif]-->
+ <!--script src="{{ STATIC_URL }}js/modernizr.custom.13352.js"></script-->
+ <script src="{{ STATIC_URL }}js/modernizr-latest.js"></script>
{% block extrahead %}
{% endblock %}
@@ -20,7 +24,9 @@
{% block bodycontent %}
- <div id="header" class="grid-line">
+ <div id="header-bg"></div>
+
+ <div id="header">
<div id="header-content">
<div id="logo">
@@ -29,17 +35,28 @@
</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 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">
@@ -62,19 +79,21 @@
- <form id="search" 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>
@@ -83,25 +102,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>
@@ -121,9 +133,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>.
@@ -142,8 +156,8 @@
{% sponsor_page "footer" %}
</div>
+ </div>
- </div>{# end main-content #}
{# template #}