fnp / prawokultury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
style fixes
[prawokultury.git] / prawokultury / templates / base.html
diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 166e701..7eb4c2c 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -1,14 +1,15 @@
 <!DOCTYPE html>
 {% load url from future %}
 {% load i18n static %}
 <!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>
 {% load compressed %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
-       <title>{% trans "Culture's right" %}{% block "titleextra" %}{% endblock %}</title>
+       <title>{% block "titleextra" %}{% endblock %}{% trans "Culture's right" %}</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 charset="UTF-8" />
         <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 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" %}' />
@@ -49,8 +50,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>
@@ -67,10 +69,11 @@
                     {% categories 'types' %}
                 </div>
                 <div class="sidebar-box social">
                     {% 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 %}
                     {% share main_url site_name "big" %}
                     {% url 'migdal_main' as main_url %}
                     {% trans "Culture's right" 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>
                 </div>
                 <div class="sidebar-box">
                     <h3>{% trans "Latest comments" %}</h3>