fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More annoying.
[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
a8b9cf4
..
8bdd431
100644
(file)
--- a/
src/wolnelektury/templates/base/superbase.html
+++ b/
src/wolnelektury/templates/base/superbase.html
@@
-5,9
+5,10
@@
{% load static from staticfiles %}
{% load catalogue_tags funding_tags reporting_stats %}
{% load piwik_tags %}
{% 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 %}
{% load cache %}
{% 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">
{% get_current_language as LANGUAGE_CODE %}
<head>
<meta charset="utf-8">
@@
-26,6
+27,7
@@
<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' %}"/>
<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' %}"/>
+ <link rel="manifest" href="/manifest.json">
{% stylesheet "main" %}
{% block extrahead %}{% endblock %}
</head>
{% stylesheet "main" %}
{% block extrahead %}{% endblock %}
</head>
@@
-34,7
+36,13
@@
{% block bodycontent %}
{% block annoy %}
{% 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 %}
+ {% endcache %}
+ {% endif %}
{% endblock %}
<div id="whole-header">
{% endblock %}
<div id="whole-header">
@@
-62,8
+70,8
@@
</span>
<div id="lang-menu-items">
{% for lang in LANGUAGES %}
</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>
<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>
@@
-75,31
+83,27
@@
<a id="show-menu"></a>
<nav id="menu">
<ul id="user-info">
<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' %}">
<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>
</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>
<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>
<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">
</ul>
<ul id="main-menu">
@@
-112,15
+116,15
@@
<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>
- <li{% if active_menu_item == '
gallery
' %} class="active"{% endif %}>
- <a href="{% url '
gallery' %}">{% trans "Gallery
" %}</a>
+ <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>
</ul>
</nav>
</li>
<li{% if active_menu_item == 'all_works' %} class="active"{% endif %}>
<a href="{% url 'catalogue' %}">{% trans "All works" %}</a>
</li>
</ul>
</nav>
- <form id="search-area" action="{% url 'search' %}">
+ <form id="search-area" action="{% url '
wl
search' %}">
<div id="search-field">
<label for="search">{{ search_form.q.label }}</label>
{{ search_form.q }}
<div id="search-field">
<label for="search">{{ search_form.q.label }}</label>
{{ search_form.q }}
@@
-147,9
+151,9
@@
<div id="footer-wrapper">
<footer id="main">
<div id="footer-wrapper">
<footer id="main">
- {%
ssi_include 'chunk' key=
'footer' %}
+ {%
chunk
'footer' %}
{% block add_footer %}{% endblock %}
{% block add_footer %}{% endblock %}
- {% s
si_include 'sponsor_page' name=
'footer' %}
+ {% s
ponsor_page
'footer' %}
</footer>
</div>
</footer>
</div>