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 34c795e..a7ba6e8
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -1,14 +1,17 @@
 <!DOCTYPE html>
 {% load url from future %}
-{% load i18n static %}
+{% load i18n %}
+{% load static from staticfiles %}
 {% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang %}
 {% load compressed %}
+{% load chunks %}
+{% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
        <title>{% block "titleextra" %}{% endblock %}{% trans "Right to Culture" %}</title>
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
-
+        {% block "extra_css" %}{% endblock %}
         <meta charset="UTF-8" />
         <meta property='og:url' content='{% block "ogurl" %}{{ request.get_full_path|build_absolute_uri:request }}{% endblock %}' />
         <meta property='og:title' content='{% block "ogtitle" %}{% trans "Right to Culture" %}{% endblock %}' />
@@ -17,9 +20,10 @@
         <meta property='og:type' content='{% block "ogtype" %}website{% endblock %}' />
         <meta property='og:image' content='{% block "ogimage" %}{{ "/static/img/square-logo.png"|build_absolute_uri:request }}{% endblock %}' />
         <meta property='og:locale' content='pl_PL' />
+        {% block "headextra" %}{% endblock %}
     </head>
     <body>
-    {% include "annoy.html" %}
+    {% load fnp_annoy %}{% annoy %}
     <div id="body">
         <div id="header-bar">
         <div class="bar-left">
@@ -30,7 +34,7 @@
         <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">
@@ -58,7 +62,13 @@
         <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">
@@ -66,7 +76,7 @@
                     {% events_box %}
                 </div>
                 <div class="sidebar-box" style="text-align: center">
-                   <a href="/publikacje/Dzielenie-sie/"><img src="{% static 'img/aigrain.jpg' %}" alt="Publikacja: Philippe Aigrain, Dzielenie się" /></a>
+                    {% chunk 'side_promo' %}
                 </div>
                 <div id="sidebar-box-categories" class="sidebar-box">
                     {% categories 'topics' %}
@@ -107,6 +117,7 @@
                 Nr konta: 46 10201097 0000 7502 0001 6766
             </p>
             <p class="footer-item">
+                <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>
@@ -115,8 +126,9 @@
         </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' %}
-    {{ piwik_tag|safe }}
+    {% tracking_code %}
+    {% block "extra_js" %}{% endblock %}
     </body>
 </html>