Image chooser.

diff --git a/src/cover/views.py b/src/cover/views.py
index e89e796..d00123c 100644 (file)
--- a/src/cover/views.py
+++ b/src/cover/views.py
@@ -22,7 +22,7 @@ from cover import forms
 from cover.utils import get_import_data
 
 
 from cover.utils import get_import_data
 
 

-PREVIEW_SIZE = (216, 300)
+PREVIEW_SIZE = (212, 300)

 
 
 def preview(request, book, chunk=None, rev=None):
 
 
 def preview(request, book, chunk=None, rev=None):

diff --git a/src/documents/models/book.py b/src/documents/models/book.py
index 1b34fb6..f40af29 100644 (file)
--- a/src/documents/models/book.py
+++ b/src/documents/models/book.py
@@ -399,7 +399,7 @@ class Book(models.Model):
         self.build_cover()
 
     def build_cover(self):
         self.build_cover()
 
     def build_cover(self):

-        width, height = 216, 300
+        width, height = 212, 300

         try:
             xml = self.materialize(publishable=True).encode('utf-8')
             info = BookInfo.from_bytes(xml)
         try:
             xml = self.materialize(publishable=True).encode('utf-8')
             info = BookInfo.from_bytes(xml)

diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py
index 6e705f1..70512cb 100644 (file)
--- a/src/redakcja/settings/__init__.py
+++ b/src/redakcja/settings/__init__.py
@@ -125,6 +125,8 @@ LEGIMI_BIG_WORDS = 10000
 LEGIMI_SMALL_PRICE = 7
 LEGIMI_BIG_PRICE = 20
 
 LEGIMI_SMALL_PRICE = 7
 LEGIMI_BIG_PRICE = 20
 

+THUMBNAIL_PRESERVE_FORMAT = True
+

 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',

diff --git a/src/redakcja/static/css/html.scss b/src/redakcja/static/css/html.scss
index cfd7fc2..881083a 100644 (file)
--- a/src/redakcja/static/css/html.scss
+++ b/src/redakcja/static/css/html.scss
@@ -538,3 +538,13 @@ div[x-node] > .uwaga {
     border:0;
     color: black;
 } 
     border:0;
     color: black;
 } 

+
+
+#media-chooser {
+    img {
+        border: 3px solid transparent;
+        &.active {
+            border-color: green;
+        }
+    }
+}

diff --git a/src/redakcja/static/img/sample_cover.png b/src/redakcja/static/img/sample_cover.png
index f7a678e..355a82d 100644 (file)
Binary files a/src/redakcja/static/img/sample_cover.png and b/src/redakcja/static/img/sample_cover.png differ

diff --git a/src/redakcja/static/js/wiki/view_gallery.js b/src/redakcja/static/js/wiki/view_gallery.js
index e04342f..5152f43 100644 (file)
--- a/src/redakcja/static/js/wiki/view_gallery.js
+++ b/src/redakcja/static/js/wiki/view_gallery.js
@@ -150,7 +150,7 @@
         newPage = normalizeNumber(newPage, this.doc.galleryImages.length);
         this.$numberInput.val(newPage);
                this.config().page = newPage;
         newPage = normalizeNumber(newPage, this.doc.galleryImages.length);
         this.$numberInput.val(newPage);
                this.config().page = newPage;

