fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'minimal-double-reader' into rwd
[wolnelektury.git] / apps / wolnelektury_core / templates / superbase.html
diff --git a/apps/wolnelektury_core/templates/superbase.html b/apps/wolnelektury_core/templates/superbase.html
index 2f933da..9ee206f 100644 (file)
--- a/apps/wolnelektury_core/templates/superbase.html
+++ b/apps/wolnelektury_core/templates/superbase.html
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
+<html lang="{{ LANGUAGE_CODE }}" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
        {% load cache compressed i18n %}
        {% load cache compressed i18n %}
-    {% load catalogue_tags reporting_stats sponsor_tags %}
+       {% load static from staticfiles %}
+    {% load catalogue_tags funding_tags reporting_stats sponsor_tags %}
     <head>
         <meta charset="utf-8">
     <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 name="application-name" content="Wolne Lektury" />
         <meta property="og:site_name" content="Wolne Lektury" />
         <meta property="og:title" content="{% block ogtitle %}{% endblock %}" />
@@ -16,148 +18,112 @@
 
         <title>{% block title %}{% trans "Wolne Lektury" %} :: 
             {% block titleextra %}{% endblock %}{% 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" %}
-        {% compressed_css "screen" %}
-        <!--[if IE]>
-               {% compressed_css "ie" %}
-        <![endif]-->
-
+        <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 "main" %}
         {% block extrahead %}
         {% endblock %}
     </head>
     <body id="{% block bodyid %}base{% endblock %}">
 
         {% block bodycontent %}
         {% block extrahead %}
         {% endblock %}
     </head>
     <body id="{% block bodyid %}base{% endblock %}">
 
         {% block bodycontent %}
-
-               <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_URL }}img/logo-neon.png" /></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">
+        {% funding link=1 closeable=1 add_class="funding-top-header" %}
+        <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" %}, 
                 {% 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>
-                    | <a href="{% url social_my_shelf %}" id="user-shelves-link">{% trans "My shelf" %}</a>
+                    <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>
                     {% endif %}
                     {% if user.is_staff %}
                     | <a href="/admin/">{% trans "Administration" %}</a>
                     {% endif %}
-                    | <a href="{% url logout %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
+                    | <a href="{% url 'logout' %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
                 {% else %}
                 {% else %}
-                    <a href="{% url login %}?next={{ request.path }}"
+                    <a href="{% url 'login' %}?next={{ request.path }}"
                         id="login" class="ajaxable">
                             {% trans "Sign in" %}</a>
                     /
                         id="login" class="ajaxable">
                             {% trans "Sign in" %}</a>
                     /
-                    <a href="{% url register %}?next={{ request.path }}"
+                    <a href="{% url 'register' %}?next={{ request.path }}"
                         id="register" class="ajaxable">
                             {% trans "Register" %}</a>
                 {% endif %}
             </p>
 
                         id="register" class="ajaxable">
                             {% trans "Register" %}</a>
                 {% 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>
 
             </form>
 
-
-
-        </div>
+        </header>
         </div>
 
 
         </div>
 
 
-
-        <div id="main-content">
-
-            <div id="nav-line">
-               {% cache 60 catalogue-menu LANGUAGE_CODE %}
-                       {% catalogue_menu %}
-               {% endcache %}
+        <nav id="nav-line">
+            {% catalogue_menu %}
 
             <div id="lang-menu" class="hoverget">
 
             <div id="lang-menu" class="hoverget">
-                <span id='lang-button' class='mono hoverclick'>
+                <span id='lang-button' class='hoverclick'>
                     <span class="lang-flag">⚐</span>
                     <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 %}
                 <div id="lang-menu-items">
                 {% for lang in LANGUAGES %}
-                    <form action="{% url django.views.i18n.set_language %}" method="post">
+                    <form action="{% url 'django.views.i18n.set_language' %}" method="post">
                     {% csrf_token %}
                     <input type="hidden" name="language" value="{{ lang.0 }}" />
                     <button type="submit"
                     {% csrf_token %}
                     <input type="hidden" name="language" value="{{ lang.0 }}" />
                     <button type="submit"
-                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} mono"
+                        lang="{{ lang.0 }}"
+                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}"
                         >{{ lang.1 }}</button>
                         >{{ lang.1 }}</button>
-                   </form>
+                    </form>
                 {% endfor %}
                 </div>
             </div>
                 {% endfor %}
                 </div>
             </div>
-            </div>
 
             <div class="clearboth"></div>
 
             <div class="clearboth"></div>
+        </nav>
 
 
 
 
-
+        <div id="main-content">
             {% block body %}
             {% endblock %}
             {% block body %}
             {% endblock %}
+            <div class="clearboth"></div>
+        </div>
 
 
 
 
-
-
-        <div class="clearboth"></div>
-
-        </div>{# end main-content #}
-
-
-        <div id="footer">
-        <div id="footer-content">
+        <div id="footer-wrapper">
+        <footer id="main">
             <p>
                {% blocktrans %}
                                Wolne Lektury is a project lead by <a href="http://nowoczesnapolska.org.pl/">Modern Poland Foundation</a>.
             <p>
                {% blocktrans %}
                                Wolne Lektury is a project lead by <a href="http://nowoczesnapolska.org.pl/">Modern Poland Foundation</a>.
@@ -176,16 +142,16 @@
             {% block add_footer %}{% endblock %}
 
                        {% sponsor_page "footer" %}
             {% block add_footer %}{% endblock %}
 
                        {% sponsor_page "footer" %}
-        </div>
+        </footer>
         </div>
 
 
 
         {# template #}
         <div id="ajaxable-window" class='dialog-window'>
         </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">
             <div class="target">
-                <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
+                <p><img src="{% static "img/indicator.gif" %}" alt="*"/> {% trans "Loading" %}</p>
             </div>
         </div>
 
             </div>
         </div>
 
@@ -193,7 +159,7 @@
         {% endblock bodycontent %}
 
 
         {% 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 type="text/javascript">
             var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
             var STATIC_URL = "{{ STATIC_URL }}";
@@ -201,19 +167,10 @@
         {% compressed_js "base" %}
 
         {{ piwik_tag|safe }}
         {% compressed_js "base" %}
 
         {{ piwik_tag|safe }}
-        <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-        <script type="text/javascript">
-        var pageTracker = _gat._getTracker("UA-2576694-1");
-        pageTracker._trackPageview();
-        </script>
 
                {% block extrabody %}
                {% endblock %}
 
 
                {% block extrabody %}
                {% endblock %}
 
-        <script src="{{ STATIC_URL }}js/modernizr.custom.19652.js"></script>
-        <!--script src="{{ STATIC_URL }}js/modernizr-latest.js"></script-->
+        <script src="{% static "js/modernizr.custom.19652.js" %}"></script>
     </body>
 </html>
     </body>
 </html>