Bring back competencies catalogue to the main site

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

diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html
index ac9f600..9ee9cec 100644 (file)
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@ -2,7 +2,7 @@
 {% load i18n static %}
 {% load fnp_common fnp_share fnp_lang macros %}
 {% load compressed static %}
-{% load sponsor_tags %}
+{% load subdomainurls %}
 
 {% macro title %}{% block title %}{% endblock %}{% endmacro %}
 {% macro site_name %}Edukacja medialna{% endmacro %}
@@ -31,15 +31,17 @@
                 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>
+                <a href="{% url 'logout' subdomain=None %}" 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">
+                {% block organizer %}
                 Projekt prowadzi:<br/>
                 <a href="http://nowoczesnapolska.org.pl">
                     <img src="{% static "img/logo_fnp.png" %}" alt="Fundacja Nowoczesna Polska" />
                 </a>
+                {% endblock %}
             </div>
             <nav><ul>
                 {% block top_navigation %}
@@ -49,7 +51,7 @@
 
             <div id="tagline">{% block tagline %}{% endblock %}</div>
             <div id="search">
-                <form action="">
+                <form action="{% url 'haystack_search' None %}">
                     <input name="q" placeholder="szukaj" /><button><span>&rarr;</span></button>
                 </form>
             </div>
@@ -87,7 +89,8 @@
                 – Na tych samych warunkach 3.0</a>.
                 </p>
             </div>
-            {% sponsor_page "footer" %}
+            {% block sponsors %}
+            {% endblock %}
             <div class="clr"></div>
             <div class="footer-extra">{% block footer_extra %}{% endblock %}</div>
         </footer>