-        $('.gallery-image img', this.$element).attr('src', this.doc.galleryImages[newPage - 1]);
+        $('.gallery-image img', this.$element).attr('src', this.doc.galleryImages[newPage - 1].url);

     };
 
     ScanGalleryPerspective.prototype.alterZoom = function(delta){
     };
 
     ScanGalleryPerspective.prototype.alterZoom = function(delta){

diff --git a/src/redakcja/static/js/wiki/view_properties.js b/src/redakcja/static/js/wiki/view_properties.js
index 204a4de..5405173 100644 (file)
--- a/src/redakcja/static/js/wiki/view_properties.js
+++ b/src/redakcja/static/js/wiki/view_properties.js
@@ -8,6 +8,7 @@
             "attributes": [
                 {
                     "name": "src",
             "attributes": [
                 {
                     "name": "src",

+                    "type": "media",

                 },
                 {
                     "name": "alt",
                 },
                 {
                     "name": "alt",


@@ -151,6 +152,26 @@
             });
 
 
             });
 
 

+            $('#media-chooser').on('show.bs.modal', function (event) {
+                var input = $("input", $(event.relatedTarget).parent());
+                var modal = $(this);
+                modal.data('target-input', input);
+                var imglist = modal.find('.modal-body');
+                $.each(self.doc.galleryImages, (i, imgItem) => {
+                    img = $("<img>").attr("src", imgItem.thumb).attr('title', imgItem.url).data('url', imgItem.url).on('click', function() {
+                        imglist.find('img').removeClass('active');
+                        $(this).addClass('active');
+                    });
+                    imglist.append(img);
+                });
+            })
+            $('#media-chooser .ctrl-ok').on('click', function (event) {
+                $('#media-chooser').data('target-input')
+                    .val(
+                        (new URL($('#media-chooser .active').data('url'), document.baseURI)).href
+                    ).trigger('change');
+                $('#media-chooser').modal('hide');
+            });

             
             self.$pane.on('click', '.current-convert', function() {
                 self.convert($(this).attr('data-to'));
             
             self.$pane.on('click', '.current-convert', function() {
                 self.convert($(this).attr('data-to'));


@@ -334,22 +355,28 @@
 
         let $fg = $("<div class='form-group'>");
         $("<label/>").attr("for", "property-" + defn.name).text(defn.name).appendTo($fg);
 
         let $fg = $("<div class='form-group'>");
         $("<label/>").attr("for", "property-" + defn.name).text(defn.name).appendTo($fg);

-        let $input;
+        let $input, $inputCnt;

         switch (defn.type) {
         case 'text':
         switch (defn.type) {
         case 'text':

-            $input = $("<textarea>");
+            $inputCnt =$input = $("<textarea>");

             break;
         case 'select':
             break;
         case 'select':

-            $input = $("<select>");
+            $inputCnt = $input = $("<select>");

             $.each(defn.options, function(i, e) {
                 $("<option>").text(e).appendTo($input);
             });
             break;
         case 'bool':
             $.each(defn.options, function(i, e) {
                 $("<option>").text(e).appendTo($input);
             });
             break;
         case 'bool':

-            $input = $("<input type='checkbox'>");
+            $inputCnt = $input = $("<input type='checkbox'>");
+            break;
+        case 'media':
+            $inputCnt = $("<div class='media-input input-group'>");
+            $input = $("<input type='text'>");
+            $inputCnt.append($input);
+            $inputCnt.append($("<button type='button' class='ctrl-media-choose btn btn-primary' data-toggle='modal' data-target='#media-chooser'>…</button>"));

             break;
         default:
             break;
         default:

-            $input = $("<input>");
+            $inputCnt = $input = $("<input>");

         }
 
         $input.addClass("form-control").attr("id", "property-" + defn.name).data("property", defn.name);
         }
 
         $input.addClass("form-control").attr("id", "property-" + defn.name).data("property", defn.name);


@@ -362,7 +389,7 @@
         if (elem) {
             $input.data("edited", elem);
         }
         if (elem) {
             $input.data("edited", elem);
         }

-        $input.appendTo($fg);
+        $inputCnt.appendTo($fg);

 
         $fg.appendTo($form);
     }
 
         $fg.appendTo($form);
     }


@@ -385,7 +412,9 @@
         if ($.wiki.activePerspective() != 'VisualPerspective')
             $.wiki.switchToTab('#VisualPerspective');
 
         if ($.wiki.activePerspective() != 'VisualPerspective')
             $.wiki.switchToTab('#VisualPerspective');
 

-        self.edit($('[x-node="utwor"]')[0]);
+        if (self.$edited === null) {
+            self.edit($('[x-node="utwor"]')[0]);
+        }

     };
 
     $.wiki.PropertiesPerspective = PropertiesPerspective;
     };
 
     $.wiki.PropertiesPerspective = PropertiesPerspective;

diff --git a/src/wiki/locale/pl/LC_MESSAGES/django.mo b/src/wiki/locale/pl/LC_MESSAGES/django.mo
index 91c9ee0..07d83ef 100644 (file)
Binary files a/src/wiki/locale/pl/LC_MESSAGES/django.mo and b/src/wiki/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/src/wiki/locale/pl/LC_MESSAGES/django.po b/src/wiki/locale/pl/LC_MESSAGES/django.po
index 7d75ae4..1b2f1b6 100644 (file)
--- a/src/wiki/locale/pl/LC_MESSAGES/django.po
+++ b/src/wiki/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"

-"PO-Revision-Date: 2021-02-03 12:31+0100\n"
+"PO-Revision-Date: 2023-06-27 11:54+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"


@@ -15,281 +15,287 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0.1\n"

 
 

-#: forms.py:17 forms.py:61 views.py:284
+#: wiki/forms.py:17 wiki/forms.py:61 wiki/views.py:303

 msgid "Publishable"
 msgstr "Gotowe do publikacji"
 
 msgid "Publishable"
 msgstr "Gotowe do publikacji"
 

-#: forms.py:36 forms.py:87
+#: wiki/forms.py:36 wiki/forms.py:87

 msgid "Author"
 msgstr "Autor"
 
 msgid "Author"
 msgstr "Autor"
 

-#: forms.py:37 forms.py:88
+#: wiki/forms.py:37 wiki/forms.py:88

 msgid "Your name"
 msgstr "Imię i nazwisko"
 
 msgid "Your name"
 msgstr "Imię i nazwisko"
 

-#: forms.py:42 forms.py:93
+#: wiki/forms.py:42 wiki/forms.py:93

 msgid "Author's email"
 msgstr "E-mail autora"
 
 msgid "Author's email"
 msgstr "E-mail autora"
 

-#: forms.py:43 forms.py:94
+#: wiki/forms.py:43 wiki/forms.py:94

 msgid "Your email address, so we can show a gravatar :)"
 msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)"
 
 msgid "Your email address, so we can show a gravatar :)"
 msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)"
 

