X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/002577cf05a6730e8b1c97d1931d79758cbcbfdc..d54976be7b44bd0c8c3c2afac8f11b2408e6cb14:/apps/wolnelektury_core/templates/superbase.html

diff --git a/apps/wolnelektury_core/templates/superbase.html b/apps/wolnelektury_core/templates/superbase.html
index a338b97ff..46afe2875 100644
--- a/apps/wolnelektury_core/templates/superbase.html
+++ b/apps/wolnelektury_core/templates/superbase.html
@@ -3,31 +3,27 @@
 	{% load cache compressed i18n %}
 	{% load static from staticfiles %}
     {% load catalogue_tags funding_tags reporting_stats sponsor_tags %}
+    {% load chunks %}
+    {% load piwik_tags %}
     <head>
         <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
         <meta name="application-name" content="Wolne Lektury" />
         <meta property="og:site_name" content="Wolne Lektury" />
         <meta property="og:title" content="{% block ogtitle %}{% endblock %}" />
         <meta property="og:type" content="{% block ogtype %}website{% endblock %}" />
         <meta property="og:image" content="{% block ogimage %}{{ FULL_STATIC_URL }}img/wiatrak.png{% endblock %}" />
         <meta name="description" 
-            content="{% block metadescription %}Darmowe opracowane, peÅne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
+            content="{% block metadescription %}Darmowe, opracowane, peÅne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
         {% block ogextra %}{% endblock %}
         
 
         <title>{% block title %}{% trans "Wolne Lektury" %} :: 
             {% block titleextra %}{% endblock %}{% endblock %}</title>
-        <link rel="icon" href="{% static "img/favicon.png" %}" type="image/png" />
+        <link rel="icon" href="{% static 'img/favicon.png' %}" type="image/png" />
         <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury" 
-            href="{% static "opensearch.xml" %}" />
-        {% compressed_css "all" %}
-        <link href="{% static "css/core.css" %}" rel="stylesheet" type="text/css" media="screen" />
-        <link href="{% static "css/antiscreen.css" %}" rel="stylesheet" type="text/css" media="screen and (max-width: 480px)" />
-        {#% compressed_css "handheld" %#}
-        <!--[if IE]>
-        	{% compressed_css "ie" %}
-        <![endif]-->
-
+            href="{% static 'opensearch.xml' %}" />
+        {% compressed_css "main" %}
         {% block extrahead %}
         {% endblock %}
     </head>
@@ -35,45 +31,26 @@
 
         {% block bodycontent %}
         {% funding link=1 closeable=1 add_class="funding-top-header" %}
-		<div id="header-bg"></div>
-
-        <div id="header">
-
-        <div id="header-content">
-            <div id="logo">
-                <a class="logo" href="/">
-                <img id="logo-image" src="{% static "img/logo-neon.png" %}"
-                    alt="Wolne Lektury" /></a>
-            </div>
-
-            <div id="tagline">
-                <span>
-                {% cache 60 tagline LANGUAGE_CODE %}
-                    {% url 'book_list' as b %}
-                    {% url 'infopage' 'prawa' 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">
+        <div id="header-wrapper">
+        <header id="main">
+            <a href="/" id="logo">
+                <img src="{% static 'img/logo-neon.png' %}"
+                    alt="Wolne Lektury" />
+            </a>
+
+            <p id="user-info">
                 {% if user.is_authenticated %}
                     {% trans "Welcome" %}, 
-                    	<span class="hidden-box-wrapper">
-                    		<a href="{% url 'user_settings' %}" class="hidden-box-trigger">
-                    			<strong>{{ user.username }}</strong>
-                    		</a>
-                    		<span id="user-menu" class="hidden-box">
-                    			<a href="{% url 'account_set_password' %}">{% trans "Password" %}</a><br/>
-                    			<a href="{% url 'account_email' %}">{% trans "E-mail" %}</a><br/>
-                    			<a href="{% url 'socialaccount_connections' %}">{% trans "Social accounts" %}</a><br/>
-                    		</span>
-                    	</span>
+                    <span class="hidden-box-wrapper">
+                        <a href="{% url 'user_settings' %}" class="hidden-box-trigger">
+                            <strong>{{ user.username }}</strong>
+                        </a>
+                        <span id="user-menu" class="hidden-box">
+                            <a href="{% url 'account_set_password' %}">{% trans "Password" %}</a><br/>
+                            <a href="{% url 'account_email' %}">{% trans "E-mail" %}</a><br/>
+                            <a href="{% url 'socialaccount_connections' %}">{% trans "Social accounts" %}</a><br/>
+                        </span>
+                    </span>
                     | <a href="{% url 'social_my_shelf' %}" id="user-shelves-link">{% trans "My shelf" %}</a>
                     {% if user.is_staff %}
                     | <a href="/admin/">{% trans "Administration" %}</a>
@@ -90,45 +67,38 @@
                 {% endif %}
             </p>
 
+            <p id="tagline">
+                {% cache 60 tagline LANGUAGE_CODE %}
+                    {% url 'book_list' as b %}
+                    {% url 'infopage' 'prawa' 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 %}
+            </p>
 
-            <div class="clearboth"></div>
-
-        </div>
-        </div>
-
-        <div id="half-header">
-        <div id="half-header-content">
-
-
-
-            <form id="search-area" action="{% url 'search' %}" class="hidelabels">
-                
-                <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>
-                </div>
-                
-                <div class="clearboth"></div>
+            <form id="search-area" action="{% url 'search' %}">
+                <div id="search-field">
+                    <label for="search">{{search_form.q.label}}</label>
+                        {{search_form.q}}
+                </div><button type='submit'>{% trans "Search" %}</button>
             </form>
 
-
-
-        </div>
+        </header>
         </div>
 
 
-        <div id="main-content">
-            
-            <div id="nav-line">
-                {% catalogue_menu %}
+        <nav id="nav-line">
+            {% catalogue_menu %}
 
             <div id="lang-menu" class="hoverget">
-                <span id='lang-button' class='mono hoverclick'>
+                <span id='lang-button' class='hoverclick'>
                     <span class="lang-flag">â</span>
-                    {% trans "Language versions" %}</span>
+                    <span class="label">{% trans "Language versions" %}</span>
+                </span>
                 <div id="lang-menu-items">
                 {% for lang in LANGUAGES %}
                     <form action="{% url 'django.views.i18n.set_language' %}" method="post">
@@ -136,57 +106,37 @@
                     <input type="hidden" name="language" value="{{ lang.0 }}" />
                     <button type="submit"
                         lang="{{ lang.0 }}"
-                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} mono"
+                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}"
                         >{{ lang.1 }}</button>
