X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/990b94cb44f154b8e3fa08c63745a1b934e05128..fceff8de9a4a304549e5b4b3094f66071b9912ae:/prawokultury/templates/base.html

diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 166e701..86eb25b 100755
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -1,17 +1,18 @@
 <!DOCTYPE html>
 {% load url from future %}
 {% load i18n static %}
-{% load common_tags migdal_tags events_tags share %}
+{% load fnp_common menu_tags migdal_tags events_tags fnp_share fnp_lang %}
 {% load compressed %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
-       <title>{% trans "Culture's right" %}{% block "titleextra" %}{% endblock %}</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' %}
 
-        <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" %}' />
+        <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 %}' />
@@ -22,7 +23,7 @@
         <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">
@@ -49,8 +50,9 @@
         </div>
         <ul id="menu" class="bar-left">
             {% block "main_menu" %}
-                {% main_menu 'url' request.get_full_path %}
+                {% main_menu %}
             {% endblock %}
+            <li id="item-lang">{% lang_switcher %}</li>
         </ul>
         <div style="clear: both;"></div>
         </div>
@@ -62,15 +64,19 @@
                     <h3><a href="{% url 'events' %}">{% trans "Upcoming events" %}</a></h3>
                     {% 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>
+                </div>
                 <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 %}
-                    {% trans "Culture's right" as site_name %}
+                    {% trans "Right to Culture" as site_name %}
                     {% share main_url site_name "big" %}
-                    <!--a href="{% url 'migdal_main_feed' %}">RSS</a-->
                 </div>
                 <div class="sidebar-box">
                     <h3>{% trans "Latest comments" %}</h3>