-#: forms.py:49 forms.py:100
+#: wiki/forms.py:49 wiki/forms.py:100

 msgid "Your comments"
 msgstr "Twój komentarz"
 
 msgid "Your comments"
 msgstr "Twój komentarz"
 

-#: forms.py:50
+#: wiki/forms.py:50

 msgid "Describe changes you made."
 msgstr "Opisz swoje zmiany."
 
 msgid "Describe changes you made."
 msgstr "Opisz swoje zmiany."
 

-#: forms.py:56
+#: wiki/forms.py:56

 msgid "Completed"
 msgstr "Ukończono"
 
 msgid "Completed"
 msgstr "Ukończono"
 

-#: forms.py:57
+#: wiki/forms.py:57

 msgid "If you completed a life cycle stage, select it."
 msgstr "Jeśli został ukończony etap prac, wskaż go."
 
 msgid "If you completed a life cycle stage, select it."
 msgstr "Jeśli został ukończony etap prac, wskaż go."
 

-#: forms.py:62
+#: wiki/forms.py:62

 msgid "Mark this revision as publishable."
 msgstr "Oznacz tę wersję jako gotową do publikacji."
 
 msgid "Mark this revision as publishable."
 msgstr "Oznacz tę wersję jako gotową do publikacji."
 

-#: forms.py:101
+#: wiki/forms.py:101

 msgid "Describe the reason for reverting."
 msgstr "Opisz powód przywrócenia."
 
 msgid "Describe the reason for reverting."
 msgstr "Opisz powód przywrócenia."
 

-#: models.py:12
+#: wiki/models.py:12

 msgid "name"
 msgstr "nazwa"
 
 msgid "name"
 msgstr "nazwa"
 

-#: models.py:16
+#: wiki/models.py:16

 msgid "theme"
 msgstr "motyw"
 
 msgid "theme"
 msgstr "motyw"
 

-#: models.py:17
+#: wiki/models.py:17

 msgid "themes"
 msgstr "motywy"
 
 msgid "themes"
 msgstr "motywy"
 

-#: templates/admin/wiki/theme/change_list.html:22
+#: wiki/templates/admin/wiki/theme/change_list.html:22

 msgid "Table for Redmine wiki"
 msgstr "Tabela do wiki na Redmine"
 
 msgid "Table for Redmine wiki"
 msgstr "Tabela do wiki na Redmine"
 