-    	            </form>
+                    </form>
                 {% endfor %}
                 </div>
             </div>
-            </div>
 
             <div class="clearboth"></div>
+        </nav>
 
 
-
+        <div id="main-content">
             {% block body %}
             {% endblock %}
+            <div class="clearboth"></div>
+        </div>
 
 
-
-
-        <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>.
-				Digital reproductions are made by <a href="http://www.bn.org.pl/">The National Library</a>, <a href="http://www.bs.katowice.pl/">Biblioteka ÅlÄska</a> and <a href="http://www.bibliotekaelblaska.pl/">Biblioteka ElblÄska</a>, based on TNL, BÅ and BE resources.
-				Hosting: <a href="http://www.icm.edu.pl/">ICM</a>.
-				{% endblocktrans %}
-            </p>
-            <p>
-            	{% blocktrans %}
-				Modern Poland Foundation, 00-514 Warsaw, ul. MarszaÅkowska 84/92 lok. 125, tel/fax: (22) 621-30-17
-                e-mail: <a href="mailto:fundacja@nowoczesnapolska.org.pl">fundacja@nowoczesnapolska.org.pl</a>
-				{% endblocktrans %}
-            </p>
-            <p>Nowa strona biblioteki Wolne Lektury powstaÅa dziÄki Årodkom otrzymanym w ramach Programu Operacyjnego Fundusz Inicjatyw Obywatelskich, Senatu RP (zadanie realizowane w ramach zlecania przez KancelariÄ Senatu zadaÅ w zakresie opieki nad PoloniÄ i Polakami za granicÄ w 2011 r.) oraz Narodowego Instytutu Audiowizualnego w ramach programu Dziedzictwo Cyfrowe.</p>
-
+        <div id="footer-wrapper">
+        <footer id="main">
+            {% chunk 'footer' %}
             {% block add_footer %}{% endblock %}
-
-			{% sponsor_page "footer" %}
-        </div>
+            {% sponsor_page "footer" %}
+        </footer>
         </div>
 
 
 
         {# template #}
         <div id="ajaxable-window" class='dialog-window'>
-            <div class="header mono"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
+            <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
             <div class="target">
                 <p><img src="{% static "img/indicator.gif" %}" alt="*"/> {% trans "Loading" %}</p>
             </div>
@@ -196,18 +146,18 @@
         {% 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" src="//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 }}
+        {% tracking_code %}
 
 		{% block extrabody %}
 		{% endblock %}
 
-        <script src="{% static "js/modernizr.custom.19652.js" %}"></script>
+        <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
     </body>
 </html>
