X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/483e6706c77dd3531f8b02334a7fde0491ca138d..42c42960c2dce4500f12dd14a68a10ed4f06abf5:/edumed/templates/base.html diff --git a/edumed/templates/base.html b/edumed/templates/base.html index ca28197..1c8f434 100644 --- 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 %} @@ -20,17 +19,20 @@ <meta property='og:site_name' content='{% usemacro site_name %}' /> <meta property='og:description' content='{% block og_description %}{% endblock %}' /> <meta property='og:type' content='{% block og_type %}website{% endblock %}' /> - <meta property='og:image' content='{% block og_image %}{% endblock %}' /> + <meta property='og:image' content='{% block og_image %}http://edukacjamedialna.edu.pl/static/img/logo.png{% endblock %}' /> <meta property='og:locale' content='pl_PL' /> + <!--[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"> @@ -43,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> @@ -52,7 +54,7 @@ <div id="tagline">Scenariusze zajÄÄ, Äwiczenia, materiaÅy</div> <div id="search"> - <form action=""> + <form action="{% url 'haystack_search' %}"> <input name="q" placeholder="szukaj" /><button><span>→</span></button> </form> </div> @@ -92,10 +94,12 @@ </div> {% sponsor_page "footer" %} <div class="clr"></div> + <div class="footer-extra">{% block footer_extra %}{% endblock %}</div> </footer> <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>