X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/eb67ad6906c035e1456bd1bc5b2ed86eef6fefb9..c047053dab0ec7d125fd5b2540a01045e64dd3fa:/edumed/templates/base_super.html?ds=sidebyside

diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html
index 1c87212..f0f2d72 100644
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@ -2,11 +2,10 @@
 {% load i18n static %}
 {% load fnp_common fnp_share fnp_lang macros %}
 {% load compressed static %}
-{% load subdomainurls %}
 {% load piwik_tags %}
 
 {% macro title %}{% block title %}{% endblock %}{% endmacro %}
-{% macro site_name %}Edukacja medialna{% endmacro %}
+{% macro site_name %}Olimpiada Cyfrowa{% endmacro %}
 
 <html prefix="og: http://ogp.me/ns#">
     <head>
@@ -41,10 +40,10 @@
                 style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
                 -->
             {% if request.user.is_authenticated %}
-                <a href="{% url 'logout' subdomain=None %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
+                <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="/">{% block logo %}<img src="{% static "img/logo-oc.png" %}" alt="Edukacja medialna" height="73"/>{% endblock %}</a>
+            <a id="logo" href="/">{% block logo %}<img src="{% static "img/logo-oc.png" %}" alt="Olimpiada Cyfrowa" height="73"/>{% endblock %}</a>
             <div id="organizer">
                 {% block organizer %}
                 Projekt prowadzi:<br/>
@@ -60,13 +59,13 @@
             </div>
 
             <div id="tagline">{% block tagline %}{% endblock %}</div>
-            {% block searchbox %}
-              <div id="search">
-                  <form action="{% url 'haystack_search' None %}">
-                      <input name="q" placeholder="szukaj" /><button><span>&rarr;</span></button>
-                  </form>
-              </div>
-            {% endblock %}
+{#            {% block searchbox %}#}
+{#              <div id="search">#}
+{#                  <form action="{% url 'haystack_search' None %}">#}
+{#                      <input name="q" placeholder="szukaj" /><button><span>&rarr;</span></button>#}
+{#                  </form>#}
+{#              </div>#}
+{#            {% endblock %}#}
             <div class="clr"></div>
         </header>
         </div>
@@ -109,6 +108,6 @@
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
     {% block extra_script %}{% endblock %}
-    {% tracking_code %}
+    {% block tracking %}{% tracking_code %}{% endblock %}
     </body>
 </html>
