fnp / prawokultury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SQL fix.
[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 aecf00b..3da8027
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -1,34 +1,40 @@
 <!DOCTYPE html>
 {% load url from future %}
 <!DOCTYPE html>
 {% load url from future %}
-{% load i18n static %}
-{% load common_tags migdal_tags events_tags share %}
+{% load i18n %}
+{% load static from staticfiles %}
+{% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang fnp_annoy %}
 {% load compressed %}
 {% load compressed %}
+{% load chunks %}
+{% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
 <html prefix="og: http://ogp.me/ns#">
     <head>
-       <title>{% block "titleextra" %}{% endblock %}{% trans "Culture's right" %}</title>
+       <title>{% block "titleextra" %}{% endblock %}{% trans "Right to Culture" %}</title>
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
-
-        <meta property='og:url' content='{% block "ogurl" %}{% url 'migdal_main' %}{% endblock %}' />
-        <meta property='og:title' content='{% block "ogtitle" %}{% trans "Culture's right" %}{% endblock %}' />
-        <meta property='og:site_name' content='{% trans "Culture's right" %}' />
+        {% 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 %}' />
+        <meta property='og:site_name' content='{% trans "Right to Culture" %}' />
         <meta property='og:description' content='{% block "ogdescription" %}Prawokultury.pl to strona edukacyjna mająca za zadanie w przystępny i rzetelny sposób informować o wszelkich kwestiach związanych z prawem autorskim.{% endblock %}' />
         <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' />
         <meta property='og:description' content='{% block "ogdescription" %}Prawokultury.pl to strona edukacyjna mająca za zadanie w przystępny i rzetelny sposób informować o wszelkich kwestiach związanych z prawem autorskim.{% endblock %}' />
         <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>
     </head>
     <body>
+    {% annoy %}
     <div id="body">
         <div id="header-bar">
         <div class="bar-left">
             <a id="logo" href="{% url "migdal_main" %}">
     <div id="body">
         <div id="header-bar">
         <div class="bar-left">
             <a id="logo" href="{% url "migdal_main" %}">
-                <img alt="{% trans "Culture's right" %}"
+                <img alt="{% trans "Right to Culture" %}"
                     src="{% static "img/logo.png" %}" /></a>
         </div>
         <div class="bar-right">
             <div class="org-fnp">
                 <span>{% trans "Organizer" %}</span><br/>
                     src="{% static "img/logo.png" %}" /></a>
         </div>
         <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">
@@ -49,8 +55,9 @@
         </div>
         <ul id="menu" class="bar-left">
             {% block "main_menu" %}
         </div>
         <ul id="menu" class="bar-left">
             {% block "main_menu" %}
-                {% main_menu 'url' request.get_full_path %}
+                {% main_menu %}
             {% endblock %}
             {% endblock %}
+            <li id="item-lang">{% lang_switcher %}</li>
         </ul>
         <div style="clear: both;"></div>
         </div>
         </ul>
         <div style="clear: both;"></div>
         </div>
@@ -62,15 +69,19 @@
                     <h3><a href="{% url 'events' %}">{% trans "Upcoming events" %}</a></h3>
                     {% events_box %}
                 </div>
                     <h3><a href="{% url 'events' %}">{% trans "Upcoming events" %}</a></h3>
                     {% events_box %}
                 </div>
+                <div class="sidebar-box" style="text-align: center">
+                    {% chunk 'side_promo' %}
+                </div>
                 <div id="sidebar-box-categories" class="sidebar-box">
                     {% categories 'topics' %}
                     {% categories 'types' %}
                 </div>
                 <div class="sidebar-box social">
                 <div id="sidebar-box-categories" class="sidebar-box">
                     {% categories 'topics' %}
                     {% categories 'types' %}
                 </div>
                 <div class="sidebar-box social">
+                    <a href="{% url 'migdal_main_feed' %}" title="RSS feed">
+                        <img src="{% static 'img/rss.png' %}" alt="RSS feed" /></a>
                     {% url 'migdal_main' as main_url %}
                     {% url 'migdal_main' as main_url %}
-                    {% trans "Culture's right" as site_name %}
+                    {% trans "Right to Culture" as site_name %}
                     {% share main_url site_name "big" %}
                     {% share main_url site_name "big" %}
-                    <!--a href="{% url 'migdal_main_feed' %}">RSS</a-->
                 </div>
                 <div class="sidebar-box">
                     <h3>{% trans "Latest comments" %}</h3>
                 </div>
                 <div class="sidebar-box">
                     <h3>{% trans "Latest comments" %}</h3>
@@ -100,6 +111,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="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>
@@ -108,8 +120,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>
     </body>
 </html>