-#: templates/wiki/diff_table.html:5
+#: wiki/templates/wiki/diff_table.html:5

 msgid "Old version"
 msgstr "Stara wersja"
 
 msgid "Old version"
 msgstr "Stara wersja"
 

-#: templates/wiki/diff_table.html:6
+#: wiki/templates/wiki/diff_table.html:6

 msgid "New version"
 msgstr "Nowa wersja"
 
 msgid "New version"
 msgstr "Nowa wersja"
 

-#: templates/wiki/document_details.html:38
+#: wiki/templates/wiki/document_details.html:39

 msgid "Click to open/close gallery"
 msgstr "Kliknij, aby (ro)zwinąć galerię"
 
 msgid "Click to open/close gallery"
 msgstr "Kliknij, aby (ro)zwinąć galerię"
 

-#: templates/wiki/document_details_base.html:50
+#: wiki/templates/wiki/document_details_base.html:51

 msgid "Help"
 msgstr "Pomoc"
 
 msgid "Help"
 msgstr "Pomoc"
 

-#: templates/wiki/document_details_base.html:52
+#: wiki/templates/wiki/document_details_base.html:62

 msgid "Version"
 msgstr "Wersja"
 
 msgid "Version"
 msgstr "Wersja"
 

-#: templates/wiki/document_details_base.html:52
+#: wiki/templates/wiki/document_details_base.html:62

 msgid "Unknown"
 msgstr "Nieznana"
 
 msgid "Unknown"
 msgstr "Nieznana"
 

-#: templates/wiki/document_details_base.html:54
-#: templates/wiki/pubmark_dialog.html:16
+#: wiki/templates/wiki/document_details_base.html:64
+#: wiki/templates/wiki/pubmark_dialog.html:16

 msgid "Save"
 msgstr "Zapisz"
 
 msgid "Save"
 msgstr "Zapisz"
 

-#: templates/wiki/document_details_base.html:55
+#: wiki/templates/wiki/document_details_base.html:65

 msgid "Save attempt in progress"
 msgstr "Trwa zapisywanie"
 
 msgid "Save attempt in progress"
 msgstr "Trwa zapisywanie"
 

-#: templates/wiki/document_details_base.html:56
+#: wiki/templates/wiki/document_details_base.html:66

 msgid "There is a newer version of this document!"
 msgstr "Istnieje nowsza wersja tego dokumentu!"
 
 msgid "There is a newer version of this document!"
 msgstr "Istnieje nowsza wersja tego dokumentu!"
 

-#: templates/wiki/pubmark_dialog.html:17 templates/wiki/revert_dialog.html:40
+#: wiki/templates/wiki/media_dialog.html:8
+msgid "Choose"
+msgstr "Wybierz"
+
+#: wiki/templates/wiki/media_dialog.html:9
+#: wiki/templates/wiki/pubmark_dialog.html:17
+#: wiki/templates/wiki/revert_dialog.html:40

 msgid "Cancel"
 msgstr "Anuluj"
 
 msgid "Cancel"
 msgstr "Anuluj"
 

-#: templates/wiki/revert_dialog.html:39
+#: wiki/templates/wiki/revert_dialog.html:39

 msgid "Revert"
 msgstr "Przywróć"
 
 msgid "Revert"
 msgstr "Przywróć"
 

-#: templates/wiki/tabs/annotations_view.html:18
+#: wiki/templates/wiki/tabs/annotations_view.html:18

 msgid "all"
 msgstr "wszystkie"
 
 msgid "all"
 msgstr "wszystkie"
 

-#: templates/wiki/tabs/annotations_view_item.html:3
+#: wiki/templates/wiki/tabs/annotations_view_item.html:3

 msgid "Annotations"
 msgstr "Przypisy"
 
 msgid "Annotations"
 msgstr "Przypisy"
 

-#: templates/wiki/tabs/gallery_view.html:7
+#: wiki/templates/wiki/tabs/gallery_view.html:7

 msgid "Go to first image of this part"
 msgstr "Przejdź na początek"
 
 msgid "Go to first image of this part"
 msgstr "Przejdź na początek"
 

-#: templates/wiki/tabs/gallery_view.html:10
+#: wiki/templates/wiki/tabs/gallery_view.html:10

 msgid "Previous"
 msgstr "Poprzednie"
 
 msgid "Previous"
 msgstr "Poprzednie"
 

