X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e390e737951ea78e783070b9729a877945daaa42..c1c87f44a4f252023c1e7cfa6f03aaa0f2b596a3:/templates/base.html
diff --git a/templates/base.html b/templates/base.html
index 78bb6b5a2..69f5dd2f9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,4 @@
-{% load chunks compressed %}
+{% load chunks compressed catalogue_tags %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,6 +12,9 @@
{% endblock %}
</head>
<body id="{% block bodyid %}base{% endblock %}">
+ <div id="top-message">
+ {% chunk "top-message" %}
+ </div>
<div id="header">
<div id="logo">
<a href="/"><img src="/media/img/logo.png" alt="WolneLektury.pl - logo" /></a>
@@ -20,10 +23,11 @@
{% if user.is_authenticated %}
<p>
Zalogowany jako <strong>{{ user.username }}</strong>
+ | <a href="#">Zestawy</a>
{% if user.is_staff %}
| <a href="/admin/">Administracja</a>
{% endif %}
- | <a href="{% url logout %}">Wyloguj</a>
+ | <a href="{% url logout %}?next={{ request.get_full_path }}">Wyloguj</a>
</p>
{% else %}
<p><a href="{% url login %}" id="login-register-link">Zaloguj siÄ / ZaÅóż konto</a></p>
@@ -67,26 +71,21 @@
<div id="login-register-window">
<div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
<div class="target">
- <form method="post" action="{% url login %}" id="login-form" class="cuteform" style="width: 18em;">
+ <form method="post" action="{% url login %}" id="login-form" class="cuteform">
<h2>Zaloguj siÄ / <a href="#" id="show-registration-form" style="font-size: 0.85em; font-weight: normal">ZaÅóż konto</a></h2>
+ <p><span id="id_login-__all__" /></p>
<ol>
- <li><label for="id_username" title="np. Anna Kowalska">Nazwa użytkownika:</label> <input id="id_username" type="text" name="username" maxlength="30" /></li>
- <li><label for="id_password">HasÅo:</label> <input type="password" name="password" id="id_password" /></li>
+ {% authentication_form %}
<li><input type="submit" value="Zaloguj siÄ" /></li>
</ol>
- <p style="display:none;"><input type="hidden" name="next" value="{{ request.get_full_path }}" /></p>
</form>
- <form method="post" action="{% url login %}" id="registration-form" class="cuteform" style="display: none; width: 18em;">
+ <form method="post" action="{% url register %}" id="registration-form" class="cuteform" style="display: none;">
<h2><a href="#" id="show-login-form" style="font-size: 0.85em; font-weight: normal">Zaloguj siÄ</a> / ZaÅóż konto</h2>
+ <p><span id="id_registration-__all__" /></p>
<ol>
- <li><label for="id_username" title="np. Anna Kowalska">Nazwa użytkownika:</label> <input id="id_username" type="text" name="username" maxlength="30" /></li>
- <li><label for="id_email">Adres e-mail:</label> <input id="id_email" type="text" name="email" maxlength="80" /></li>
- <li><label for="id_password">HasÅo:</label> <input type="password" name="password" id="id_password" /></li>
- <li><label for="id_password2">Powtórz hasÅo:</label> <input type="password" name="password2" id="id_password2" /></li>
-
+ {% user_creation_form %}
<li><input type="submit" value="ZaÅóż konto" /></li>
</ol>
- <p style="display:none;"><input type="hidden" name="next" value="{{ request.get_full_path }}" /></p>
</form>
</div>
</div>