Minor presentation fixes.

diff --git a/apps/dictionary/constants.py b/apps/dictionary/constants.py
new file mode 100644 (file)
index 0000000..e99dc3f
--- /dev/null
+++ b/apps/dictionary/constants.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from __future__ import unicode_literals
+
+from django.utils.translation import ugettext_lazy as _
+
+
+FN_TYPES = {
+    'pa': _("author's footnotes"),
+    'pe': _("Wolne Lektury editorial footnotes"),
+    'pr': _("source editorial footnotes"),
+    'pt': _("translator's footnotes"),
+}

diff --git a/apps/dictionary/locale/pl/LC_MESSAGES/django.mo b/apps/dictionary/locale/pl/LC_MESSAGES/django.mo
index 2dbef9a..c95d7b4 100644 (file)
Binary files a/apps/dictionary/locale/pl/LC_MESSAGES/django.mo and b/apps/dictionary/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/dictionary/locale/pl/LC_MESSAGES/django.po b/apps/dictionary/locale/pl/LC_MESSAGES/django.po
index 73c52d1..1cb8844 100644 (file)
--- a/apps/dictionary/locale/pl/LC_MESSAGES/django.po
+++ b/apps/dictionary/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WolneLektury-dictionary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-23 16:02+0200\n"
-"PO-Revision-Date: 2014-10-23 16:03+0100\n"
+"POT-Creation-Date: 2014-10-24 11:58+0200\n"
+"PO-Revision-Date: 2014-10-24 11:58+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pl\n"
@@ -19,6 +19,22 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.5.4\n"
 
+#: constants.py:11
+msgid "author's footnotes"
+msgstr "przypisy autorskie"
+
+#: constants.py:12
+msgid "Wolne Lektury editorial footnotes"
+msgstr "przypisy redaktorów Wolnych Lektur"
+
+#: constants.py:13
+msgid "source editorial footnotes"
+msgstr "przypisy redakcji źródła"
+
+#: constants.py:14
+msgid "translator's footnotes"
+msgstr "przypisy tłumacza"
+
 #: templates/dictionary/note_list.html:8
 #: templates/dictionary/note_list.html:12
 msgid "Footnotes"

diff --git a/apps/dictionary/templates/dictionary/note_list.html b/apps/dictionary/templates/dictionary/note_list.html
index 330b2a7..3d4916c 100755 (executable)
--- a/apps/dictionary/templates/dictionary/note_list.html
+++ b/apps/dictionary/templates/dictionary/note_list.html
@@ -39,12 +39,12 @@
     <strong>{% trans "all" %}</strong>
 {% endif %}
 
-{% for fnt in fn_types %}
+{% for fnt, fnt_name in fn_types %}
     |
     {% if fnt == fn_type %}
-        <strong>{{ fnt }}</strong>
+        <strong>{{ fnt_name }}</strong>
     {% else %}
-        <a href='?{% set_get "page" type=fnt %}'>{{ fnt }}</a>
+        <a href='?{% set_get "page" type=fnt %}'>{{ fnt_name }}</a>
     {% endif %}
 {% endfor %}
 </p>

diff --git a/apps/dictionary/views.py b/apps/dictionary/views.py
index 42aab6c..76530bc 100755 (executable)
--- a/apps/dictionary/views.py
+++ b/apps/dictionary/views.py
@@ -2,9 +2,10 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from dictionary.models import Note, Qualifier
 from django.views.generic.list import ListView
 from django.db.models import Count, Q
+from .constants import FN_TYPES
+from .models import Note, Qualifier
 
 
 class NotesView(ListView):
@@ -56,6 +57,7 @@ class NotesView(ListView):
                 nobj = nobj.filter(fltr)
         self.fn_types = nobj.order_by('fn_type').values_list(
             'fn_type', flat=True).distinct()
+        self.fn_types = [(fnt, FN_TYPES[fnt]) for fnt in self.fn_types]
 
         for f in filters.values():
             objects = objects.filter(f)

diff --git a/apps/picture/locale/pl/LC_MESSAGES/django.mo b/apps/picture/locale/pl/LC_MESSAGES/django.mo
index 627beda..f3bc162 100644 (file)
Binary files a/apps/picture/locale/pl/LC_MESSAGES/django.mo and b/apps/picture/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/picture/locale/pl/LC_MESSAGES/django.po b/apps/picture/locale/pl/LC_MESSAGES/django.po
index df055fa..63546c2 100644 (file)
--- a/apps/picture/locale/pl/LC_MESSAGES/django.po
+++ b/apps/picture/locale/pl/LC_MESSAGES/django.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-07 16:36+0100\n"
-"PO-Revision-Date: 2014-02-07 16:36+0100\n"
+"POT-Creation-Date: 2014-10-24 11:44+0200\n"
+"PO-Revision-Date: 2014-10-24 11:48+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,88 +18,71 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: forms.py:21
+#: forms.py:25
 msgid "Please supply an XML."
 msgstr ""
 
-#: forms.py:29
+#: forms.py:33
 msgid "Please supply an image."
 msgstr ""
 
-#: models.py:38
+#: models.py:35
 msgid "area"
 msgstr "obszar"
 
-#: models.py:39
+#: models.py:36
 msgid "kind"
 msgstr "typ"
 
-#: models.py:41
+#: models.py:38
 msgid "thing"
 msgstr "przedmiot"
 
-#: models.py:42
+#: models.py:39
 msgid "theme"
 msgstr "motyw"
 
-#: models.py:92
+#: models.py:75
 msgid "title"
 msgstr "tytuł"
 
-#: models.py:93
+#: models.py:76
 msgid "slug"
 msgstr "slug"
 
-#: models.py:94
+#: models.py:77
 msgid "sort key"
 msgstr "klucz sortowania"
 