-#: templates/wiki/tabs/gallery_view.html:21
+#: wiki/templates/wiki/tabs/gallery_view.html:21

 msgid "Next"
 msgstr "Następne"
 
 msgid "Next"
 msgstr "Następne"
 

-#: templates/wiki/tabs/gallery_view_item.html:3
+#: wiki/templates/wiki/tabs/gallery_view_item.html:3

 msgid "Gallery"
 msgstr "Galeria"
 
 msgid "Gallery"
 msgstr "Galeria"
 

-#: templates/wiki/tabs/history_view.html:6
+#: wiki/templates/wiki/tabs/history_view.html:6

 msgid "Compare versions"
 msgstr "Porównaj wersje"
 
 msgid "Compare versions"
 msgstr "Porównaj wersje"
 

-#: templates/wiki/tabs/history_view.html:9
+#: wiki/templates/wiki/tabs/history_view.html:9

 msgid "Mark for publishing"
 msgstr "Oznacz do publikacji"
 
 msgid "Mark for publishing"
 msgstr "Oznacz do publikacji"
 

-#: templates/wiki/tabs/history_view.html:12
+#: wiki/templates/wiki/tabs/history_view.html:12

 msgid "Revert document"
 msgstr "Przywróć wersję"
 
 msgid "Revert document"
 msgstr "Przywróć wersję"
 

-#: templates/wiki/tabs/history_view.html:15
+#: wiki/templates/wiki/tabs/history_view.html:15

 msgid "View version"
 msgstr "Zobacz wersję"
 
 msgid "View version"
 msgstr "Zobacz wersję"
 

-#: templates/wiki/tabs/history_view_item.html:3
-#: templates/wiki/tabs/history_view_item.html:5
+#: wiki/templates/wiki/tabs/history_view_item.html:3
+#: wiki/templates/wiki/tabs/history_view_item.html:5

 msgid "History"
 msgstr "Historia"
 
 msgid "History"
 msgstr "Historia"
 

-#: templates/wiki/tabs/properties_view_item.html:3
+#: wiki/templates/wiki/tabs/properties_view_item.html:3

 msgid "Properties"
 msgstr "Właściwości"
 
 msgid "Properties"
 msgstr "Właściwości"
 

-#: templates/wiki/tabs/search_view.html:4
-#: templates/wiki/tabs/search_view.html:8
+#: wiki/templates/wiki/tabs/search_view.html:4
+#: wiki/templates/wiki/tabs/search_view.html:8

 msgid "Search"
 msgstr "Szukaj"
 
 msgid "Search"
 msgstr "Szukaj"
 

-#: templates/wiki/tabs/search_view.html:11
+#: wiki/templates/wiki/tabs/search_view.html:12

 msgid "Replace with"
 msgstr "Zamień na"
 
 msgid "Replace with"
 msgstr "Zamień na"
 

-#: templates/wiki/tabs/search_view.html:15
+#: wiki/templates/wiki/tabs/search_view.html:16

 msgid "Replace"
 msgstr "Zamień"
 
 msgid "Replace"
 msgstr "Zamień"
 

-#: templates/wiki/tabs/search_view.html:19
+#: wiki/templates/wiki/tabs/search_view.html:20

 msgid "Replace all"
 msgstr "Zamień wszystko"
 
 msgid "Replace all"
 msgstr "Zamień wszystko"
 

-#: templates/wiki/tabs/search_view.html:21
+#: wiki/templates/wiki/tabs/search_view.html:22

 msgid "Options"
 msgstr "Opcje"
 
 msgid "Options"
 msgstr "Opcje"
 

-#: templates/wiki/tabs/search_view.html:24
+#: wiki/templates/wiki/tabs/search_view.html:25

 msgid "Case sensitive"
 msgstr "Rozróżniaj wielkość liter"
 
 msgid "Case sensitive"
 msgstr "Rozróżniaj wielkość liter"
 

-#: templates/wiki/tabs/search_view.html:28
+#: wiki/templates/wiki/tabs/search_view.html:29

 msgid "From cursor"
 msgstr "Zacznij od kursora"
 
 msgid "From cursor"
 msgstr "Zacznij od kursora"
 

