fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 22c91a9)
Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 18 Jun 2010 13:33:00 +0000 (15:33 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 18 Jun 2010 13:33:00 +0000 (15:33 +0200)
lib/librarian patch | blob | history
wolnelektury/settings.py patch | blob | history
wolnelektury/static/css/master.css patch | blob | history
wolnelektury/templates/base.html patch | blob | history

diff --git a/lib/librarian b/lib/librarian
index d43d874..5938bc7 160000 (submodule)
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit d43d87400dcc19851442a42ff20af9fc0b549087
+Subproject commit 5938bc78f11ebad067eae86f51b4f5243003f946
diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 2ece0b1..8a82221 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -33,7 +33,7 @@ LANGUAGE_CODE = 'pl'
 
 gettext = lambda s: s
 
-LANGUAGES = (
+LANGUAGES = tuple(sorted([
     ('pl', gettext('Polish')),
     ('de', gettext('German')),
     ('en', gettext('English')),
@@ -42,7 +42,7 @@ LANGUAGES = (
     ('ru', gettext('Russian')),
     ('es', gettext('Spanish')),
     ('uk', gettext('Ukrainian')),
-)
+], key=lambda x: x[0]))
 
 
 SITE_ID = 1
diff --git a/wolnelektury/static/css/master.css b/wolnelektury/static/css/master.css
index 669aeb1..645466c 100644 (file)
--- a/wolnelektury/static/css/master.css
+++ b/wolnelektury/static/css/master.css
@@ -88,6 +88,36 @@ em {
     color: #777;
 }
 
+.lang-menu {
+       margin-right: 0.7em;
+       line-height: 24px;
+} 
+
+.lang-menu button {
+       color: blue;
+       border: none;
+       border-right: 1px solid gray;
+       -moz-border-radius: 2px;
+       background: inherit;    
+       cursor: pointer;
+       padding: 0.2em 0.5em;   
+       font-size: 10px;
+}
+
+.lang-menu button:hover {
+       color: blue;
+       text-decoration: underline;     
+}
+
+.lang-menu button.active {
+       color: black;
+       text-decoration: none;
+}
+
+.lang-menu button.last {
+       border-right: none;
+}
+
 /* ======================== */
 /* = Footer with sponsors = */
 /* ======================== */
diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index ca41767..da5ab63 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -1,14 +1,13 @@
-{% 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" />
         <title>{% block title %}WolneLektury.pl{% endblock %}</title>
         <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/x-icon" />
         {% 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 %}
@@ -49,13 +48,14 @@
                 <a href="http://nasza-klasa.pl/profile/30441509"><img src="{{ STATIC_URL }}img/social/naszaklasa.png" alt="WolneLektury @ Nasza-Klasa" /></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 action="{% url django.views.i18n.set_language %}" method="POST">
+                                       {% spaceless %}
+                                       {% for lang in LANGUAGES %}                                          
+                                           <button type="submit" name="language" 
+                                                       class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} {% if forloop.last %}last{% endif %}" 
+                                                       value="{{ lang.0 }}">{{ lang.0|upper }}</button>
+                                       {% endfor %}    
+                                       {% endspaceless %}                              
                                </form>
                        </div>
             <div class="clearboth"></div>