Fixes #4083: Book text settings toggles on side bar.

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 587c192..8770c1e 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -14,7 +14,7 @@ libsasscompiler==0.1.5
 jsmin
 fnp-django-pagination==2.2.3
 django-modeltranslation==0.13
 jsmin
 fnp-django-pagination==2.2.3
 django-modeltranslation==0.13

-django-allauth==0.39
+django-allauth==0.42

 django-extensions==2.2.1
 djangorestframework==3.9.4
 djangorestframework-xml
 django-extensions==2.2.1
 djangorestframework==3.9.4
 djangorestframework-xml

diff --git a/src/catalogue/locale/de/LC_MESSAGES/django.po b/src/catalogue/locale/de/LC_MESSAGES/django.po
index d71a093..327c386 100644 (file)
--- a/src/catalogue/locale/de/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/de/LC_MESSAGES/django.po
@@ -420,6 +420,7 @@ msgstr "Siehe auch"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Motive"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Motive"


@@ -609,53 +610,40 @@ msgid "Table of contents"
 msgstr "Inhaltsverzeichnis"
 
 #: catalogue/templates/catalogue/book_text.html:44
 msgstr "Inhaltsverzeichnis"
 
 #: catalogue/templates/catalogue/book_text.html:44

-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr ""
-
-#: catalogue/templates/catalogue/book_text.html:50

 msgid "Edit. note"
 msgstr "Editieren. Notiz"
 
 msgid "Edit. note"
 msgstr "Editieren. Notiz"
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Infobox"
 
 msgid "Infobox"
 msgstr "Infobox"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr ""
+
+#: catalogue/templates/catalogue/book_text.html:59
+#, fuzzy
+#| msgid "Don't show footnotes"
+msgid "Footnotes"
+msgstr "Zeige die Fußnoten nicht"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr ""
 
 msgid "Please wait..."
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr ""
 
 msgid "Other versions of the book"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr ""
 
 msgid "Close the other version"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:146
-#, fuzzy
-#| msgid "parent number"
-msgid "Display line numbers"
-msgstr "Elternnummer"
-
-#: catalogue/templates/catalogue/book_text.html:148
-#, fuzzy
-#| msgid "Don't disply themes"
-msgid "Display themes"
-msgstr "Zeige die Motive nicht "
-
-#: catalogue/templates/catalogue/book_text.html:150
-#, fuzzy
-#| msgid "Don't show footnotes"
-msgid "Display footnotes"
-msgstr "Zeige die Fußnoten nicht"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Katalog"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Katalog"


@@ -997,6 +985,16 @@ msgstr "Buch wurde erfolgreich importiert"
 msgid "Error importing file: %r"
 msgstr "Fehler beim Importieren der Datei: %r"
 
 msgid "Error importing file: %r"
 msgstr "Fehler beim Importieren der Datei: %r"
 

+#, fuzzy
+#~| msgid "parent number"
+#~ msgid "Display line numbers"
+#~ msgstr "Elternnummer"
+
+#, fuzzy
+#~| msgid "Don't disply themes"
+#~ msgid "Display themes"
+#~ msgstr "Zeige die Motive nicht "
+

 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "
 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "

diff --git a/src/catalogue/locale/en/LC_MESSAGES/django.po b/src/catalogue/locale/en/LC_MESSAGES/django.po
index 19e1940..aaf1387 100644 (file)
--- a/src/catalogue/locale/en/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/en/LC_MESSAGES/django.po
@@ -419,6 +419,7 @@ msgstr "See also"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Themes"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Themes"


@@ -611,53 +612,40 @@ msgid "Table of contents"
 msgstr "Table of contents"
 
 #: catalogue/templates/catalogue/book_text.html:44
 msgstr "Table of contents"
 
 #: catalogue/templates/catalogue/book_text.html:44

-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr ""
-
-#: catalogue/templates/catalogue/book_text.html:50

 msgid "Edit. note"
 msgstr "Edit. note"
 
 msgid "Edit. note"
 msgstr "Edit. note"
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Infobox"
 
 msgid "Infobox"
 msgstr "Infobox"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr ""
+
+#: catalogue/templates/catalogue/book_text.html:59
+#, fuzzy
+#| msgid "Don't show footnotes"
+msgid "Footnotes"
+msgstr "Don't show footnotes"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr ""
 
 msgid "Please wait..."
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr ""
 
 msgid "Other versions of the book"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr ""
 
 msgid "Close the other version"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:146