-#: templates/wiki/tabs/search_view_item.html:4
+#: wiki/templates/wiki/tabs/search_view_item.html:4

 msgid "Search and replace"
 msgstr "Znajdź i zamień"
 
 msgid "Search and replace"
 msgstr "Znajdź i zamień"
 

-#: templates/wiki/tabs/source_editor_item.html:5
-#: templates/wiki/tabs/source_editor_item.html:7
+#: wiki/templates/wiki/tabs/source_editor_item.html:5
+#: wiki/templates/wiki/tabs/source_editor_item.html:7

 msgid "Source code"
 msgstr "Kod źródłowy"
 
 msgid "Source code"
 msgstr "Kod źródłowy"
 

-#: templates/wiki/tabs/summary_view.html:11
+#: wiki/templates/wiki/tabs/summary_view.html:11

 msgid "Refresh from working copy"
 msgstr "Odśwież z edytowanej wersji"
 
 msgid "Refresh from working copy"
 msgstr "Odśwież z edytowanej wersji"
 

-#: templates/wiki/tabs/summary_view.html:15
+#: wiki/templates/wiki/tabs/summary_view.html:15

 msgid "Title"
 msgstr "Tytuł"
 
 msgid "Title"
 msgstr "Tytuł"
 

-#: templates/wiki/tabs/summary_view.html:19
+#: wiki/templates/wiki/tabs/summary_view.html:19

 msgid "Go to the book's page"
 msgstr "Przejdź do strony książki"
 
 msgid "Go to the book's page"
 msgstr "Przejdź do strony książki"
 

-#: templates/wiki/tabs/summary_view.html:22
+#: wiki/templates/wiki/tabs/summary_view.html:22

 msgid "Document ID"
 msgstr "ID dokumentu"
 
 msgid "Document ID"
 msgstr "ID dokumentu"
 

-#: templates/wiki/tabs/summary_view.html:26
+#: wiki/templates/wiki/tabs/summary_view.html:26

 msgid "Current version"
 msgstr "Aktualna wersja"
 
 msgid "Current version"
 msgstr "Aktualna wersja"
 

-#: templates/wiki/tabs/summary_view.html:30
+#: wiki/templates/wiki/tabs/summary_view.html:30

 msgid "Last edited by"
 msgstr "Ostatnio edytowane przez"
 
 msgid "Last edited by"
 msgstr "Ostatnio edytowane przez"
 

-#: templates/wiki/tabs/summary_view.html:34
+#: wiki/templates/wiki/tabs/summary_view.html:34

 msgid "Link to gallery"
 msgstr "Link do galerii"
 
 msgid "Link to gallery"
 msgstr "Link do galerii"
 

-#: templates/wiki/tabs/summary_view.html:39
+#: wiki/templates/wiki/tabs/summary_view.html:39

 msgid "Characters in document"
 msgstr "Znaków w dokumencie"
 
 msgid "Characters in document"
 msgstr "Znaków w dokumencie"
 

-#: templates/wiki/tabs/summary_view.html:41
-#: templates/wiki/tabs/summary_view.html:42
-#: templates/wiki/tabs/summary_view.html:45
+#: wiki/templates/wiki/tabs/summary_view.html:41
+#: wiki/templates/wiki/tabs/summary_view.html:42
+#: wiki/templates/wiki/tabs/summary_view.html:45

 msgid "pages"
 msgstr "stron maszynopisu"
 
 msgid "pages"
 msgstr "stron maszynopisu"
 

-#: templates/wiki/tabs/summary_view.html:41
+#: wiki/templates/wiki/tabs/summary_view.html:41

 msgid "without footnotes and themes"
 msgstr "bez przypisów i motywów"
 
 msgid "without footnotes and themes"
 msgstr "bez przypisów i motywów"
 

-#: templates/wiki/tabs/summary_view.html:42
+#: wiki/templates/wiki/tabs/summary_view.html:42

 msgid "with footnotes and themes"
 msgstr "z przypisami i motywami"
 
 msgid "with footnotes and themes"
 msgstr "z przypisami i motywami"
 

-#: templates/wiki/tabs/summary_view.html:45
+#: wiki/templates/wiki/tabs/summary_view.html:45

 msgid "untagged"
 msgstr "nieotagowane"
 
 msgid "untagged"
 msgstr "nieotagowane"
 

