Minor visuals.

diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.mo b/src/catalogue/locale/pl/LC_MESSAGES/django.mo
index 4ce940f..7c003bf 100644 (file)
Binary files a/src/catalogue/locale/pl/LC_MESSAGES/django.mo and b/src/catalogue/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.po b/src/catalogue/locale/pl/LC_MESSAGES/django.po
index eb92303..0cb98fc 100644 (file)
--- a/src/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WolneLektury\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-05-05 10:02+0200\n"
+"PO-Revision-Date: 2021-05-24 13:06+0200\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"
@@ -376,7 +376,7 @@ msgid "tags"
 msgstr "tagi"
 
 #: catalogue/templates/catalogue/book_detail.html:24
-#: catalogue/templates/catalogue/book_text.html:34
+#: catalogue/templates/catalogue/book_text.html:35
 msgid "Other versions"
 msgstr "Inne wersje"
 
@@ -385,8 +385,8 @@ msgid "See also"
 msgstr "Zobacz też"
 
 #: catalogue/templates/catalogue/book_detail.html:41
-#: catalogue/templates/catalogue/book_text.html:47
-#: catalogue/templates/catalogue/book_text.html:66
+#: catalogue/templates/catalogue/book_text.html:48
+#: catalogue/templates/catalogue/book_text.html:67
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Motywy"
@@ -540,61 +540,60 @@ msgstr ""
 msgid "Print on demand –"
 msgstr "Druk na żądanie z"
 
-#: catalogue/templates/catalogue/book_short.html:120
-#: catalogue/templates/catalogue/custom_pdf_form.html:18 catalogue/views.py:404
-msgid "Download"
-msgstr "Pobierz"
-
-#: catalogue/templates/catalogue/book_short.html:134
-msgid "more"
-msgstr "więcej"
+#: catalogue/templates/catalogue/book_short.html:121
+msgid "Download an ebook"
+msgstr "Pobierz ebook"
 
-#: catalogue/templates/catalogue/book_short.html:145
-msgid "less"
-msgstr "mniej"
+#: catalogue/templates/catalogue/book_short.html:140
+msgid "Download audiobook"
+msgstr "Pobierz audiobook"
 
-#: catalogue/templates/catalogue/book_short.html:153
+#: catalogue/templates/catalogue/book_short.html:152
 msgid "For now this work is only available for our subscribers."
 msgstr "Jak na razie ten utwór jest dostępny wyłącznie dla naszych Przyjaciół."
 
-#: catalogue/templates/catalogue/book_text.html:41
+#: catalogue/templates/catalogue/book_text.html:24
+msgid "Click to download"
+msgstr "Kliknij by pobrać"
+
+#: catalogue/templates/catalogue/book_text.html:42
 msgid "Table of contents"
 msgstr "Spis treści"
 
-#: catalogue/templates/catalogue/book_text.html:53
+#: catalogue/templates/catalogue/book_text.html:54
 msgid "Edit. note"
 msgstr "Nota red."
 
-#: catalogue/templates/catalogue/book_text.html:59
+#: catalogue/templates/catalogue/book_text.html:60
 msgid "Infobox"
 msgstr "Informacje"
 
-#: catalogue/templates/catalogue/book_text.html:64
+#: catalogue/templates/catalogue/book_text.html:65
 msgid "Numbering"
 msgstr "Numeracja"
 
-#: catalogue/templates/catalogue/book_text.html:68
+#: catalogue/templates/catalogue/book_text.html:69
 msgid "Footnotes"
 msgstr "Przypisy"
 
-#: catalogue/templates/catalogue/book_text.html:70
+#: catalogue/templates/catalogue/book_text.html:71
 msgid "References"
 msgstr "Odniesienia"
 
-#: catalogue/templates/catalogue/book_text.html:96
+#: catalogue/templates/catalogue/book_text.html:97
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr "Zamknij"
 
-#: catalogue/templates/catalogue/book_text.html:97
+#: catalogue/templates/catalogue/book_text.html:98
 msgid "Please wait..."
 msgstr "Proszę czekać…"
 
-#: catalogue/templates/catalogue/book_text.html:152
+#: catalogue/templates/catalogue/book_text.html:153
 msgid "Other versions of the book"
 msgstr "Inne wersje utworu"
 
-#: catalogue/templates/catalogue/book_text.html:153
+#: catalogue/templates/catalogue/book_text.html:154
 msgid "Close the other version"
 msgstr "Zamknij drugą wersję"
 
