Fixing broken search form markup

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

diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html
index ac9f600..a0dccf2 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 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 %}
 
 {% macro title %}{% block title %}{% endblock %}{% endmacro %}
 {% macro site_name %}Edukacja medialna{% endmacro %}


@@ -31,7 +31,7 @@
                 style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
                 -->
             {% if request.user.is_authenticated %}
                 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>
             {% endif %}
             <div id="header-top">
             <a id="logo" href="/"><img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/></a>


@@ -49,7 +49,7 @@
 
             <div id="tagline">{% block tagline %}{% endblock %}</div>
             <div id="search">
 
             <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>
                     <input name="q" placeholder="szukaj" /><button><span>&rarr;</span></button>
                 </form>
             </div>


@@ -87,7 +87,8 @@
                 – Na tych samych warunkach 3.0</a>.
                 </p>
             </div>
                 – 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>
             <div class="clr"></div>
             <div class="footer-extra">{% block footer_extra %}{% endblock %}</div>
         </footer>