fnp / prawokultury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update django-pipeline.
[prawokultury.git] / prawokultury / templates / base.html
diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 4d0a8b4..f13e30f 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -1,15 +1,17 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-{% load url from future %}
-{% load i18n static %}
+{% load i18n %}
+{% load static from staticfiles %}
 {% load fnp_common migdal_tags fnp_share fnp_lang menu_tags %}
 {% load sponsor_tags %}
 {% load compressed %}
 {% load fnp_common migdal_tags fnp_share fnp_lang menu_tags %}
 {% load sponsor_tags %}
 {% load compressed %}
+{% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
        <title>{% block "titleextra" %}{% endblock %}CopyCamp</title>
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
 
 <html prefix="og: http://ogp.me/ns#">
     <head>
        <title>{% block "titleextra" %}{% endblock %}CopyCamp</title>
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
 
+        <meta charset="UTF-8" />
         <meta property='og:url' content='{% block "ogurl" %}{% url 'migdal_main' %}{% endblock %}' />
         <meta property='og:title' content='{% block "ogtitle" %}CopyCamp{% endblock %}' />
         <meta property='og:site_name' content='CopyCamp' />
         <meta property='og:url' content='{% block "ogurl" %}{% url 'migdal_main' %}{% endblock %}' />
         <meta property='og:title' content='{% block "ogtitle" %}CopyCamp{% endblock %}' />
         <meta property='og:site_name' content='CopyCamp' />
@@ -24,7 +26,7 @@
         <div class="bar-left">
             <a id="logo" href="{% url "migdal_main" %}">
                 <img alt="{% trans "CopyCamp" %}"
         <div class="bar-left">
             <a id="logo" href="{% url "migdal_main" %}">
                 <img alt="{% trans "CopyCamp" %}"
-                    src="{% static "img/copycamp2012_"|add:request.LANGUAGE_CODE|add:".png" %}" /></a>
+                    src="{% static "img/copycamp_2014_"|add:request.LANGUAGE_CODE|add:".png" %}" /></a>
         </div>
         <div class="bar-right">
             <a href="http://prawokultury.pl"><img src="{% static "img/logo_160.png" %}" alt="PrawoKultury.pl"/></a>
         </div>
         <div class="bar-right">
             <a href="http://prawokultury.pl"><img src="{% static "img/logo_160.png" %}" alt="PrawoKultury.pl"/></a>
@@ -91,6 +93,6 @@
     </div>
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
     {% compressed_js 'base' %}
     </div>
     <script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js" charset="utf-8"></script>
     {% compressed_js 'base' %}
-    {{ piwik_tag|safe }}
+    {% tracking_code %}
     </body>
 </html>
     </body>
 </html>