fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Collection link on main and slight funding wording change.
[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 3945716..e1483b6 100644 (file)
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -1,13 +1,14 @@
 <!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#" class="{% if VARIANT %}{{ VARIANT }}{% endif %}">
     {% load pipeline i18n %}
-    {% load static from staticfiles %}
+    {% load static %}
     {% load catalogue_tags funding_tags reporting_stats %}
     {% load piwik_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 %}
@@ -63,7 +66,7 @@
 
               <div id="lang-menu" class="hoverget">
                 <span id='lang-button' class='hoverclick'>
-                  <span class="lang-flag">⚐</span>
+                  <img src="{% static "img/contrib/language/language.svg" %}" alt="{% trans "Language" %}">
                   <span class="label"> {% trans "Language" %}</span>
                 </span>
                 <div id="lang-menu-items">
@@ -105,6 +108,9 @@
                 </ul>
 
                 <ul id="main-menu">
+                  <li{% if active_menu_item == 'club' %} class="active"{% endif %}>
+                    <a href="{% url 'club_join' %}">{% trans "Support us" %}</a>
+                  </li>
                   <li{% if active_menu_item == 'books' %} class="active"{% endif %}>
                     <a href="{% url 'book_list' %}">{% trans "Literature" %}</a>
                   </li>
@@ -114,11 +120,11 @@
                   <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{% if active_menu_item == 'collections' %} class="active"{% endif %}>
+                    <a href="{% url 'catalogue_collections' %}">{% trans "Collections" %}</a>
                   </li>
-                  <li{% if active_menu_item == 'all_works' %} class="active"{% endif %}>
-                    <a href="{% url 'catalogue' %}">{% trans "All works" %}</a>
+                  <li>
+                    <a href="{% url 'subscribe' %}">{% trans "Newsletter" %}</a>
                   </li>
                 </ul>
               </nav>
@@ -164,15 +170,13 @@
         </div>
       {% endblock bodycontent %}
 
-      <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.1/jquery.min.js" integrity="sha512-BkBgWiL0N/EFIbLZYGTgbksKG5bS6PtwnWvVk3gccv+KhtK/4wkLxCRGh+kelKiXx7Ey4jfTabLg3AEIPC7ENA==" crossorigin="anonymous"></script>
       <script type="text/javascript">
         var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
         var STATIC_URL = "{{ STATIC_URL }}";
       </script>
       {% javascript "base" %}
 
-      {% tracking_code %}
-
       {% block extrabody %}{% endblock %}
 
       <script src="{% static "js/contrib/modernizr.custom.19652.js" %}"></script>