-#, fuzzy
-#| msgid "parent number"
-msgid "Display line numbers"
-msgstr "Parent number"
-
-#: catalogue/templates/catalogue/book_text.html:148
-#, fuzzy
-#| msgid "Don't disply themes"
-msgid "Display themes"
-msgstr "Don't display themes"
-
-#: catalogue/templates/catalogue/book_text.html:150
-#, fuzzy
-#| msgid "Don't show footnotes"
-msgid "Display footnotes"
-msgstr "Don't show footnotes"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Catalogue"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Catalogue"


@@ -998,6 +986,16 @@ msgstr "Book imported succesfully"
 msgid "Error importing file: %r"
 msgstr "An error occured while importing file: %r"
 
 msgid "Error importing file: %r"
 msgstr "An error occured while importing file: %r"
 

+#, fuzzy
+#~| msgid "parent number"
+#~ msgid "Display line numbers"
+#~ msgstr "Parent number"
+
+#, fuzzy
+#~| msgid "Don't disply themes"
+#~ msgid "Display themes"
+#~ msgstr "Don't display themes"
+

 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "
 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "

diff --git a/src/catalogue/locale/es/LC_MESSAGES/django.po b/src/catalogue/locale/es/LC_MESSAGES/django.po
index 6cdb7b7..c04d892 100644 (file)
--- a/src/catalogue/locale/es/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/es/LC_MESSAGES/django.po
@@ -420,6 +420,7 @@ msgstr "Véase también"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Temas"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Temas"


@@ -615,55 +616,42 @@ msgstr ""
 msgid "Table of contents"
 msgstr "Tabla de contenido"
 
 msgid "Table of contents"
 msgstr "Tabla de contenido"
 

-#: catalogue/templates/catalogue/book_text.html:44
-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr ""
-

 # ! także: N.de la R.
 # ! także: N.de la R.

-#: catalogue/templates/catalogue/book_text.html:50
+#: catalogue/templates/catalogue/book_text.html:44

 msgid "Edit. note"
 msgstr "Nota de la redacción"
 
 msgid "Edit. note"
 msgstr "Nota de la redacción"
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Infobox"
 
 msgid "Infobox"
 msgstr "Infobox"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr ""
+
+#: catalogue/templates/catalogue/book_text.html:59
+#, fuzzy
+#| msgid "Don't show footnotes"
+msgid "Footnotes"
+msgstr "No mostres notas a pie de página"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr ""
 
 msgid "Please wait..."
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr ""
 
 msgid "Other versions of the book"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr ""
 
 msgid "Close the other version"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:146
-#, fuzzy
-#| msgid "parent number"
-msgid "Display line numbers"
-msgstr "cifra matriz"
-
-#: catalogue/templates/catalogue/book_text.html:148
-#, fuzzy
-#| msgid "Don't disply themes"
-msgid "Display themes"
-msgstr "No mostres temas"
-
-#: catalogue/templates/catalogue/book_text.html:150
-#, fuzzy
-#| msgid "Don't show footnotes"
-msgid "Display footnotes"
-msgstr "No mostres notas a pie de página"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Catálogo"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Catálogo"


@@ -1011,6 +999,16 @@ msgstr "El libro ha sido importado con éxito"
 msgid "Error importing file: %r"
 msgstr "Ha ocurrido un error al cargar el archivo: %r"
 
 msgid "Error importing file: %r"
 msgstr "Ha ocurrido un error al cargar el archivo: %r"
 

+#, fuzzy
+#~| msgid "parent number"
+#~ msgid "Display line numbers"
+#~ msgstr "cifra matriz"
+
+#, fuzzy
+#~| msgid "Don't disply themes"
+#~ msgid "Display themes"
+#~ msgstr "No mostres temas"
+

 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "
 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "

diff --git a/src/catalogue/locale/fr/LC_MESSAGES/django.po b/src/catalogue/locale/fr/LC_MESSAGES/django.po
index b284d6c..56b36cd 100644 (file)
--- a/src/catalogue/locale/fr/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/fr/LC_MESSAGES/django.po
@@ -419,6 +419,7 @@ msgstr "Voir aussi"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Thèmes"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Thèmes"


