Wording.

[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 33344bd..2be2adb 100644 (file)
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -37,7 +37,9 @@
       {% block bodycontent %}
 
         {% block annoy %}
       {% block bodycontent %}
 
         {% block annoy %}

-          {% annoy_banner 'blackout' %}
+          {% if AB.BLACKOUT %}
+            {% annoy_banner 'blackout' %}
+          {% endif %}

           {% annoy_banner 'top' %}
           {% if not funding_no_show_current %}
             {% cache 120 funding_top_bar LANGUAGE_CODE %}
           {% annoy_banner 'top' %}
           {% if not funding_no_show_current %}
             {% cache 120 funding_top_bar LANGUAGE_CODE %}


@@ -66,7 +68,7 @@
 
               <div id="lang-menu" class="hoverget">
                 <span id='lang-button' class='hoverclick'>
 
               <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">
                   <span class="label"> {% trans "Language" %}</span>
                 </span>
                 <div id="lang-menu-items">


@@ -120,11 +122,11 @@
                   <li{% if active_menu_item == 'audiobooks' %} class="active"{% endif %}>
                     <a href="{% url 'audiobook_list' %}">{% trans "Audiobooks" %}</a>
                   </li>
                   <li{% if active_menu_item == 'audiobooks' %} class="active"{% endif %}>
                     <a href="{% url 'audiobook_list' %}">{% trans "Audiobooks" %}</a>
                   </li>

-                  {% url 'subscribe' as u %}
-                  <li{% if request.path == u %} class="active"{% endif %}>
-                    <a href="{{ u }}">
-                      {% trans "Newsletter" %}
-                    </a>
+                  <li{% if active_menu_item == 'all_works' %} class="active"{% endif %}>
+                    <a href="{% url 'catalogue' %}">{% trans "All works" %}</a>
+                  </li>
+                  <li>
+                    <a href="{% url 'subscribe' %}">{% trans "Newsletter" %}</a>

                   </li>
                 </ul>
               </nav>
                   </li>
                 </ul>
               </nav>


@@ -170,7 +172,7 @@
         </div>
       {% endblock bodycontent %}
 
         </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 type="text/javascript">
         var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
         var STATIC_URL = "{{ STATIC_URL }}";