From 4db71d02697f83eac393bdf34fbe1aff54757df4 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Mon, 24 May 2021 13:07:03 +0200 Subject: [PATCH 1/1] Minor visuals. --- src/catalogue/locale/pl/LC_MESSAGES/django.mo | Bin 12633 -> 12739 bytes src/catalogue/locale/pl/LC_MESSAGES/django.po | 61 ++++++++++-------- .../templates/catalogue/book_short.html | 10 ++- .../templates/catalogue/book_text.html | 1 + .../templates/catalogue/viewer_base.html | 2 +- src/wolnelektury/static/scss/book_text.scss | 1 + src/wolnelektury/static/scss/text_eink.scss | 22 +++++++ 7 files changed, 67 insertions(+), 30 deletions(-) create mode 100644 src/wolnelektury/static/scss/text_eink.scss diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.mo b/src/catalogue/locale/pl/LC_MESSAGES/django.mo index 4ce940facc694332c68b83787a8c6e0fe16d4fb2..7c003bf20052ad84143bd3c950cf6711970adf45 100644 GIT binary patch delta 4527 zcmYk;3slzi9mnzCgMdH+0t(e69>EJzDhgpzuyP9{!z3up#NwtsfIOz4VbWu!qik-P z;cU7tR$7{+VQFb=<|RQ^&20yB-A=i4Iwsq4+v$|2ZST+X|E}$S{5-GU?|=E-{ulh9 z=5TH3OA)6Dn;s88>>gYXG!+ltRpWzfNpw&EVL&oZMq0Zln>gXVAgfHIquzg>#WHxK=yffoas&q6YdL>iXTN zl{tv{*lYWJL%e?C&7nAm{#`l+&T%=&KUd6;MqGgjxBxY?)b&?lNHd*EK}%VNIbi-j^Gi@GRUV@70}8WjM+<5t?n7O;3iEIy z=3);P;006z6Im8bU^1$MQXGs`sOy_?Dy~4y_&DmicTul<=#Lbh;e9`kdM!3G8a22V zwWLRoL++&2&mog^-=bD5nO5fEaMZvbLJqn0sApprs>3%>x9SjTWxJ7;2)TE?g8Kk9 z!ZWCb&Z3s`?{@s(R*z$pYB&{jeirJP7-JTrCQyNT_-auTS&3?I9qL)wf>C<^w^7gt zUqmfg7ixq@Q3L5gUGRHUhaaKN{~ROmEUJTk)W9yFu8W~}ou7niFU{)1Q0Hf2wBG+* zJ7E&)-d$t$GE~R6phiB&j^B-Hpv{hVpq6&M`M4c_8a0rYQ7f_^)y{F$7xE7n(#TFx zkRPEg_zd;*eup-Y~0YS$&Mvb5Z9Ppaya^Y9P}xSpNvt za3(u4*)e;#*HJs_#MP*QbXxs+)GgX?_MjfZ53T+sY6ZVTJrfBus(Kb?V?Ju2Rj7g2 zWrn=>v4I`8vZECX@dRFh(OKS!d8iebjJn6y+5YLM6{|$OB~_^J$5P}Cb&sOnmYt|u zc^Gx;erxqVg(#@uKchz6kD77B2yg#T)Q2V=)lt4#glf11Z^F5#CEbbo!0bbH_%^D& zUev%pL9N(1)b*hY6x4CbNUy_e)W~yDBP~T;I1{z>b*K-`66CJAHK>kuAdBYqq8jc) z4g9Ydh0&ut2O+y$GIDD|?kWlzQ7LMMvrsdtMlIz_cDx(4Qm4#MZT}ajfqadcdD>`i zLYWv%eG=-rVylaW|0smq92aNZQ$B$?I)j%3Mw8Yuw1iXlP zq18)J_w;7eQ#~Iw;QP^!>o5`bU?d(w4d|HJYo0`{^Z%Jq!L zIO;=DE9FNGY%J>h$*86Nk$EHP`f}8Hx1+AFM-6BpY5+@6*M}al6FN~1J%xIRwxe#v z0o2lUqZ&AcYWQQ@e-_ojH>eef$chc9jFPsiadL6CgJ1i9wLvBrKC~s|27IeWHNb* z948yeYNBnWNBG;I;%2hM_KDkwUPC|8_aR7{$lXL+zK6RHHGu&6A^8niNB`mfQV+*_ zNG*AXJV{0qZHq}2nNIXtK1`}fIr%Bkc8J_a^hZpqbtQS8Tu!uYC;B{VMYYW)dr7FB zpT~)|c^>XH{5iST>M!5{D<3g$$2_8Y+(GseZ9n#KubRiqR;(av$Zm2qnW6h%OhMZl z9^qg8Db?$yZGlJlcOt)clAUBqc#m@}h)5yz2+ZCjQl#%O668Qul!KKYj!RorMIVl;wfzAHMm82rBSzox$%@wd3R=4yXa;OOSsKz&zKZl&)( Djg7sj delta 4426 zcmYk;3sjf&9mnzC9{~Xsxp*NfzzeB(`-{rJ(K2+BnHEWxc?l75fv727QnJTJnyG1u zSYF5yb55;k|2cJN-olJF&$K$Oxw$#F&T$?y)=utpI&SaJ|M{}hbNKN3{hrJ3_FUj} z>F3kD%Sn-Sj;)#8MJl76>kx46XnXB-?yCgnQm_TvVqBtg?Jx;DVk*YrKrV2+KLxu|FGUTo8g<gz9K6a;;m68Mq!bkVB|j zb;|0OkVSJ}peFPm)Qa6kofk!;UicnT&`bxKIhaE|A34`mqelEHs-b#RLk-vg_h2d> zM$PmhcEi75Bz}v!?!TxBMX{V(!T2t&wlpHq)1=3+Pkoi5Ci5(+tr}Dxt5K8Lj2iP^ z)FL&a#@>wlxKH_|zOJLrYeAhCphJx*0X3$6$Z%Y+E6;#V7|jl?>SL&e%25MZhWFrV z)at*7JUZ@u)PT;TuDgml{}yU-B3R-(F&0(NKux|s>bhY#1PfAl27(l-*^!O=P#0W9 z&ETJ?4!%WRLKn|+sev>sz`>{)FGgLb<5NWsCKrZR&u8u_x9V4 zMpVNeqAvIp^-TQHyos7YB-7FJ)(JI}A*crLM?DMUP}e_!8sHSvicLoia3N|S)yVmt zdy#@JSc|$~BSzp>R0nUM2DT4%;StpNr%(-^wfgT+=YL}Rub|rd!s<87f1z&Wt#F2QJD!hP>W9oCJ3bjTunN=)RiWCcL46F@p$1xOzK%M-9+UJ9 z+C@PlJ%Z}s1nR=Gs0)9Kn(=wmc^9pI+3J6{`gPR#EvSKfgBnP58Y{|@CSecioxA(} ziPy$hmEKK{2n#nKcLQU@hIp6a~rumE-AxrI18D)%R@C(j2h@7jKa0%M&!qB;g@d7 z3Df}2qbBrM)C8`fRxJA-|9By4K;Bdy8FJ61(li@N^GcG_KpK8uT{swq%Aq72jYfw+?Hq?^tMlEq8Y6Y6?_@C|gHLHJT z^%$N!&G=5#iuOXalVkO-uaPR9puDQ4msycb(A76-9YE1HW5^zX(~(8Ew{R^lY;i!lm6Lv?%!S!MS( zyb+)=)}7nxZuR#YynBG(P8RC*y$?09LezQ1sApt3&c#jW#ZZVD$ZRkXb;3wg$3@r{ zC!$6^4Rxz3F&>|@{j1G7)b-m@?d~^^pl>xXI!AaCoe{5br zHSjs=yep`I+(0$-wH?20`=f*YfZC(l>yA3FAFADK)H8K2cECc9LOg|HRKv4T9nH7> z%TNuhL#@yj)C~8b26oUqhFXCpOu%N;LwpG}kZ(-g=Qh;iQ0IH`6x4AtYJ_*7E=Wgp zoN4=qp)Sm`{UcB_7>hiMu8tfh+RDi&vXIo0v4lJP|LsvqKO+b9{tu&&Mbe43jy~bv zdPrKgpHt8uj}J&Dd6f($`$+5dQwkf%S+a$!BU%M*B|dIGen@oxpL0*xUU-eXLw-s4 zGKIIJrqCarabz{AAWYnCCt3w<^N3zgZ6DPJ5|V2Z5+W6EH+%F2(D!f^;XjY?w#IxC zCzDd5n|g?3ldYtP=!XA<93~@)wztRJz)^?ICC)`WV{g{HjH2S\n" "Language-Team: Fundacja Nowoczesna Polska \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 cc2744361..25c130908 100644 --- a/src/catalogue/templates/catalogue/book_short.html +++ b/src/catalogue/templates/catalogue/book_short.html @@ -118,6 +118,7 @@
  • + {% trans "Download an ebook" %}:
    {% if book.pdf_file %} PDF {% endif %} @@ -134,9 +135,12 @@ TXT {% endif %}
    -
    - {% download_audio book %} -
    + {% if book.has_mp3_file %} +
    + {% trans "Download audiobook" %}:
    + {% download_audio book %} +
    + {% endif %}
    {% custom_pdf_link_li book %}
    diff --git a/src/catalogue/templates/catalogue/book_text.html b/src/catalogue/templates/catalogue/book_text.html index e10bc9689..17c4896b5 100644 --- a/src/catalogue/templates/catalogue/book_text.html +++ b/src/catalogue/templates/catalogue/book_text.html @@ -21,6 +21,7 @@ {% block menu %}
  • + {% trans "Click to download" %}: {{ book.pretty_title }} + diff --git a/src/wolnelektury/static/scss/book_text.scss b/src/wolnelektury/static/scss/book_text.scss index 535ae96a1..34c588322 100644 --- 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 index 000000000..f0694ce0d --- /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; + } + + +} -- 2.20.1