-#: models.py:95
+#: models.py:78
 #, fuzzy
 msgid "sort key by author"
 msgstr "klucz sortowania"
 
-#: models.py:96 models.py:97
+#: models.py:79 models.py:80
 msgid "creation date"
 msgstr "data stworzenia"
 
-#: models.py:99
+#: models.py:82
 msgid "image_file"
 msgstr ""
 
-#: models.py:101
+#: models.py:84
 msgid "picture areas JSON"
 msgstr "obszary w JSON"
 
-#: models.py:102
+#: models.py:85
 msgid "extra information"
 msgstr "dodatkowa informacja"
 
-#: models.py:121
+#: models.py:105
 msgid "picture"
 msgstr "obraz"
 
-#: models.py:122
+#: models.py:106
 msgid "pictures"
 msgstr "obrazy"
 
-#: views.py:82
-#, python-format
-msgid ""
-"An error occurred: %(exception)s\n"
-"\n"
-"%(tb)s"
-msgstr ""
-
-#: views.py:83
-msgid "Picture imported successfully"
-msgstr "Obraz został zimportowany"
-
-#: views.py:85
-#, python-format
-msgid "Error importing file: %r"
-msgstr "Błąd importu pliku: %r"
-
 #: templates/admin/picture/picture/change_list.html:8
 msgid "Image"
 msgstr "Obraz"
@@ -109,8 +91,12 @@ msgstr "Obraz"
 msgid "Import picture"
 msgstr "Importuj obraz"
 
-#: templates/picture/picture_list_thumb.html:10
-#: templates/picture/picture_list_thumb.html:14
+#: templates/picture/picture_detail.html:21
+msgid "See also"
+msgstr "Zobacz też"
+
+#: templates/picture/picture_list_thumb.html:9
+#: templates/picture/picture_list_thumb.html:13
 msgctxt "gallery"
 msgid "Listing of all works"
 msgstr "Spis wszystkich dzieł"
@@ -127,16 +113,16 @@ msgstr "Typ"
 msgid "Genre"
 msgstr "Gatunek"
 
-#: templates/picture/picture_short.html:68
+#: templates/picture/picture_short.html:71
 msgid "View online"
 msgstr "Zobacz online"
 
-#: templates/picture/picture_short.html:71
+#: templates/picture/picture_short.html:74
 msgid "download original"
 msgstr "pobierz oryginał"
 
 #: templates/picture/picture_viewer.html:36
-#: templates/picture/picture_wide.html:31
+#: templates/picture/picture_wide.html:64
 msgid "Objects"
 msgstr "Obiekty"
 
@@ -148,42 +134,75 @@ msgstr "Motywy"
 msgid "Infobox"
 msgstr "Informacja"
 
-#: templates/picture/picture_wide.html:20
+#: templates/picture/picture_wide.html:19
+msgid "Style"
+msgstr "Styl"
+
+#: templates/picture/picture_wide.html:29
+msgid "Medium"
+msgstr "Technika"
+
+#: templates/picture/picture_wide.html:36
+msgid "Dimensions"
+msgstr "Wymiary pracy"
+
+#: templates/picture/picture_wide.html:42
+msgid "Date"
+msgstr "Czas powstania"
+
+#: templates/picture/picture_wide.html:53
 msgid "Motifs, themes and objects"
 msgstr "Motywy i obiekty"
 
-#: templates/picture/picture_wide.html:23
+#: templates/picture/picture_wide.html:56
 msgid "Motifs and themes"
 msgstr "Motywy"
 
-#: templates/picture/picture_wide.html:49
+#: templates/picture/picture_wide.html:82
 msgid "See"
 msgstr "Zobacz"
 
-#: templates/picture/picture_wide.html:52
+#: templates/picture/picture_wide.html:85
 msgid "Source"
 msgstr "Źródło"
 
-#: templates/picture/picture_wide.html:52
+#: templates/picture/picture_wide.html:85
 msgid "of the picture"
 msgstr "obrazu"
 
-#: templates/picture/picture_wide.html:54
+#: templates/picture/picture_wide.html:87
 msgid "Source XML file"
 msgstr "Źródło XML"
 
-#: templates/picture/picture_wide.html:56
+#: templates/picture/picture_wide.html:89
 msgid "Picture on"
 msgstr "Obraz na"
 
-#: templates/picture/picture_wide.html:56
+#: templates/picture/picture_wide.html:89
 msgid "Editor's Platform"
 msgstr "platformie edytorskiej"
 
-#: templates/picture/picture_wide.html:59
+#: templates/picture/picture_wide.html:92
 msgid "Picture description on Wikipedia"
 msgstr "Opis w Wikipedii"
 
+#: views.py:91
+#, python-format
+msgid ""
+"An error occurred: %(exception)s\n"
+"\n"
+"%(tb)s"
+msgstr ""
+
+#: views.py:92
+msgid "Picture imported successfully"
+msgstr "Obraz został zimportowany"
+
+#: views.py:94
+#, python-format
+msgid "Error importing file: %r"
+msgstr "Błąd importu pliku: %r"
+
 #~ msgid "Download"
 #~ msgstr "Pobierz"
 

diff --git a/apps/wolnelektury_core/static/scss/main/book_box.scss b/apps/wolnelektury_core/static/scss/main/book_box.scss
index 4640b30..d318fda 100755 (executable)
--- a/apps/wolnelektury_core/static/scss/main/book_box.scss
+++ b/apps/wolnelektury_core/static/scss/main/book_box.scss
@@ -524,7 +524,8 @@
 }
 
 
-#book-detail .see-also {
+#book-detail .see-also,
+#picture-detail .see-also {
     h1 {
         @include size(height, 32px);
         margin: 0;