From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 1 Mar 2012 11:32:58 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/fb20b55d2769c454ab880eaa7df053aa491193bf?ds=sidebyside;hp=-c

Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
---

fb20b55d2769c454ab880eaa7df053aa491193bf
diff --combined wolnelektury/settings.py
index 18922b964,ac80dafff..a1ad8785c
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@@ -47,8 -47,6 +47,8 @@@ LANGUAGES = tuple(sorted(
      ('ru', u'русский'),
      ('es', u'español'),
      ('uk', u'українська'),
 +    ('jp', u'日本語'),
 +    ('it', u'italiano'),
  ], key=lambda x: x[0]))
  
  
@@@ -223,6 -221,7 +223,7 @@@ COMPRESS_CSS = 
      'player': {
          'source_filenames': [
              'jplayer/jplayer.blue.monday.css', 
+             'css/player.css', 
          ],
          'output_filename': 'css/player.min?.css',
      },
diff --combined wolnelektury/templates/catalogue/book_text.html
index 379c07a5a,cef76f8b5..a6aa19e1d
--- a/wolnelektury/templates/catalogue/book_text.html
+++ b/wolnelektury/templates/catalogue/book_text.html
@@@ -32,24 -32,22 +32,22 @@@
          <div id="download">
              <ul>
              {% if book.pdf_file %}
 -            <li><a href="{{ book.pdf_file.url}}">PDF</a> do wydruku</li>
 +            <li><a href="{{ book.pdf_file.url}}">PDF</a> {% trans "to print" %}</li>
              {% endif %}
              {% if  book.epub_file %}
 -            <li><a href="{{ book.epub_file.url}}">EPUB</a> na czytnik</li>
 +            <li><a href="{{ book.epub_file.url}}">EPUB</a> {% trans "for a reader" %}</li>
              {% endif %}
              {% if  book.mobi_file %}
 -            <li><a href="{{ book.mobi_file.url}}">MOBI</a> na Kindle</li>
 +            <li><a href="{{ book.mobi_file.url}}">MOBI</a> {% trans "for Kindle" %}</li>
              {% endif %}
              {% if  book.txt_file %}
 -            <li><a href="{{ book.txt_file.url}}">TXT</a> do zadań specjalnych</li>
 +            <li><a href="{{ book.txt_file.url}}">TXT</a> {% trans "for advanced usege" %}</li>
              {% endif %}
              <li><a href="{% url custom_pdf_form %}?slug={{ book.slug }}">{% trans "Download a custom PDF" %}</a></li>
              </ul>
          </div>
          <div id="header">
-             <div id="logo">
-                 <a href="/">Wolne Lektury</a>
-             </div>
+             <a href="/"><img src="{{ STATIC_URL }}img/logo-220.png" alt="Wolne Lektury" /></a>
          </div>
          <div id="themes">
              <ol>