fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
pipeline bug
[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 57dbb1a..08d60a3 100644 (file)
--- a/apps/wolnelektury_core/templates/superbase.html
+++ b/apps/wolnelektury_core/templates/superbase.html
@@ -1,9 +1,12 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
+{% spaceless %}
 <html lang="{{ LANGUAGE_CODE }}" 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 static from staticfiles %}
-    {% load catalogue_tags funding_tags reporting_stats sponsor_tags %}
-    {% load chunks %}
+    {% load pipeline i18n %}
+    {% load static from staticfiles %}
+    {% load catalogue_tags funding_tags reporting_stats %}
+    {% load piwik_tags %}
+    {% load ssi_include ssi_csrf_token from ssify %}
+    {% load user_username user_is_staff from common_tags %}
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -12,62 +15,56 @@
         <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 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 %}" />
+        <meta name="description" content="{% block metadescription %}Darmowe, opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
         {% block ogextra %}{% endblock %}
         {% block ogextra %}{% endblock %}
-        
 
 
-        <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 '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 "main" %}
+        <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury" href="{% static 'opensearch.xml' %}" />
+        {% stylesheet "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 %}
-        {% funding link=1 closeable=1 add_class="funding-top-header" %}
+
+        {% if not funding_no_show_current %}
+            {% current_offer as current_offer %}
+            {{ current_offer.if }}
+                {% ssi_include 'funding_top_bar' pk=current_offer %}
+            {{ current_offer.endif }}
+        {% endif %}
+
         <div id="header-wrapper">
         <header id="main">
             <a href="/" id="logo">
         <div id="header-wrapper">
         <header id="main">
             <a href="/" id="logo">
-                <img src="{% static 'img/logo-neon.png' %}"
-                    alt="Wolne Lektury" />
+                <img src="{% static 'img/logo-neon.png' %}" alt="Wolne Lektury" />
             </a>
 
             <p id="user-info">
             </a>
 
             <p id="user-info">
-                {% if user.is_authenticated %}
-                    {% trans "Welcome" %}, 
-                    <span class="hidden-box-wrapper">
+                {% user_username as user_username %}
+                {% user_is_staff as user_is_staff %}
+                {{ user_username.if }}{% trans "Welcome" %}, <span class="hidden-box-wrapper">
                         <a href="{% url 'user_settings' %}" class="hidden-box-trigger">
                         <a href="{% url 'user_settings' %}" class="hidden-box-trigger">
-                            <strong>{{ user.username }}</strong>
+                            <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>
                         </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 %}
-                    | <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">
-                            {% trans "Sign in" %}</a>
-                    /
-                    <a href="{% url 'register' %}?next={{ request.path }}"
-                        id="register" class="ajaxable">
-                            {% trans "Register" %}</a>
-                {% endif %}
+                    </span> | <a href="{% url 'social_my_shelf' %}" id="user-shelves-link">{% trans "My shelf" %}</a>
+                {{ user_username.endif }}
+                {{ user_is_staff.if }} | <a href="/admin/">{% trans "Administration" %}</a>
+                {{ user_is_staff.endif }}
+                {{ user_username.if }} | <a href="{% url 'logout' %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
+                {{ user_username.else }}
+                    <a href="{% url 'login' %}?next={{ request.path }}" id="login" class="ajaxable">{% trans "Sign in" %}</a> / <a href="{% url 'register' %}?next={{ request.path }}" id="register" class="ajaxable">{% trans "Register" %}</a>
+                {{ user_username.endif }}
             </p>
 
             <p id="tagline">
             </p>
 
             <p id="tagline">
-                {% cache 60 tagline LANGUAGE_CODE %}
                     {% url 'book_list' as b %}
                     {% url 'infopage' 'prawa' as r %}
                         {% count_books book_count %}
                     {% url 'book_list' as b %}
                     {% url 'infopage' 'prawa' as r %}
                         {% count_books book_count %}
@@ -76,7 +73,6 @@
                     {% plural %}
                     <a href='{{b}}'>{{c}}</a> free readings you have <a href='{{r}}'>right to</a>
                     {% endblocktrans %}
                     {% plural %}
                     <a href='{{b}}'>{{c}}</a> free readings you have <a href='{{r}}'>right to</a>
                     {% endblocktrans %}
-                {% endcache %}
             </p>
 
             <form id="search-area" action="{% url 'search' %}">
             </p>
 
             <form id="search-area" action="{% url 'search' %}">
@@ -96,17 +92,14 @@
             <div id="lang-menu" class="hoverget">
                 <span id='lang-button' class='hoverclick'>
                     <span class="lang-flag">⚐</span>
             <div id="lang-menu" class="hoverget">
                 <span id='lang-button' class='hoverclick'>
                     <span class="lang-flag">⚐</span>
-                    <span class="label">{% 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">
                 </span>
                 <div id="lang-menu-items">
                 {% for lang in LANGUAGES %}
                     <form action="{% url 'django.views.i18n.set_language' %}" method="post">
-                    {% csrf_token %}
+                    {% ssi_csrf_token %}
                     <input type="hidden" name="language" value="{{ lang.0 }}" />
                     <input type="hidden" name="language" value="{{ lang.0 }}" />
-                    <button type="submit"
-                        lang="{{ lang.0 }}"
-                        class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}"
-                        >{{ lang.1 }}</button>
+                    <button type="submit" lang="{{ lang.0 }}" class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}">{{ lang.1 }}</button>
                     </form>
                 {% endfor %}
                 </div>
                     </form>
                 {% endfor %}
                 </div>
@@ -125,9 +118,9 @@
 
         <div id="footer-wrapper">
         <footer id="main">
 
         <div id="footer-wrapper">
         <footer id="main">
-            {% chunk 'footer' %}
+            {% ssi_include 'chunk' key='footer' %}
             {% block add_footer %}{% endblock %}
             {% block add_footer %}{% endblock %}
-            {% sponsor_page "footer" %}
+            {% ssi_include 'sponsor_page' name='footer' %}
         </footer>
         </div>
 
         </footer>
         </div>
 
@@ -146,17 +139,15 @@
 
 
         <script type="text/javascript" src="//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" %}
+        <script type="text/javascript">var LANGUAGE_CODE="{{ LANGUAGE_CODE }}"; var STATIC_URL="{{ STATIC_URL }}";</script>
+        {% javascript "base" %}
 
 
-        {{ piwik_tag|safe }}
+        {% tracking_code %}
 
                {% block extrabody %}
                {% endblock %}
 
 
                {% block extrabody %}
                {% endblock %}
 
-        <script src="{% static "js/modernizr.custom.19652.js" %}"></script>
+        <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>
     </body>
 </html>
     </body>
 </html>
+{% endspaceless %}