@@ -610,53 +611,40 @@ msgid "Table of contents"
 msgstr "Table des matières"
 
 #: catalogue/templates/catalogue/book_text.html:44
 msgstr "Table des matières"
 
 #: catalogue/templates/catalogue/book_text.html:44

-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr ""
-
-#: catalogue/templates/catalogue/book_text.html:50

 msgid "Edit. note"
 msgstr "Note d'éditeur"
 
 msgid "Edit. note"
 msgstr "Note d'éditeur"
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Infobox"
 
 msgid "Infobox"
 msgstr "Infobox"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr ""
+
+#: catalogue/templates/catalogue/book_text.html:59
+#, fuzzy
+#| msgid "Don't show footnotes"
+msgid "Footnotes"
+msgstr "Ne montre pas d'annotations"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr ""
 
 msgid "Please wait..."
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr ""
 
 msgid "Other versions of the book"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr ""
 
 msgid "Close the other version"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:146
-#, fuzzy
-#| msgid "parent number"
-msgid "Display line numbers"
-msgstr "nombre de parent"
-
-#: catalogue/templates/catalogue/book_text.html:148
-#, fuzzy
-#| msgid "Don't disply themes"
-msgid "Display themes"
-msgstr "N'affiche pas de thèmes"
-
-#: catalogue/templates/catalogue/book_text.html:150
-#, fuzzy
-#| msgid "Don't show footnotes"
-msgid "Display footnotes"
-msgstr "Ne montre pas d'annotations"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Catalogue"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Catalogue"


@@ -1004,6 +992,16 @@ msgstr "Livre importé avec succès"
 msgid "Error importing file: %r"
 msgstr "Erreur pendant l'importation du fichier: %r"
 
 msgid "Error importing file: %r"
 msgstr "Erreur pendant l'importation du fichier: %r"
 

+#, fuzzy
+#~| msgid "parent number"
+#~ msgid "Display line numbers"
+#~ msgstr "nombre de parent"
+
+#, fuzzy
+#~| msgid "Don't disply themes"
+#~ msgid "Display themes"
+#~ msgstr "N'affiche pas de thèmes"
+

 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "
 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "

diff --git a/src/catalogue/locale/it/LC_MESSAGES/django.po b/src/catalogue/locale/it/LC_MESSAGES/django.po
index dd3cdb5..f0e2c6c 100644 (file)
--- a/src/catalogue/locale/it/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/it/LC_MESSAGES/django.po
@@ -419,6 +419,7 @@ msgstr "Vedi anche"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Temi"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Temi"


@@ -613,53 +614,40 @@ msgid "Table of contents"
 msgstr "Indice"
 
 #: catalogue/templates/catalogue/book_text.html:44
 msgstr "Indice"
 
 #: catalogue/templates/catalogue/book_text.html:44

-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr ""
-
-#: catalogue/templates/catalogue/book_text.html:50

 msgid "Edit. note"
 msgstr "Modifica. nota"
 
 msgid "Edit. note"
 msgstr "Modifica. nota"
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Infobox"
 
 msgid "Infobox"
 msgstr "Infobox"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr ""
+
+#: catalogue/templates/catalogue/book_text.html:59
+#, fuzzy
+#| msgid "Don't show footnotes"
+msgid "Footnotes"
+msgstr "Non mostrare le note"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr ""
 
 msgid "Please wait..."
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr ""
 
 msgid "Other versions of the book"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr ""
 
 msgid "Close the other version"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:146
-#, fuzzy
-#| msgid "parent number"
-msgid "Display line numbers"
-msgstr "numero del genitore"
-
-#: catalogue/templates/catalogue/book_text.html:148
-#, fuzzy
-#| msgid "Don't disply themes"
-msgid "Display themes"
-msgstr "Non visualizzare i temi"
-
-#: catalogue/templates/catalogue/book_text.html:150
-#, fuzzy
-#| msgid "Don't show footnotes"
-msgid "Display footnotes"
-msgstr "Non mostrare le note"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Catalogo"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Catalogo"


@@ -1005,6 +993,16 @@ msgstr "Libro scaricato con successo"
 msgid "Error importing file: %r"
 msgstr "Errore dell'importazione del file: %r"
 
 msgid "Error importing file: %r"
 msgstr "Errore dell'importazione del file: %r"
 

