X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6c49f9cfb80c746034d7113883c7c355f547187e..b0fadf2591f3af957c1c8e0307d0bcef9e9f8538:/src/wolnelektury/templates/base/superbase.html?ds=sidebyside diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html index 749b6b56c..176b3c3f4 100644 --- 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 ssi_include ssi_csrf_token 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,12 +30,20 @@ <link rel="manifest" href="/manifest.json"> {% stylesheet "main" %} {% block extrahead %}{% endblock %} + {% tracking_code %} </head> <body id="{% block bodyid %}base{% endblock %}"> + <ul id="skiplinks"> + <li><a href="#main-content">{% trans "Go to content" %}</a></li> + <li><a id="skiplink-search" href="#search"">{% trans "Go to search" %}</a></li> + <li><a href="{% block footerlink %}#footer-wrapper{% endblock %}">{% trans "Go to page footer" %}</a></li> + </ul> {% block bodycontent %} {% block annoy %} + {% annoy_banner 'blackout' %} + {% annoy_banner 'top' %} {% if not funding_no_show_current %} {% cache 120 funding_top_bar LANGUAGE_CODE %} {% funding_top_bar %} @@ -61,17 +70,17 @@ </p> <div id="lang-menu" class="hoverget"> - <span id='lang-button' class='hoverclick'> - <span class="lang-flag">â</span> + <span id='lang-button' class='hoverclick' tabindex="0"> + <img src="{% static "img/contrib/language/language.svg" %}" alt=""> <span class="label"> {% trans "Language" %}</span> </span> <div id="lang-menu-items"> {% for lang in LANGUAGES %} - <form action="{% url 'django.views.i18n.set_language' %}" method="post"> - {% ssi_csrf_token %} + <form action="{% url 'set_language' %}" method="post"> + {% csrf_token %} <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 }}" tabindex="121" + class="{% if lang.0 == LANGUAGE_CODE %}active{% endif %}">{{ lang.1 }}</button> </form> {% endfor %} </div> @@ -80,58 +89,47 @@ <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 == 'books' %} class="active"{% endif %}> - <a href="{% url 'book_list' %}">{% trans "Literature" %}</a> - </li> - <li{% if active_menu_item == 'theme' %} class="active"{% endif %}> - <a href="{% url 'theme_catalogue' %}">{% trans "Themes" %}</a> - </li> - <li{% if active_menu_item == 'audiobooks' %} class="active"{% endif %}> - <a href="{% url 'audiobook_list' %}">{% trans "Audiobooks" %}</a> - </li> - <li{% if active_menu_item == 'gallery' %} class="active"{% endif %}> - <a href="{% url 'gallery' %}">{% trans "Gallery" %}</a> - </li> - <li{% if active_menu_item == 'all_works' %} class="active"{% endif %}> - <a href="{% url 'catalogue' %}">{% trans "All works" %}</a> - </li> + <ul id="main-menu-side"> + {% include "main_menu.html" %} </ul> </nav> - <form id="search-area" action="{% url 'search' %}"> + <form id="search-area" action="{% url 'wlsearch' %}"> <div id="search-field"> <label for="search">{{ search_form.q.label }}</label> {{ search_form.q }} </div> <button type='submit'>{% trans "Search" %}</button> </form> + + <ul id="main-menu"> + {% include "main_menu.html" %} + </ul> + + + </header> </div> </div> @@ -152,9 +150,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> @@ -167,15 +165,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>