fnp / edumed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Let the annoying commence.
[edumed.git] / edumed / templates / base_super.html
diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html
index 1339b68..753764f 100644 (file)
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@ -2,8 +2,8 @@
 {% 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 %}
 {% load subdomainurls %}
+{% load piwik_tags %}
 
 {% macro title %}{% block title %}{% endblock %}{% endmacro %}
 {% macro site_name %}Edukacja medialna{% endmacro %}
 
 {% macro title %}{% block title %}{% endblock %}{% endmacro %}
 {% macro site_name %}Edukacja medialna{% endmacro %}
@@ -26,7 +26,7 @@
     </head>
     <body id="{% block body-id %}body{% endblock %}">
         <div id="header-wrapper">
     </head>
     <body id="{% block body-id %}body{% endblock %}">
         <div id="header-wrapper">
-        <header class="main" style="position:relative;">
+        <header class="main {% block header_class %}{% endblock %}" style="position:relative;">
             <!--img
                 src="{% static "tlo.png" %}"
                 style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
             <!--img
                 src="{% static "tlo.png" %}"
                 style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
@@ -35,12 +35,14 @@
                 <a href="{% url 'logout' subdomain=None %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
             {% endif %}
             <div id="header-top">
                 <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>
+            <a id="logo" href="/">{% block logo %}<img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/>{% endblock %}</a>
             <div id="organizer">
             <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>
                 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 %}
             </div>
             <nav><ul>
                 {% block top_navigation %}
@@ -50,7 +52,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>
@@ -88,14 +90,14 @@
                 – 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>
 
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
-    {% compressed_js 'base' %}
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
     {% block extra_script %}{% endblock %}
     {% block extra_script %}{% endblock %}
-    {{ piwik_tag|safe }}
+    {% tracking_code %}
     </body>
 </html>
     </body>
 </html>