Merge branch 'master' into forum

[edumed.git] / edumed / templates / base.html
diff --git a/edumed/templates/base.html b/edumed/templates/base.html

index 48b074f..5486d6d 100644 (file)
--- a/edumed/templates/base.html
+++ b/edumed/templates/base.html
@@ -1,5 +1,4 @@
  <!DOCTYPE html>
-{% load url from future %}
  {% load i18n static %}
  {% load fnp_common fnp_share fnp_lang macros %}
  {% load compressed static %}
@@ -25,13 +24,15 @@
          <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script></script><![endif]-->
      </head>
      <body id="{% block body-id %}body{% endblock %}">
-
          <div id="header-wrapper">
          <header class="main" style="position:relative;">
              <!--img
                  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">
@@ -98,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>