Merge branch 'forum'

[edumed.git] / edumed / templates / base.html

diff --git a/edumed/templates/base.html b/edumed/templates/base.html
index 417dc88..1c8f434 100644 (file)
--- a/edumed/templates/base.html
+++ b/edumed/templates/base.html
@@ -30,6 +30,9 @@
                 src="{% static "tlo.png" %}"
                 style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
                 -->
+            {% if request.user.is_authenticated %}
+                <a href="{% url 'logout' %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
+            {% endif %}
             <div id="header-top">
             <a id="logo" href="/"><img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/></a>
             <div id="organizer">
@@ -42,7 +45,7 @@
                 <li><a class="menu-lekcje" href="{% url "catalogue_lessons" %}">Lekcje</a></li>
                 <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>
                 <li><a class="menu-wspolpraca" href="{% url "info" "wspolpraca/" %}">Współpraca</a></li>
-                <li><a class="menu-szkolenia" href="{% url "info" "konkurs/" %}">Konkurs</a></li>
+                <li><a class="menu-szkolenia" href="{% url "info" "turniej/" %}">Turniej</a></li>
                 <li><a class="menu-wesprzyj" href="{% url "info" "wesprzyj/" %}">Wesprzyj nas</a></li>
                 <li><a class="menu-o-nas" href="{% url "info" "o-nas/" %}">O nas</a></li>
                 <li><a class="menu-kontakt" href="{% url "info" "kontakt/" %}">Kontakt</a></li>
@@ -59,7 +62,7 @@
         </header>
         </div>
 
-        <div id="content">{% block body %}{% block content %}{% endblock %}{% endblock %}</div>
+        <div id="content">{% block body %}{% endblock %}</div>
 
         <footer class="main">
             {# chunks? #}
@@ -96,6 +99,7 @@
 
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
     {% compressed_js 'base' %}
+    {% block extra_script %}{% endblock %}
     {{ piwik_tag|safe }}
     </body>
 </html>