-#: templates/wiki/tabs/summary_view_item.html:3
-#: templates/wiki/tabs/summary_view_item.html:5
+#: wiki/templates/wiki/tabs/summary_view_item.html:3
+#: wiki/templates/wiki/tabs/summary_view_item.html:5

 msgid "Summary"
 msgstr "Podsumowanie"
 
 msgid "Summary"
 msgstr "Podsumowanie"
 

-#: templates/wiki/tabs/wysiwyg_editor.html:7
+#: wiki/templates/wiki/tabs/wysiwyg_editor.html:7

 msgid "Insert theme"
 msgstr "Wstaw motyw"
 
 msgid "Insert theme"
 msgstr "Wstaw motyw"
 

-#: templates/wiki/tabs/wysiwyg_editor.html:10
+#: wiki/templates/wiki/tabs/wysiwyg_editor.html:10

 msgid "Insert annotation"
 msgstr "Wstaw przypis"
 
 msgid "Insert annotation"
 msgstr "Wstaw przypis"
 

-#: templates/wiki/tabs/wysiwyg_editor.html:13
+#: wiki/templates/wiki/tabs/wysiwyg_editor.html:13

 msgid "Insert reference"
 msgstr "Wstaw referencję"
 
 msgid "Insert reference"
 msgstr "Wstaw referencję"
 

-#: templates/wiki/tabs/wysiwyg_editor_item.html:3
-#: templates/wiki/tabs/wysiwyg_editor_item.html:5
+#: wiki/templates/wiki/tabs/wysiwyg_editor_item.html:3
+#: wiki/templates/wiki/tabs/wysiwyg_editor_item.html:5

 msgid "Visual editor"
 msgstr "Edytor wizualny"
 
 msgid "Visual editor"
 msgstr "Edytor wizualny"
 

-#: views.py:286
+#: wiki/views.py:305

 msgid "Published"
 msgstr "Opublikowano"
 
 msgid "Published"
 msgstr "Opublikowano"
 

-#: views.py:307
+#: wiki/views.py:326

 msgid "Revision marked"
 msgstr "Wersja oznaczona"
 
 msgid "Revision marked"
 msgstr "Wersja oznaczona"
 

-#: views.py:309
+#: wiki/views.py:328

 msgid "Nothing changed"
 msgstr "Nic nie uległo zmianie"
 
 msgid "Nothing changed"
 msgstr "Nic nie uległo zmianie"
 

diff --git a/src/wiki/templates/wiki/document_details.html b/src/wiki/templates/wiki/document_details.html
index f3efc62..b331e18 100644 (file)
--- a/src/wiki/templates/wiki/document_details.html
+++ b/src/wiki/templates/wiki/document_details.html
@@ -15,17 +15,17 @@
 {% endblock %}
 
 {% block tabs-menu %}
 {% endblock %}
 
 {% block tabs-menu %}

-    {% include "wiki/tabs/summary_view_item.html" %}
-    {% include "wiki/tabs/wysiwyg_editor_item.html" %}
-    {% include "wiki/tabs/source_editor_item.html" %}
-    {% include "wiki/tabs/history_view_item.html" %}
+  {% include "wiki/tabs/summary_view_item.html" %}
+  {% include "wiki/tabs/wysiwyg_editor_item.html" %}
+  {% include "wiki/tabs/source_editor_item.html" %}
+  {% include "wiki/tabs/history_view_item.html" %}

 {% endblock %}
 
 {% block tabs-content %}
 {% endblock %}
 
 {% block tabs-content %}

-    {% include "wiki/tabs/summary_view.html" %}
-    {% include "wiki/tabs/wysiwyg_editor.html" %}
-    {% include "wiki/tabs/source_editor.html" %}
-    {% include "wiki/tabs/history_view.html" %}
+  {% include "wiki/tabs/summary_view.html" %}
+  {% include "wiki/tabs/wysiwyg_editor.html" %}
+  {% include "wiki/tabs/source_editor.html" %}
+  {% include "wiki/tabs/history_view.html" %}

 {% endblock %}
 
 {% block tabs-right %}
 {% endblock %}
 
 {% block tabs-right %}


