fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
[wolnelektury.git] / wolnelektury / templates / base.html
diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 6696892..6a8bf8f 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">
+<!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" />
        {% 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>{% 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,9 +29,9 @@
 
             <div id="tagline">
                 <span>
 
             <div id="tagline">
                 <span>
-                {% cache 300 tagline LANGUAGE_CODE %}
+                {% cache 60 tagline LANGUAGE_CODE %}
                     {% url book_list as b %}
                     {% url book_list as b %}
-                    {% url book_list as r %}
+                    {% 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>
                         {% 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>
@@ -74,14 +72,15 @@
 
 
 
 
 
 
-            <form id="search-area" action="/fullsearch/">
+            <form id="search-area" action="/fullsearch/" class="hidelabels">
                 
                 
-                <span id="search-field" class="grid-line">
+                <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/">-->
                  {{search_form.q}}
 <!--                    <input title="np. Leśmian" name="q" autocomplete="off" data-source="/fullsearch/hint/">-->
-                </span><span id="search-button">
+                </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>
                 
                 <div class="clearboth"></div>
             </form>
@@ -96,7 +95,7 @@
         <div id="main-content">
 
             <div id="nav-line">
         <div id="main-content">
 
             <div id="nav-line">
-               {% cache 300 catalogue-menu LANGUAGE_CODE %}
+               {% cache 60 catalogue-menu LANGUAGE_CODE %}
                        {% catalogue_menu %}
                {% endcache %}
 
                        {% catalogue_menu %}
                {% endcache %}