@@ -650,6 +649,10 @@ msgstr "Wszystkie kolekcje"
 msgid "Download custom PDF"
 msgstr "Stwórz własny PDF"
 
+#: catalogue/templates/catalogue/custom_pdf_form.html:18 catalogue/views.py:404
+msgid "Download"
+msgstr "Pobierz"
+
 #: catalogue/templates/catalogue/daisy_list.html:7
 #: catalogue/templates/catalogue/daisy_list.html:15
 msgid "Listing of all DAISY files"
@@ -922,6 +925,12 @@ msgstr "Książka zaimportowana"
 msgid "Error importing file: %r"
 msgstr "Błąd podczas importowania pliku: %r"
 
+#~ msgid "more"
+#~ msgstr "więcej"
+
+#~ msgid "less"
+#~ msgstr "mniej"
+
 #~ msgid "Settings"
 #~ msgstr "Ustawienia"
 

diff --git a/src/catalogue/templates/catalogue/book_short.html b/src/catalogue/templates/catalogue/book_short.html
index cc27443..25c1309 100644 (file)
--- a/src/catalogue/templates/catalogue/book_short.html
+++ b/src/catalogue/templates/catalogue/book_short.html
@@ -118,6 +118,7 @@
           </li>
           <li class="book-box-download">
             <div class="book-box-formats">
+              {% trans "Download an ebook" %}:<br>
               {% if book.pdf_file %}
                 <a href="{{ book.pdf_url}}">PDF</a>
               {% endif %}
@@ -134,9 +135,12 @@
                 <a href="{{ book.txt_url}}">TXT</a>
               {% endif %}
             </div>
-            <div class="book-box-formats">
-              {% download_audio book %}
-            </div>
+            {% if book.has_mp3_file %}
+              <div class="book-box-formats">
+                {% trans "Download audiobook" %}:<br>
+                {% download_audio book %}
+              </div>
+            {% endif %}
             <div class="book-box-formats">
                 {% custom_pdf_link_li book %}
             </div>

diff --git a/src/catalogue/templates/catalogue/book_text.html b/src/catalogue/templates/catalogue/book_text.html
index e10bc96..17c4896 100644 (file)
--- a/src/catalogue/templates/catalogue/book_text.html
+++ b/src/catalogue/templates/catalogue/book_text.html
@@ -21,6 +21,7 @@
 {% block menu %}
   <li>
     <a href="{{ book.get_absolute_url }}" id="menu-book" data-box="book-short">
+      <span class="label">{% trans "Click to download" %}:</span>
       <img src="{% if book.cover_thumb %}{% thumbnail book.cover_thumb '240x332' as thumb %}{{ thumb.url }}{% empty %}{{ book.cover_thumb.url }}{% endthumbnail %}{% endif %}"
            width="120" height="166"
            alt="{{ book.pretty_title }}"

diff --git a/src/catalogue/templates/catalogue/viewer_base.html b/src/catalogue/templates/catalogue/viewer_base.html
index 89c4121..cc68dc4 100644 (file)
--- a/src/catalogue/templates/catalogue/viewer_base.html
+++ b/src/catalogue/templates/catalogue/viewer_base.html
@@ -4,7 +4,7 @@
 {% load pipeline %}
 {% load piwik_tags %}
 {% load annoy_banner from annoy %}
-<html class="no-js">
+<html class="no-js {% if VARIANT %}{{ VARIANT }}{% endif %}">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

diff --git a/src/wolnelektury/static/scss/book_text.scss b/src/wolnelektury/static/scss/book_text.scss
index 535ae96..34c5883 100644 (file)
--- a/src/wolnelektury/static/scss/book_text.scss
+++ b/src/wolnelektury/static/scss/book_text.scss
@@ -19,3 +19,4 @@
 
 @import "main/auth";
 @import "main/dialogs";
+@import "text_eink"

diff --git a/src/wolnelektury/static/scss/text_eink.scss b/src/wolnelektury/static/scss/text_eink.scss
new file mode 100644 (file)
index 0000000..f0694ce
--- /dev/null
+++ b/src/wolnelektury/static/scss/text_eink.scss
@@ -0,0 +1,22 @@
+.media-eink {
+    .annoy-banner {
+        background: white !important;
+        color: black !important;
+        border: 3px solid black;
+    }
+
+    .dynamic-insert {
+        background: white !important;
+        color: black !important;
+        border: 3px solid black;
+    }
+    
+    .annoy-banner-on_blackout {
+        display: none !important;
+    }
+    .annoy-banner_blackout {
+        display: none !important;
+    }
+
+    
+}