fnp / prawokultury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
local changes from server
[prawokultury.git] / prawokultury / templates / base.html
diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
old mode 100755 (executable)
new mode 100644 (file)
index f296cb6..a7ba6e8
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -2,9 +2,10 @@
 {% load url from future %}
 {% load i18n %}
 {% load static from staticfiles %}
 {% load url from future %}
 {% load i18n %}
 {% load static from staticfiles %}
-{% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang fnp_annoy %}
+{% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang %}
 {% load compressed %}
 {% load chunks %}
 {% load compressed %}
 {% load chunks %}
+{% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
        <title>{% block "titleextra" %}{% endblock %}{% trans "Right to Culture" %}</title>
 <html prefix="og: http://ogp.me/ns#">
     <head>
        <title>{% block "titleextra" %}{% endblock %}{% trans "Right to Culture" %}</title>
@@ -22,7 +23,7 @@
         {% block "headextra" %}{% endblock %}
     </head>
     <body>
         {% block "headextra" %}{% endblock %}
     </head>
     <body>
-    {% annoy %}
+    {% load fnp_annoy %}{% annoy %}
     <div id="body">
         <div id="header-bar">
         <div class="bar-left">
     <div id="body">
         <div id="header-bar">
         <div class="bar-left">
@@ -33,7 +34,7 @@
         <div class="bar-right">
             <div class="org-fnp">
                 <span>{% trans "Organizer" %}</span><br/>
         <div class="bar-right">
             <div class="org-fnp">
                 <span>{% trans "Organizer" %}</span><br/>
-                <a href="http://nowoczesnapolska.org.pl">
+                <a href="//nowoczesnapolska.org.pl">
                     <img src="{% static 'img/logo-fnp.png' %}"
                         alt="{% trans "Modern Poland Foundation" %}" /></a>
             </div><div class="org-trust">
                     <img src="{% static 'img/logo-fnp.png' %}"
                         alt="{% trans "Modern Poland Foundation" %}" /></a>
             </div><div class="org-trust">
@@ -61,7 +62,13 @@
         <div style="clear: both;"></div>
         </div>
 
         <div style="clear: both;"></div>
         </div>
 
-        <div id="main-bar">
+        {% comment %}
+        <a style="width: 100%; display: inline-block;" href="https://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
+            <img src="{% static 'img/960x150_ogolny.jpg' %}">
+        </a>
+        {% endcomment %}
+
+        <div id="main-bar" style='clear: both;'>
         <div id="sidebar" class="bar-right">
             {% block "sidebar" %}
                 <div class="sidebar-box">
         <div id="sidebar" class="bar-right">
             {% block "sidebar" %}
                 <div class="sidebar-box">
@@ -110,7 +117,7 @@
                 Nr konta: 46 10201097 0000 7502 0001 6766
             </p>
             <p class="footer-item">
                 Nr konta: 46 10201097 0000 7502 0001 6766
             </p>
             <p class="footer-item">
-                <a href="http://nowoczesnapolska.org.pl/prywatnosc/">Polityka prywatności i ciasteczka</a>
+                <a href="https://nowoczesnapolska.org.pl/prywatnosc/">Polityka prywatności i ciasteczka</a>
                 <br/><br/>
                 {% trans "If not explicitly stated otherwise, all texts are licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license." %}
             </p>
                 <br/><br/>
                 {% trans "If not explicitly stated otherwise, all texts are licensed under the <a href='http://creativecommons.org/licenses/by-sa/3.0/'>Creative Commons Attribution-Share Alike</a> free license." %}
             </p>
@@ -119,9 +126,9 @@
         </div>
 
     </div>
         </div>
 
     </div>
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
+    <script type="text/javascript" src="//code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
     {% compressed_js 'base' %}
     {% compressed_js 'base' %}
-    {{ piwik_tag|safe }}
+    {% tracking_code %}
     {% block "extra_js" %}{% endblock %}
     </body>
 </html>
     {% block "extra_js" %}{% endblock %}
     </body>
 </html>