+#, fuzzy
+#~| msgid "parent number"
+#~ msgid "Display line numbers"
+#~ msgstr "numero del genitore"
+
+#, fuzzy
+#~| msgid "Don't disply themes"
+#~ msgid "Display themes"
+#~ msgstr "Non visualizzare i temi"
+

 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "
 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "

diff --git a/src/catalogue/locale/lt/LC_MESSAGES/django.po b/src/catalogue/locale/lt/LC_MESSAGES/django.po
index 7006ca1..9554410 100644 (file)
--- a/src/catalogue/locale/lt/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/lt/LC_MESSAGES/django.po
@@ -420,6 +420,7 @@ msgstr "Žiūrėti daugiau"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Motyvai"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Motyvai"


@@ -613,54 +614,40 @@ msgid "Table of contents"
 msgstr "Turinys"
 
 #: catalogue/templates/catalogue/book_text.html:44
 msgstr "Turinys"
 
 #: catalogue/templates/catalogue/book_text.html:44

-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr ""
-
-#: catalogue/templates/catalogue/book_text.html:50

 msgid "Edit. note"
 msgstr "Redaguoti pastabą"
 
 msgid "Edit. note"
 msgstr "Redaguoti pastabą"
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Infobox"
 
 msgid "Infobox"
 msgstr "Infobox"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr ""
+
+#: catalogue/templates/catalogue/book_text.html:59
+#, fuzzy
+#| msgid "Don't show footnotes"
+msgid "Footnotes"
+msgstr "Nerodyti išnašų"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr ""
 
 msgid "Please wait..."
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr ""
 
 msgid "Other versions of the book"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr ""
 
 msgid "Close the other version"
 msgstr ""
 

-# sprawdz
-#: catalogue/templates/catalogue/book_text.html:146
-#, fuzzy
-#| msgid "parent number"
-msgid "Display line numbers"
-msgstr "pirminis numeris"
-
-#: catalogue/templates/catalogue/book_text.html:148
-#, fuzzy
-#| msgid "Don't disply themes"
-msgid "Display themes"
-msgstr "Nerodyti motyvų"
-
-#: catalogue/templates/catalogue/book_text.html:150
-#, fuzzy
-#| msgid "Don't show footnotes"
-msgid "Display footnotes"
-msgstr "Nerodyti išnašų"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Katalogas"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Katalogas"


@@ -1004,6 +991,17 @@ msgstr "Knyga buvo sėkmingai importuota"
 msgid "Error importing file: %r"
 msgstr "Importuojant failą įvyko klaida: %r"
 
 msgid "Error importing file: %r"
 msgstr "Importuojant failą įvyko klaida: %r"
 

+# sprawdz
+#, fuzzy
+#~| msgid "parent number"
+#~ msgid "Display line numbers"
+#~ msgstr "pirminis numeris"
+
+#, fuzzy
+#~| msgid "Don't disply themes"
+#~ msgid "Display themes"
+#~ msgstr "Nerodyti motyvų"
+

 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "
 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "

diff --git a/src/catalogue/locale/pl/LC_MESSAGES/django.mo b/src/catalogue/locale/pl/LC_MESSAGES/django.mo
index dfc9070..8479571 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 5c126a1..5777659 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"
 msgstr ""
 "Project-Id-Version: WolneLektury\n"
 "Report-Msgid-Bugs-To: \n"

-"PO-Revision-Date: 2020-09-18 15:34+0200\n"
+"PO-Revision-Date: 2020-10-16 09:51+0200\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"


@@ -382,6 +382,7 @@ msgstr "Zobacz też"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Motywy"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Motywy"


@@ -557,47 +558,38 @@ msgid "Table of contents"
 msgstr "Spis treści"
 
 #: catalogue/templates/catalogue/book_text.html:44
 msgstr "Spis treści"
 
 #: catalogue/templates/catalogue/book_text.html:44

-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: catalogue/templates/catalogue/book_text.html:50

 msgid "Edit. note"
 msgstr "Nota red."
 
 msgid "Edit. note"
 msgstr "Nota red."
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Informacje"
 
 msgid "Infobox"
 msgstr "Informacje"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr "Numeracja"
+
+#: catalogue/templates/catalogue/book_text.html:59
+msgid "Footnotes"
+msgstr "Przypisy"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr "Zamknij"
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr "Zamknij"
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr "Proszę czekać…"
 
 msgid "Please wait..."
 msgstr "Proszę czekać…"
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr "Inne wersje utworu"
 
 msgid "Other versions of the book"
 msgstr "Inne wersje utworu"
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr "Zamknij drugą wersję"
 
 msgid "Close the other version"
 msgstr "Zamknij drugą wersję"
 