@@ -36,21 +36,22 @@
 {% endblock %}
 
 {% block splitter-extra %}
 {% endblock %}
 
 {% block splitter-extra %}

-<div id="vsplitbar" class="vsplitbar" title="{% trans "Click to open/close gallery" %}">
+  <div id="vsplitbar" class="vsplitbar" title="{% trans "Click to open/close gallery" %}">

     <p class="vsplitbar-title"></p>
     <p class="vsplitbar-title"></p>

-    </div>
-    <div id="sidebar">
-      {% include "wiki/tabs/gallery_view.html" %}
-      {% include "wiki/tabs/annotations_view.html" %}
-      {% include "wiki/tabs/properties_view.html" %}
-      {% include "wiki/tabs/search_view.html" %}
-    </div>
-    <div id="drag-layer"></div>
+  </div>
+  <div id="sidebar">
+    {% include "wiki/tabs/gallery_view.html" %}
+    {% include "wiki/tabs/annotations_view.html" %}
+    {% include "wiki/tabs/properties_view.html" %}
+    {% include "wiki/tabs/search_view.html" %}
+  </div>
+  <div id="drag-layer"></div>

 {% endblock %}
 
 {% block dialogs %}
   {% include "wiki/save_dialog.html" %}
   {% include "wiki/revert_dialog.html" %}
 {% endblock %}
 
 {% block dialogs %}
   {% include "wiki/save_dialog.html" %}
   {% include "wiki/revert_dialog.html" %}

+  {% include "wiki/media_dialog.html" %}

   {% if can_pubmark %}
     {% include "wiki/pubmark_dialog.html" %}
   {% endif %}
   {% if can_pubmark %}
     {% include "wiki/pubmark_dialog.html" %}
   {% endif %}

diff --git a/src/wiki/templates/wiki/media_dialog.html b/src/wiki/templates/wiki/media_dialog.html
new file mode 100644 (file)
index 0000000..1b257f4
--- /dev/null
+++ b/src/wiki/templates/wiki/media_dialog.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+<div id="media-chooser" class="modal">
+  <div class="modal-dialog modal-lg">
+    <div " class="modal-content">
+      <div class="modal-body">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="ctrl-ok btn btn-primary">{% translate "Choose" %}</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal">{% translate "Cancel" %}</button>
+      </div>
+    </div>
+  </div>
+</div>

diff --git a/src/wiki/views.py b/src/wiki/views.py
index 543a473..0b9cbc1 100644 (file)
--- a/src/wiki/views.py
+++ b/src/wiki/views.py
@@ -18,6 +18,7 @@ from django.utils.formats import localize
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_POST, require_GET
 from django.shortcuts import get_object_or_404, render
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_POST, require_GET
 from django.shortcuts import get_object_or_404, render

+from sorl.thumbnail import get_thumbnail

 
 from documents.models import Book, Chunk
 from . import nice_diff
 
 from documents.models import Book, Chunk
 from . import nice_diff


@@ -231,14 +232,18 @@ def gallery(request, directory):
         def is_image(filename):
             return os.path.splitext(filename)[1].lower() in (u'.jpg', u'.jpeg', u'.png')
 
         def is_image(filename):
             return os.path.splitext(filename)[1].lower() in (u'.jpg', u'.jpeg', u'.png')
 

-        images = [map_to_url(f) for f in os.listdir(base_dir) if is_image(f)]
-        images.sort()
-

         books = Book.objects.filter(gallery=directory)
 
         if not all(book.public for book in books) and not request.user.is_authenticated:
             return HttpResponseForbidden("Not authorized.")
 
         books = Book.objects.filter(gallery=directory)
 
         if not all(book.public for book in books) and not request.user.is_authenticated:
             return HttpResponseForbidden("Not authorized.")
 

+        images = [
+            {
+                "url": map_to_url(f),
+                "thumb": get_thumbnail(os.path.join(base_dir, f), '120x120').url
+            } for f in sorted(os.listdir(base_dir)) if is_image(f)
+        ]
+

         return JSONResponse(images)
     except (IndexError, OSError):
         logger.exception("Unable to fetch gallery")
         return JSONResponse(images)
     except (IndexError, OSError):
         logger.exception("Unable to fetch gallery")