X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dff86ce568077249fc7c713bd35ce19a0bdb942e..01e221c6dc122a8a930fd7b83bf123ae02a2ef0d:/wolnelektury/templates/base.html

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index f6055d09d..7832dcd4b 100644
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -1,14 +1,15 @@
-{% load i18n %}
-{% load chunks compressed catalogue_tags sponsor_tags %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+	{% load i18n chunks compressed catalogue_tags sponsor_tags %}
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="Content-Style-Type" content="text/css">
         <title>{% block title %}WolneLektury.pl{% endblock %}</title>
-        <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/x-icon" />
+        <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/png" />
+        <link rel="search" type="application/opensearchdescription+xml" title="Wolne Lektury" href="{{ STATIC_URL }}opensearch.xml">
         {% compressed_css "all" %}
-        <script type="text/javascript">var LANGUAGE_CODE = "{{ LANGUAGE_CODE}}";</script>
+        <script type="text/javascript">var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";</script>
         {% compressed_js "jquery" %}
         {% compressed_js "all" %}
         {% block extrahead %}
@@ -23,13 +24,9 @@
         <div id="top-message">
             {% chunk "top-message" %}
         </div>
-        <div id="onepercent-banner" style="display:none">
-            <a href="{% url 1percent %}" id="onepercent-text"></a>
-            <a href="{% url 1percent %}" id="onepercent-see-more">{% trans "See more" %}</a>
-        </div>
         <div id="header">
             <div id="logo">
-                <a href="/"><img src="{{ STATIC_URL }}img/logo.png" alt="WolneLektury.pl - logo" /></a>
+                <a href="/"><img src="{{ STATIC_URL }}img/logo-bez.png" alt="WolneLektury.pl" /><br/>szkolna biblioteka internetowa</a>
             </div>
             <div id="user-info" style="display:none">
                 {% if user.is_authenticated %}
@@ -39,39 +36,41 @@
                         {% if user.is_staff %}
                         | <a href="/admin/">{% trans "Administration" %}</a>
                         {% endif %}
+						| <a href="{% url suggest %}" id="suggest-link">{% trans "Report a bug" %}</a>
                         | <a href="{% url logout %}?next={{ request.get_full_path }}">{% trans "Logout" %}</a>
                     </p>
                 {% else %}
-                    <p><a href="{% url login %}" class="login-register-link">{% trans "Sign in" %} / {% trans "Register" %}</a></p>
+                    <p><a href="{% url suggest %}" id="suggest-link">{% trans "Report a bug" %}</a>
+                        | <a href="{% url login %}" class="login-register-link">{% trans "Sign in" %} / {% trans "Register" %}</a></p>
                 {% endif %}
             </div>
             <div class="social-links" style="float:right">
                 <a href="http://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268"><img src="{{ STATIC_URL }}img/social/facebook.png" alt="WolneLektury @ Facebook" /></a>
-                <a href="http://twitter.com/wolnelektury"><img src="{{ STATIC_URL }}img/social/twitter.png" alt="WolneLektury @ Twitter" /></a>
-                <a href="http://nasza-klasa.pl/profile/30441509"><img src="{{ STATIC_URL }}img/social/naszaklasa.png" alt="WolneLektury @ Nasza-Klasa" /></a>     
+                <a href="http://nk.pl/profile/30441509"><img src="{{ STATIC_URL }}img/social/naszaklasa.png" alt="WolneLektury @ NK" /></a>
             </div>
-			<div class="lang-menu" style="float:right;">
-				<form action="/i18n/setlang/" method="post">
-					{% trans "Choose your interface language: " %} <select name="language">
-						{% for lang in LANGUAGES %}
-						<option value="{{ lang.0 }}"{% ifequal lang.0 LANGUAGE_CODE %} selected="selected"{% endifequal %}>{{ lang.1 }}</option>
-						{% endfor %}
-					</select>
-					<input type="submit" value="{% trans "Choose language" %}">
-				</form>
-			</div>			
+				<form action="{% url django.views.i18n.set_language %}" method="post">
+            <div class="lang-menu" style="float:right;">
+					{% spaceless %}
+					{% for lang in LANGUAGES %}					     
+					    <button type="submit" name="language" title="{{ lang.1 }}"
+							class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} {% if forloop.last %}last{% endif %}" 
+							value="{{ lang.0 }}">{{ lang.0|upper }}</button>
+					{% endfor %}	
+					{% endspaceless %}				
+			</div>
+                </form>
             <div class="clearboth"></div>
         </div>
         <div id="maincontent">
             {% block body %}
-            {% endblock %}    
+            {% endblock %}
         </div>
         <div class="clearboth"></div>
         <div id="footer">
             <p>
             	{% blocktrans %}
 				Wolne Lektury is a project lead by <a href="http://nowoczesnapolska.org.pl/">Modern Poland Foundation</a>.
-				Digital reproductions are made by <a href="http://www.bn.org.pl/">The National Library</a>, based on TNL resources. 
+				Digital reproductions are made by <a href="http://www.bn.org.pl/">The National Library</a> and <a href="http://www.bs.katowice.pl/">Biblioteka ÅlÄska</a>, based on TNL and BÅ resources.
 				Hosting <a href="http://eo.pl/">EO Networks</a>.
 				{% endblocktrans %}
             </p>
@@ -111,7 +110,14 @@
                 <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
             </div>
         </div>
+        <div id="suggest-window">
+            <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
+            <div class="target">
+                <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
+            </div>
+        </div>
         {% endblock bodycontent %}
+        {{ 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"));