-#: catalogue/templates/catalogue/book_text.html:146
-msgid "Display line numbers"
-msgstr "Wyświetlaj numerację"
-
-#: catalogue/templates/catalogue/book_text.html:148
-msgid "Display themes"
-msgstr "Wyświetlaj motywy"
-
-#: catalogue/templates/catalogue/book_text.html:150
-msgid "Display footnotes"
-msgstr "Wyświetlaj przypisy"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Katalog"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Katalog"


@@ -914,6 +906,15 @@ msgstr "Książka zaimportowana"
 msgid "Error importing file: %r"
 msgstr "Błąd podczas importowania pliku: %r"
 
 msgid "Error importing file: %r"
 msgstr "Błąd podczas importowania pliku: %r"
 

+#~ msgid "Settings"
+#~ msgstr "Ustawienia"
+
+#~ msgid "Display line numbers"
+#~ msgstr "Wyświetlaj numerację"
+
+#~ msgid "Display themes"
+#~ msgstr "Wyświetlaj motywy"
+

 #~ msgid "Gallery"
 #~ msgstr "Galeria"
 
 #~ msgid "Gallery"
 #~ msgstr "Galeria"
 

diff --git a/src/catalogue/locale/ru/LC_MESSAGES/django.po b/src/catalogue/locale/ru/LC_MESSAGES/django.po
index 16f7ab3..92a4060 100644 (file)
--- a/src/catalogue/locale/ru/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/ru/LC_MESSAGES/django.po
@@ -421,6 +421,7 @@ msgstr "Подробнее"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Мотивы"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Мотивы"


@@ -615,53 +616,40 @@ msgid "Table of contents"
 msgstr "Оглавление"
 
 #: catalogue/templates/catalogue/book_text.html:44
 msgstr "Оглавление"
 
 #: catalogue/templates/catalogue/book_text.html:44

-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr ""
-
-#: catalogue/templates/catalogue/book_text.html:50

 msgid "Edit. note"
 msgstr "Изменить примечание"
 
 msgid "Edit. note"
 msgstr "Изменить примечание"
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Инфобокс"
 
 msgid "Infobox"
 msgstr "Инфобокс"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr ""
+
+#: catalogue/templates/catalogue/book_text.html:59
+#, fuzzy
+#| msgid "Don't show footnotes"
+msgid "Footnotes"
+msgstr "Не показывать сноски"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr ""
 
 msgid "Please wait..."
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr ""
 
 msgid "Other versions of the book"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr ""
 
 msgid "Close the other version"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:146
-#, fuzzy
-#| msgid "parent number"
-msgid "Display line numbers"
-msgstr "номер родителя"
-
-#: catalogue/templates/catalogue/book_text.html:148
-#, fuzzy
-#| msgid "Don't disply themes"
-msgid "Display themes"
-msgstr "Не показывать темы"
-
-#: catalogue/templates/catalogue/book_text.html:150
-#, fuzzy
-#| msgid "Don't show footnotes"
-msgid "Display footnotes"
-msgstr "Не показывать сноски"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Каталог"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Каталог"


@@ -1005,6 +993,16 @@ msgstr "Вы удачно заимпортировали книгу"
 msgid "Error importing file: %r"
 msgstr "Ошибка импорта файла: %r"
 
 msgid "Error importing file: %r"
 msgstr "Ошибка импорта файла: %r"
 

+#, fuzzy
+#~| msgid "parent number"
+#~ msgid "Display line numbers"
+#~ msgstr "номер родителя"
+
+#, fuzzy
+#~| msgid "Don't disply themes"
+#~ msgid "Display themes"
+#~ msgstr "Не показывать темы"
+

 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "
 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "

diff --git a/src/catalogue/locale/uk/LC_MESSAGES/django.po b/src/catalogue/locale/uk/LC_MESSAGES/django.po
index 82abb47..1aca219 100644 (file)
--- a/src/catalogue/locale/uk/LC_MESSAGES/django.po
+++ b/src/catalogue/locale/uk/LC_MESSAGES/django.po
@@ -418,6 +418,7 @@ msgstr "Дивіться також"
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38
 
 #: catalogue/templates/catalogue/book_detail.html:41
 #: catalogue/templates/catalogue/book_text.html:38

