fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Payment form fixes.
[wolnelektury.git] / src / wolnelektury / templates / base / superbase.html
diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html
index b03392f..13cf50d 100644 (file)
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -2,12 +2,13 @@
 {% spaceless %}
   <html lang="{{ LANGUAGE_CODE }}" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
     {% load pipeline i18n %}
-    {% load static from staticfiles %}
+    {% load static %}
     {% load catalogue_tags funding_tags reporting_stats %}
     {% load piwik_tags %}
-    {% load ssi_include from ssify %}
-    {% load user_username user_is_staff from common_tags %}
     {% load cache %}
+    {% load chunk from chunks %}
+    {% load sponsor_page from sponsors %}
+    {% load annoy_banner from annoy %}
     {% get_current_language as LANGUAGE_CODE %}
     <head>
       <meta charset="utf-8">
@@ -29,13 +30,15 @@
       <link rel="manifest" href="/manifest.json">
       {% stylesheet "main" %}
       {% block extrahead %}{% endblock %}
+      {% tracking_code %}
     </head>
     <body id="{% block bodyid %}base{% endblock %}">
 
       {% block bodycontent %}
 
         {% block annoy %}
-          {% include "annoy.html" %}
+          {% annoy_banner 'blackout' %}
+          {% annoy_banner 'top' %}
           {% if not funding_no_show_current %}
             {% cache 120 funding_top_bar LANGUAGE_CODE %}
               {% funding_top_bar %}
@@ -81,34 +84,33 @@
               <a id="show-menu"></a>
               <nav id="menu">
                 <ul id="user-info">
-                  {% user_username as user_username %}
-                  {% user_is_staff as user_is_staff %}
-                  {{ user_username.if }}
+                  {% if request.user.is_authenticated %}
                     <li>
                       <a href="{% url 'user_settings' %}">
-                        <strong>{{ user_username }}</strong>
+                        <strong>{{ request.user.username }}</strong>
                       </a>
                     </li>
                     <li>
                       <a href="{% url 'social_my_shelf' %}" id="user-shelves-link">{% trans "My shelf" %}</a>
                     </li>
-                  {{ user_username.endif }}
-                  {{ user_is_staff.if }}
-                    <li><a href="{% url 'admin:index' %}">{% trans "Administration" %}</a></li>
-                  {{ user_is_staff.endif }}
-                  {{ user_username.if }}
+                    {% if request.user.is_staff %}
+                      <li><a href="{% url 'admin:index' %}">{% trans "Administration" %}</a></li>
+                    {% endif %}
                     <li>
                       <a href="{% url 'logout' %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
                     </li>
-                  {{ user_username.else }}
+                  {% else %}
                     <li>
                       <a href="{% url 'login' %}?next={{ request.path }}" id="login">{% trans "Sign in" %}</a>
                       / <a href="{% url 'register' %}?next={{ request.path }}" id="register">{% trans "Register" %}</a>
                     </li>
-                  {{ user_username.endif }}
+                  {% endif %}
                 </ul>
 
                 <ul id="main-menu">
+                  <li{% if active_menu_item == 'club' %} class="active"{% endif %}>
+                    <a href="{% url 'club_join' %}">{% trans "Wesprzyj nas" %}</a>
+                  </li>
                   <li{% if active_menu_item == 'books' %} class="active"{% endif %}>
                     <a href="{% url 'book_list' %}">{% trans "Literature" %}</a>
                   </li>
@@ -118,9 +120,6 @@
                   <li{% if active_menu_item == 'audiobooks' %} class="active"{% endif %}>
                     <a href="{% url 'audiobook_list' %}">{% trans "Audiobooks" %}</a>
                   </li>
-                  <li{% if active_menu_item == 'club' %} class="active"{% endif %}>
-                    <a href="{% url 'club_join' %}">{% trans "Wesprzyj nas" %}</a>
-                  </li>
                   <li{% if active_menu_item == 'all_works' %} class="active"{% endif %}>
                     <a href="{% url 'catalogue' %}">{% trans "All works" %}</a>
                   </li>
@@ -153,9 +152,9 @@
 
         <div id="footer-wrapper">
           <footer id="main">
-            {% ssi_include 'chunk' key='footer' %}
+            {% chunk 'footer' %}
             {% block add_footer %}{% endblock %}
-            {% ssi_include 'sponsor_page' name='footer' %}
+            {% sponsor_page 'footer' %}
           </footer>
         </div>
 
@@ -175,8 +174,6 @@
       </script>
       {% javascript "base" %}
 
-      {% tracking_code %}
-
       {% block extrabody %}{% endblock %}
 
       <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>