fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
search fixes
[wolnelektury.git] / wolnelektury / templates / superbase.html
diff --git a/wolnelektury/templates/superbase.html b/wolnelektury/templates/superbase.html
index 5813a2b..138bffe 100644 (file)
--- a/wolnelektury/templates/superbase.html
+++ b/wolnelektury/templates/superbase.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html class="no-js" xmlns:og="http://opengraphprotocol.org/schema/">
+<html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
        {% load cache compressed i18n %}
     {% load catalogue_tags reporting_stats sponsor_tags %}
     <head>
        {% load cache compressed i18n %}
     {% load catalogue_tags reporting_stats sponsor_tags %}
     <head>
@@ -8,7 +8,7 @@
         <meta property="og:site_name" content="Wolne Lektury" />
         <meta property="og:title" content="{% block ogtitle %}{% endblock %}" />
         <meta property="og:type" content="{% block ogtype %}website{% endblock %}" />
         <meta property="og:site_name" content="Wolne Lektury" />
         <meta property="og:title" content="{% block ogtitle %}{% endblock %}" />
         <meta property="og:type" content="{% block ogtype %}website{% endblock %}" />
-        <meta property="og:image" content="{% block ogimage %}http://static.wolnelektury.pl/img/logo-bez.png{% endblock %}" />
+        <meta property="og:image" content="{% block ogimage %}{{ FULL_STATIC_URL }}img/wiatrak.png{% endblock %}" />
         <meta name="description" 
             content="{% block metadescription %}Darmowe opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
         {% block ogextra %}{% endblock %}
         <meta name="description" 
             content="{% block metadescription %}Darmowe opracowane, pełne teksty lektur, e-booki, audiobooki i pliki DAISY na wolnej licencji.{% endblock %}" />
         {% block ogextra %}{% endblock %}
@@ -23,8 +23,6 @@
         <!--[if IE]>
                {% compressed_css "ie" %}
         <![endif]-->
         <!--[if IE]>
                {% compressed_css "ie" %}
         <![endif]-->
-        <!--script src="{{ STATIC_URL }}js/modernizr.custom.13352.js"></script-->
-        <script src="{{ STATIC_URL }}js/modernizr-latest.js"></script>
 
         {% block extrahead %}
         {% endblock %}
 
         {% block extrahead %}
         {% endblock %}
@@ -47,7 +45,7 @@
                 <span>
                 {% cache 60 tagline LANGUAGE_CODE %}
                     {% url book_list as b %}
                 <span>
                 {% cache 60 tagline LANGUAGE_CODE %}
                     {% url book_list as b %}
-                    {% url infopage 'o-projekcie' as r %}
+                    {% url infopage 'prawa' as r %}
                         {% count_books book_count %}
                     {% blocktrans count book_count as c %}
                     <a href='{{b}}'>{{c}}</a> free reading you have <a href='{{r}}'>right to</a>
                         {% count_books book_count %}
                     {% blocktrans count book_count as c %}
                     <a href='{{b}}'>{{c}}</a> free reading you have <a href='{{r}}'>right to</a>
@@ -60,7 +58,17 @@
 
             <p id="user-info" class="mono">
                 {% if user.is_authenticated %}
 
             <p id="user-info" class="mono">
                 {% if user.is_authenticated %}
-                    {% trans "Welcome" %}, <strong>{{ user.username }}</strong>
+                    {% trans "Welcome" %}, 
+                       <span class="hidden-box-wrapper">
+                               <a href="{% url user_settings %}" class="hidden-box-trigger">
+                                       <strong>{{ user.username }}</strong>
+                               </a>
+                               <span id="user-menu" class="hidden-box">
+                                       <a href="{% url account_set_password %}">{% trans "Password" %}</a><br/>
+                                       <a href="{% url account_email %}">{% trans "E-mail" %}</a><br/>
+                                       <a href="{% url socialaccount_connections %}">{% trans "Social accounts" %}</a><br/>
+                               </span>
+                       </span>
                     | <a href="{% url social_my_shelf %}" id="user-shelves-link">{% trans "My shelf" %}</a>
                     {% if user.is_staff %}
                     | <a href="/admin/">{% trans "Administration" %}</a>
                     | <a href="{% url social_my_shelf %}" id="user-shelves-link">{% trans "My shelf" %}</a>
                     {% if user.is_staff %}
                     | <a href="/admin/">{% trans "Administration" %}</a>
@@ -88,7 +96,7 @@
 
 
 
 
 
 
-            <form id="search-area" action="/fullsearch/" class="hidelabels">
+            <form id="search-area" action="{% url search %}" class="hidelabels">
                 
                 <div id="search-field" class="grid-line">
                        <label for="search">{{search_form.q.label}}</label>
                 
                 <div id="search-field" class="grid-line">
                        <label for="search">{{search_form.q.label}}</label>
@@ -116,8 +124,9 @@
                {% endcache %}
 
             <form action="{% url django.views.i18n.set_language %}" method="post">
                {% endcache %}
 
             <form action="{% url django.views.i18n.set_language %}" method="post">
-            <div id="lang-menu">
-                <span id='lang-button' class='mono'>
+            <div id="lang-menu" class="hoverget">
+                <span id='lang-button' class='mono hoverclick'>
+                    <span class="lang-flag">⚐</span>
                     {% trans "Language versions" %}</span>
                 <div id="lang-menu-items">
                 {% for lang in LANGUAGES %}
                     {% trans "Language versions" %}</span>
                 <div id="lang-menu-items">
                 {% for lang in LANGUAGES %}
@@ -188,7 +197,7 @@
         </script>
         {% compressed_js "base" %}
 
         </script>
         {% compressed_js "base" %}
 
-        <!--{{ piwik_tag|safe }}
+        {{ piwik_tag|safe }}
         <script type="text/javascript">
         var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
         document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
         <script type="text/javascript">
         var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
         document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
@@ -196,6 +205,12 @@
         <script type="text/javascript">
         var pageTracker = _gat._getTracker("UA-2576694-1");
         pageTracker._trackPageview();
         <script type="text/javascript">
         var pageTracker = _gat._getTracker("UA-2576694-1");
         pageTracker._trackPageview();
-        </script>-->
+        </script>
+
+               {% block extrabody %}
+               {% endblock %}
+
+        <script src="{{ STATIC_URL }}js/modernizr.custom.19652.js"></script>
+        <!--script src="{{ STATIC_URL }}js/modernizr-latest.js"></script-->
     </body>
 </html>
     </body>
 </html>