+#: catalogue/templates/catalogue/book_text.html:57

 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Теми"
 #: catalogue/templates/catalogue/tagged_object_list.html:20
 msgid "Themes"
 msgstr "Теми"


@@ -612,53 +613,40 @@ msgid "Table of contents"
 msgstr "Зміст"
 
 #: catalogue/templates/catalogue/book_text.html:44
 msgstr "Зміст"
 
 #: catalogue/templates/catalogue/book_text.html:44

-#: catalogue/templates/catalogue/book_text.html:144
-msgid "Settings"
-msgstr ""
-
-#: catalogue/templates/catalogue/book_text.html:50

 msgid "Edit. note"
 msgstr "Редакторський коментар"
 
 msgid "Edit. note"
 msgstr "Редакторський коментар"
 

-#: catalogue/templates/catalogue/book_text.html:56
+#: catalogue/templates/catalogue/book_text.html:50

 msgid "Infobox"
 msgstr "Інфобокс"
 
 msgid "Infobox"
 msgstr "Інфобокс"
 

-#: catalogue/templates/catalogue/book_text.html:80
+#: catalogue/templates/catalogue/book_text.html:55
+msgid "Numbering"
+msgstr ""
+
+#: catalogue/templates/catalogue/book_text.html:59
+#, fuzzy
+#| msgid "Don't show footnotes"
+msgid "Footnotes"
+msgstr "Сховати примітки"
+
+#: catalogue/templates/catalogue/book_text.html:82

 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 
 #: catalogue/templates/catalogue/viewer_base.html:54
 msgid "Close"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:81
+#: catalogue/templates/catalogue/book_text.html:83

 msgid "Please wait..."
 msgstr ""
 
 msgid "Please wait..."
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:125
+#: catalogue/templates/catalogue/book_text.html:127

 msgid "Other versions of the book"
 msgstr ""
 
 msgid "Other versions of the book"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:126
+#: catalogue/templates/catalogue/book_text.html:128

 msgid "Close the other version"
 msgstr ""
 
 msgid "Close the other version"
 msgstr ""
 

-#: catalogue/templates/catalogue/book_text.html:146
-#, fuzzy
-#| msgid "parent number"
-msgid "Display line numbers"
-msgstr "номер батька"
-
-#: catalogue/templates/catalogue/book_text.html:148
-#, fuzzy
-#| msgid "Don't disply themes"
-msgid "Display themes"
-msgstr "Сховати теми"
-
-#: catalogue/templates/catalogue/book_text.html:150
-#, fuzzy
-#| msgid "Don't show footnotes"
-msgid "Display footnotes"
-msgstr "Сховати примітки"
-

 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Каталог"
 #: catalogue/templates/catalogue/catalogue.html:6
 msgid "Catalogue"
 msgstr "Каталог"


@@ -999,6 +987,16 @@ msgstr "Книжку успішно завантажено"
 msgid "Error importing file: %r"
 msgstr "Помилка в завантаженні файла: %r"
 
 msgid "Error importing file: %r"
 msgstr "Помилка в завантаженні файла: %r"
 

+#, fuzzy
+#~| msgid "parent number"
+#~ msgid "Display line numbers"
+#~ msgstr "номер батька"
+
+#, fuzzy
+#~| msgid "Don't disply themes"
+#~ msgid "Display themes"
+#~ msgstr "Сховати теми"
+

 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "
 #, fuzzy
 #~| msgid ""
 #~| "Search engine supports following criteria: title, author, theme/topic, "

diff --git a/src/catalogue/templates/catalogue/book_text.html b/src/catalogue/templates/catalogue/book_text.html
index 238d50e..7d32a22 100644 (file)
--- a/src/catalogue/templates/catalogue/book_text.html
+++ b/src/catalogue/templates/catalogue/book_text.html
@@ -39,12 +39,6 @@
     </a>
   </li>
 
     </a>
   </li>
 

-  <li id="menu-settings">
-    <a href="#" data-box="settings">
-      <span class="label">{% trans "Settings" %}</span>
-    </a>
-  </li>
-

   <li id="menu-nota_red">
     <a href="#" data-box="nota_red">
       <span class="label">{% trans "Edit. note" %}</span>
   <li id="menu-nota_red">
     <a href="#" data-box="nota_red">
       <span class="label">{% trans "Edit. note" %}</span>


@@ -56,6 +50,14 @@
       <span class="label">{% trans "Infobox" %}</span>
     </a>
   </li>
       <span class="label">{% trans "Infobox" %}</span>
     </a>
   </li>

+
+  <a href="#" class="settings-switch" id="settings-line-numbers"
+     data-setting="always-hide-line-numbers"><span>{% trans "Numbering" %}</span></a>
+  <a href="#" class="settings-switch" id="settings-themes"
+     data-setting="always-hide-themes"><span>{% trans "Themes" %}</span></a>
+    <a href="#" class="settings-switch" id="settings-annotations"
+       data-setting="no-annotations"><span>{% trans "Footnotes" %}</span></a>
+

 {% endblock menu %}
 
 
 {% endblock menu %}
 
 


@@ -140,16 +142,6 @@
     </div>
   {% endif %}
 
     </div>
   {% endif %}
 

-  <div class="box" id="settings">
-    <h2>{% trans "Settings" %}</h2>
-    <a href="#" class="settings-switch" id="settings-line-numbers"
-       data-setting="always-hide-line-numbers">{% trans "Display line numbers" %}</a><br/>
-    <a href="#" class="settings-switch" id="settings-themes"
-       data-setting="always-hide-themes">{% trans "Display themes" %}</a><br/>
-    <a href="#" class="settings-switch" id="settings-annotations"
-       data-setting="no-annotations">{% trans "Display footnotes" %}</a><br/>
-  </div>
-

   <div class="box" id="book-short">
     {% include 'catalogue/book_short.html' %}
   </div>
   <div class="box" id="book-short">
     {% include 'catalogue/book_short.html' %}
   </div>

diff --git a/src/wolnelektury/static/scss/book_text/settings.scss b/src/wolnelektury/static/scss/book_text/settings.scss
index edcb8bf..cd6997c 100644 (file)
--- a/src/wolnelektury/static/scss/book_text/settings.scss
+++ b/src/wolnelektury/static/scss/book_text/settings.scss
@@ -1,47 +1,48 @@
 @mixin switch-on {
 @mixin switch-on {

-    background: #aaa;
-    border-top-color: #888;
-    border-left-color: #888;
-    border-bottom-color: #ddd;
-    border-right-color: #ddd;
-
-    border-width: 2px;
-    border-style: solid;
-
+    left: 10px;
+    right: 0;

 }
 @mixin switch-off {
 }
 @mixin switch-off {

-    background: none;
-    border-color: #aaa;
+    left: 0;
+    right: 10px;

 }
 .settings-switch {
     display: block;
     padding: .5em;
     margin: .5em;
 }
 .settings-switch {
     display: block;
     padding: .5em;
     margin: .5em;

-    //border: 1px solid #aaa;
-    border-radius: 1em;

     color: black;
     color: black;

-    border-width: 2px;
-    border-style: solid;
-}
-
-nav #menu-settings {
-    display: none;
+    background: linear-gradient(90deg, #018189 50%, #9e3610 50%);
+    border-radius: 1em;
+    position: relative;
+    height: 1em;
+
+    span {
+        background: #444 ;
+        color: #eee;
+        font-size: 12px;
+        position: absolute;
+        top:0;
+        bottom: 0;
+        border-radius: 16px;
+        line-height: 32px;
+        transition: left .2s, right .2s;
+    }

 }
 
 }
 

-#settings-annotations {@include switch-on;}
+#settings-annotations span {@include switch-on;}

 .no-annotations {
 .no-annotations {

-    #settings-annotations {@include switch-off;}
+    #settings-annotations span {@include switch-off;}

     .annotation {display: none;}
 }
 
     .annotation {display: none;}
 }
 

-#settings-themes {@include switch-on;}
+#settings-themes span {@include switch-on;}

 .always-hide-themes {
 .always-hide-themes {

-    #settings-themes {@include switch-off;}
+    #settings-themes span {@include switch-off;}

 }
 
 }
 

-#settings-line-numbers {@include switch-on;}
+#settings-line-numbers span {@include switch-on;}

 .always-hide-line-numbers {
 .always-hide-line-numbers {

-    #settings-line-numbers {@include switch-off;}
+    #settings-line-numbers span {@include switch-off;}

 }
 
 
 }