From 28866d0f2520b7515f3c06e9b61bcce4f44d53b1 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 14 Jul 2023 13:20:54 +0200 Subject: [PATCH] Edit gallery easily from editor. --- src/documents/forms.py | 2 +- src/redakcja/static/js/wiki/view_gallery.js | 62 +- src/redakcja/static/js/wiki/wikiapi.js | 838 ++++++++++-------- src/wiki/templates/wiki/document_details.html | 1 + .../templates/wiki/document_details_base.html | 16 +- src/wiki/templates/wiki/gallery_dialog.html | 13 + .../templates/wiki/tabs/gallery_view.html | 11 + .../templates/wiki/tabs/summary_view.html | 17 +- src/wiki/urls.py | 3 + src/wiki/views.py | 30 + 10 files changed, 579 insertions(+), 414 deletions(-) create mode 100644 src/wiki/templates/wiki/gallery_dialog.html diff --git a/src/documents/forms.py b/src/documents/forms.py index 6598e75c..dccf0f09 100644 --- a/src/documents/forms.py +++ b/src/documents/forms.py @@ -151,7 +151,7 @@ class BookForm(forms.ModelForm): class Meta: model = Book - exclude = ['project'] + exclude = ['project', 'cover', 'legimi_id'] def __init__(self, *args, **kwargs): ret = super(BookForm, self).__init__(*args, **kwargs) diff --git a/src/redakcja/static/js/wiki/view_gallery.js b/src/redakcja/static/js/wiki/view_gallery.js index 5152f439..bb1c3d8a 100644 --- a/src/redakcja/static/js/wiki/view_gallery.js +++ b/src/redakcja/static/js/wiki/view_gallery.js @@ -91,6 +91,59 @@ self.alterZoom((-0.2)); }); + $('.ctrl-gallery-setstart', this.$element).click(function(e) { + e.preventDefault(); + CurrentDocument.setGalleryStart(self.config().page); + }); + $('.ctrl-gallery-edit', this.$element).click(function(e) { + e.preventDefault(); + CurrentDocument.openGalleryEdit(); + }); + $('.ctrl-gallery-refresh', this.$element).click(function(e) { + e.preventDefault(); + self.refreshGallery(); + }); + $('#gallery-chooser').on('show.bs.modal', function (event) { + var modal = $(this); + var datalist = modal.find('.modal-body'); + datalist.html(''); + self.doc.withGalleryList(function(galleries) { + console.log(galleries); + $.each(galleries, (i, gallery) => { + item = $('
'); + $('input', item).val(gallery); + $('label', item).append(gallery); + if (gallery == self.doc.galleryLink) { + item.addClass('text-primary') + $('input', item).prop('checked', true); + } + item.appendTo(datalist); + }); + item = $('
'); + item.appendTo(datalist); + item = $('
'); + item.appendTo(datalist); + }); + }) + $('#gallery-chooser .ctrl-ok').on('click', function (event) { + let item = $('#gallery-chooser :checked'); + let name; + if (item.hasClass('ctrl-none')) { + name = ''; + } + else if (item.hasClass('ctrl-new')) { + name = $('#gallery-chooser .ctrl-name').val(); + } else { + name = item.val(); + } + + self.doc.setGallery(name); + $('#gallery-chooser').modal('hide'); + self.refreshGallery(function() { + self.setPage(1); + }); + }); + $(window).resize(function(){ self.dimensions.galleryWidth = self.$image.parent().width(); self.dimensions.galleryHeight = self.$image.parent().height(); @@ -222,11 +275,8 @@ /* * Loading gallery */ - ScanGalleryPerspective.prototype.onEnter = function(success, failure){ - $.wiki.SidebarPerspective.prototype.onEnter.call(this); - + ScanGalleryPerspective.prototype.refreshGallery = function(success, failure) { var self = this; - this.doc.refreshGallery({ success: function(doc, data){ self.$image.show(); @@ -243,7 +293,11 @@ if(failure) failure(); } }); + } + ScanGalleryPerspective.prototype.onEnter = function(success, failure){ + $.wiki.SidebarPerspective.prototype.onEnter.call(this); + this.refreshGallery(success, failure); }; ScanGalleryPerspective.prototype.onExit = function(success, failure) { diff --git a/src/redakcja/static/js/wiki/wikiapi.js b/src/redakcja/static/js/wiki/wikiapi.js index c05c501e..426c7f62 100644 --- a/src/redakcja/static/js/wiki/wikiapi.js +++ b/src/redakcja/static/js/wiki/wikiapi.js @@ -1,218 +1,270 @@ (function($) { - $.wikiapi = {}; - var noop = function() { - }; - var noops = { - success: noop, - failure: noop - }; - /* - * Return absolute reverse path of given named view. (at least he have it - * hard-coded in one place) - * - * TODO: think of a way, not to hard-code it here ;) - * - */ - function reverse() { - var vname = arguments[0]; - var base_path = "/editor"; - - if (vname == "ajax_document_text") { - var path = "/text/" + arguments[1] + '/'; - - if (arguments[2] !== undefined) - path += arguments[2] + '/'; - - return base_path + path; - } + $.wikiapi = {}; + var noop = function() { + }; + var noops = { + success: noop, + failure: noop + }; + /* + * Return absolute reverse path of given named view. (at least he have it + * hard-coded in one place) + * + * TODO: think of a way, not to hard-code it here ;) + * + */ + function reverse() { + var vname = arguments[0]; + var base_path = "/editor"; + + if (vname == "ajax_document_text") { + var path = "/text/" + arguments[1] + '/'; + + if (arguments[2] !== undefined) + path += arguments[2] + '/'; + + return base_path + path; + } if (vname == "ajax_document_revert") { return base_path + "/revert/" + arguments[1] + '/'; } - if (vname == "ajax_document_history") { - - return base_path + "/history/" + arguments[1] + '/'; - } + if (vname == "ajax_document_history") { + return base_path + "/history/" + arguments[1] + '/'; + } - if (vname == "ajax_document_gallery") { + if (vname == "ajax_document_gallery") { + return base_path + "/gallery/" + arguments[1] + '/'; + } - return base_path + "/gallery/" + arguments[1] + '/'; - } - - if (vname == "ajax_document_diff") - return base_path + "/diff/" + arguments[1] + '/'; + if (vname == "ajax_document_diff") + return base_path + "/diff/" + arguments[1] + '/'; if (vname == "ajax_document_rev") return base_path + "/rev/" + arguments[1] + '/'; - if (vname == "ajax_document_pubmark") - return base_path + "/pubmark/" + arguments[1] + '/'; + if (vname == "ajax_document_pubmark") + return base_path + "/pubmark/" + arguments[1] + '/'; - if (vname == "ajax_cover_preview") - return "/cover/preview/"; + if (vname == "ajax_cover_preview") + return "/cover/preview/"; - console.log("Couldn't reverse match:", vname); - return "/404.html"; - }; + console.log("Couldn't reverse match:", vname); + return "/404.html"; + }; + class Api { + static csrf = $('input[name="csrfmiddlewaretoken"]').val(); + + // TODO: Add waiting marker, error reporting. + static post(url, data) { + data['csrfmiddlewaretoken'] = this.csrf; + $.ajax({ + url: url, + type: "POST", + data: data + }); + } - /* - * Document Abstraction - */ - function WikiDocument(element_id) { - var meta = $('#' + element_id); - this.id = meta.attr('data-chunk-id'); + static get(url, callback) { + $.ajax({ + url: url, + type: "GET", + success: function(data) { + callback(data); + }, + }); + } - this.revision = $("*[data-key='revision']", meta).text(); - this.readonly = !!$("*[data-key='readonly']", meta).text(); + static setGallery(id, gallery) { + this.post( + '/editor/set-gallery/' + id + '/', + {gallery: gallery} + ) + } + static setGalleryStart(id, start) { + this.post( + '/editor/set-gallery-start/' + id + '/', + {start: start} + ) + } - this.galleryLink = $("*[data-key='gallery']", meta).text(); - this.galleryStart = parseInt($("*[data-key='gallery-start']", meta).text()); - this.fullUri = $("*[data-key='full-uri']", meta).text(); + static openGalleryEdit(bookSlug) { + window.open( + '/documents/book/' + bookSlug + '/gallery/', + '_blank' + ).focus(); + } - var diff = $("*[data-key='diff']", meta).text(); - if (diff) { - diff = diff.split(','); - if (diff.length == 2 && diff[0] < diff[1]) - this.diff = diff; - else if (diff.length == 1) { - diff = parseInt(diff); - if (diff != NaN) - this.diff = [diff - 1, diff]; - } + static withGalleryList(callback) { + this.get( + '/editor/galleries/', + callback + ); } + } - this.galleryImages = []; - this.text = null; - this.has_local_changes = false; - this.active = true; - this._lock = -1; - this._context_lock = -1; - this._lock_count = 0; - }; - - WikiDocument.prototype.triggerDocumentChanged = function() { - $(document).trigger('wlapi_document_changed', this); - }; - /* - * Fetch text of this document. - */ - WikiDocument.prototype.fetch = function(params) { - params = $.extend({}, noops, params); - var self = this; - $.ajax({ - method: "GET", - url: reverse("ajax_document_text", self.id), - data: {"revision": self.revision}, - dataType: 'json', - success: function(data) { - var changed = false; - - if (self.text === null || self.revision !== data.revision) { - self.text = data.text; - self.revision = data.revision; - self.gallery = data.gallery; - changed = true; - self.triggerDocumentChanged(); - }; - - self.has_local_changes = false; - params['success'](self, changed); - }, - error: function() { - params['failure'](self, "Nie udało się wczytać treści dokumentu."); - } - }); - }; /* - * Fetch history of this document. - * + * Document Abstraction */ - WikiDocument.prototype.fetchHistory = function(params) { - /* this doesn't modify anything, so no locks */ - params = $.extend({}, noops, params); - var self = this; - $.ajax({ - method: "GET", - url: reverse("ajax_document_history", self.id) + "?before=" + params.before, - dataType: 'json', - success: function(data) { - params['success'](self, data); - }, - error: function() { - params['failure'](self, "Nie udało się wczytać historii dokumentu."); - } - }); - }; - WikiDocument.prototype.fetchDiff = function(params) { - /* this doesn't modify anything, so no locks */ - var self = this; - params = $.extend({ - 'from': self.revision, - 'to': self.revision - }, noops, params); - $.ajax({ - method: "GET", - url: reverse("ajax_document_diff", self.id), - dataType: 'html', - data: { - "from": params['from'], - "to": params['to'] - }, - success: function(data) { - params['success'](self, data); - }, - error: function() { - params['failure'](self, "Nie udało się wczytać porównania wersji."); - } - }); - }; - - WikiDocument.prototype.checkRevision = function(params) { - /* this doesn't modify anything, so no locks */ - var self = this; - let active = self.active; - self.active = false; - $.ajax({ - method: "GET", - url: reverse("ajax_document_rev", self.id), - data: { - 'a': active, - }, - dataType: 'text', - success: function(data) { - if (data == '') { - if (params.error) - params.error(); + class WikiDocument { + constructor(element_id) { + var meta = $('#' + element_id); + this.id = meta.attr('data-chunk-id'); + + this.revision = $("*[data-key='revision']", meta).text(); + this.readonly = !!$("*[data-key='readonly']", meta).text(); + + this.bookSlug = $("*[data-key='book-slug']", meta).text(); + this.galleryLink = $("*[data-key='gallery']", meta).text(); + this.galleryStart = parseInt($("*[data-key='gallery-start']", meta).text()); + this.fullUri = $("*[data-key='full-uri']", meta).text(); + + var diff = $("*[data-key='diff']", meta).text(); + if (diff) { + diff = diff.split(','); + if (diff.length == 2 && diff[0] < diff[1]) + this.diff = diff; + else if (diff.length == 1) { + diff = parseInt(diff); + if (diff != NaN) + this.diff = [diff - 1, diff]; } - else if (data != self.revision) - params.outdated(); } - }); - }; - /* - * Fetch gallery - */ - WikiDocument.prototype.refreshGallery = function(params) { - params = $.extend({}, noops, params); - var self = this; - if (!self.galleryLink) { - params['failure'](self, 'Brak galerii.'); - return; - } - $.ajax({ - method: "GET", - url: reverse("ajax_document_gallery", self.galleryLink), - dataType: 'json', - // data: {}, - success: function(data) { - self.galleryImages = data; - params['success'](self, data); - }, - error: function(xhr) { - switch (xhr.status) { + this.galleryImages = []; + this.text = null; + this.has_local_changes = false; + this.active = true; + this._lock = -1; + this._context_lock = -1; + this._lock_count = 0; + }; + + triggerDocumentChanged() { + $(document).trigger('wlapi_document_changed', this); + } + + /* + * Fetch text of this document. + */ + fetch(params) { + params = $.extend({}, noops, params); + var self = this; + $.ajax({ + method: "GET", + url: reverse("ajax_document_text", self.id), + data: {"revision": self.revision}, + dataType: 'json', + success: function(data) { + var changed = false; + + if (self.text === null || self.revision !== data.revision) { + self.text = data.text; + self.revision = data.revision; + self.gallery = data.gallery; + changed = true; + self.triggerDocumentChanged(); + }; + + self.has_local_changes = false; + params['success'](self, changed); + }, + error: function() { + params['failure'](self, "Nie udało się wczytać treści dokumentu."); + } + }); + } + + /* + * Fetch history of this document. + */ + fetchHistory(params) { + /* this doesn't modify anything, so no locks */ + params = $.extend({}, noops, params); + var self = this; + $.ajax({ + method: "GET", + url: reverse("ajax_document_history", self.id) + "?before=" + params.before, + dataType: 'json', + success: function(data) { + params['success'](self, data); + }, + error: function() { + params['failure'](self, "Nie udało się wczytać historii dokumentu."); + } + }); + } + + fetchDiff(params) { + /* this doesn't modify anything, so no locks */ + var self = this; + params = $.extend({ + 'from': self.revision, + 'to': self.revision + }, noops, params); + $.ajax({ + method: "GET", + url: reverse("ajax_document_diff", self.id), + dataType: 'html', + data: { + "from": params['from'], + "to": params['to'] + }, + success: function(data) { + params['success'](self, data); + }, + error: function() { + params['failure'](self, "Nie udało się wczytać porównania wersji."); + } + }); + } + + checkRevision(params) { + /* this doesn't modify anything, so no locks */ + var self = this; + let active = self.active; + self.active = false; + $.ajax({ + method: "GET", + url: reverse("ajax_document_rev", self.id), + data: { + 'a': active, + }, + dataType: 'text', + success: function(data) { + if (data == '') { + if (params.error) + params.error(); + } + else if (data != self.revision) + params.outdated(); + } + }); + } + + /* + * Fetch gallery + */ + refreshGallery(params) { + params = $.extend({}, noops, params); + var self = this; + if (!self.galleryLink) { + params['failure'](self, 'Brak galerii.'); + return; + } + $.ajax({ + method: "GET", + url: reverse("ajax_document_gallery", self.galleryLink), + dataType: 'json', + // data: {}, + success: function(data) { + self.galleryImages = data; + params['success'](self, data); + }, + error: function(xhr) { + switch (xhr.status) { case 403: var msg = 'Galerie dostępne tylko dla zalogowanych użytkowników.'; break; @@ -220,218 +272,232 @@ var msg = "Nie znaleziono galerii o nazwie: '" + self.galleryLink + "'."; default: var msg = "Nie udało się wczytać galerii o nazwie: '" + self.galleryLink + "'."; - } - self.galleryImages = []; - params['failure'](self, msg); - } - }); - }; - - /* - * Set document's text - */ - WikiDocument.prototype.setText = function(text, setter) { - if (text == this.text) return; - - this.text = text; - this.has_local_changes = true; - - }; - - - /* - * Save text back to the server - */ - WikiDocument.prototype.save = function(params) { - params = $.extend({}, noops, params); - var self = this; - - if (!self.has_local_changes) { - console.log("Abort: no changes."); - return params['success'](self, false, "Nie ma zmian do zapisania."); - }; - - // Serialize form to dictionary - var data = {}; - $.each(params['form'].serializeArray(), function() { - data[this.name] = this.value; - }); - - data['textsave-text'] = self.text; - - $.ajax({ - url: reverse("ajax_document_text", self.id), - type: "POST", - dataType: "json", - data: data, - success: function(data) { - var changed = false; - - $('#header').removeClass('saving'); - - if (data.text) { - self.text = data.text; - self.revision = data.revision; - self.gallery = data.gallery; - changed = true; - self.triggerDocumentChanged(); - }; - - params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna")); - }, - error: function(xhr) { - if ($('#header').hasClass('saving')) { - $('#header').removeClass('saving'); - $.blockUI({ - message: "

Nie udało się zapisać zmian.

" - }) - } - else { - try { - params['failure'](self, $.parseJSON(xhr.responseText)); } - catch (e) { - params['failure'](self, { - "__message": "

Nie udało się zapisać - błąd serwera.

" - }); - }; - } + self.galleryImages = []; + params['failure'](self, msg); + } + }); + } - } - }); + setGallery(gallery) { + this.galleryLink = gallery; + Api.setGallery(this.id, gallery); + } - $('#save-hide').click(function(){ - $('#header').addClass('saving'); - $.unblockUI(); - $.wiki.blocking.unblock(); - }); - }; /* end of save() */ + setGalleryStart(start) { + this.galleryStart = start; + Api.setGalleryStart(this.id, start); + } - WikiDocument.prototype.revertToVersion = function(params) { - var self = this; - params = $.extend({}, noops, params); + openGalleryEdit(start) { + Api.openGalleryEdit(this.bookSlug); + } - if (params.revision >= this.revision) { - params.failure(self, 'Proszę wybrać rewizję starszą niż aktualna.'); - return; + withGalleryList(callback) { + Api.withGalleryList(callback); + } + + /* + * Set document's text + */ + setText(text) { + if (text == this.text) return; + this.text = text; + this.has_local_changes = true; } - // Serialize form to dictionary - var data = {}; - $.each(params['form'].serializeArray(), function() { - data[this.name] = this.value; - }); - - $.ajax({ - url: reverse("ajax_document_revert", self.id), - type: "POST", - dataType: "json", - data: data, - success: function(data) { - if (data.text) { - self.text = data.text; - self.revision = data.revision; - self.gallery = data.gallery; - self.triggerDocumentChanged(); - - params.success(self, "Udało się przywrócić wersję :)"); - } - else { - params.failure(self, "Przywracana wersja identyczna z aktualną. Anulowano przywracanie."); - } - }, - error: function(xhr) { - params.failure(self, "Nie udało się przywrócić wersji - błąd serwera."); - } - }); - }; + /* + * Save text back to the server + */ + save(params) { + params = $.extend({}, noops, params); + var self = this; + + if (!self.has_local_changes) { + console.log("Abort: no changes."); + return params['success'](self, false, "Nie ma zmian do zapisania."); + }; + + // Serialize form to dictionary + var data = {}; + $.each(params['form'].serializeArray(), function() { + data[this.name] = this.value; + }); + + data['textsave-text'] = self.text; + + $.ajax({ + url: reverse("ajax_document_text", self.id), + type: "POST", + dataType: "json", + data: data, + success: function(data) { + var changed = false; - WikiDocument.prototype.pubmark = function(params) { - params = $.extend({}, noops, params); - var self = this; - var data = { - "pubmark-id": self.id, - }; - - /* unpack form */ - $.each(params.form.serializeArray(), function() { - data[this.name] = this.value; - }); - - $.ajax({ - url: reverse("ajax_document_pubmark", self.id), - type: "POST", - dataType: "json", - data: data, - success: function(data) { - params.success(self, data.message); - }, - error: function(xhr) { - if (xhr.status == 403 || xhr.status == 401) { - params.failure(self, { - "__all__": ["Nie masz uprawnień lub nie jesteś zalogowany."] - }); - } - else { - try { - params.failure(self, $.parseJSON(xhr.responseText)); - } - catch (e) { - params.failure(self, { - "__all__": ["Nie udało się - błąd serwera."] - }); - }; - }; - } - }); - }; - - WikiDocument.prototype.refreshCover = function(params) { - var self = this; - var data = { - xml: self.text // TODO: send just DC - }; - $.ajax({ - url: reverse("ajax_cover_preview"), - type: "POST", - data: data, - success: function(data) { - params.success(data); - }, - error: function(xhr) { - // params.failure("Nie udało się odświeżyć okładki - błąd serwera."); + $('#header').removeClass('saving'); + + if (data.text) { + self.text = data.text; + self.revision = data.revision; + self.gallery = data.gallery; + changed = true; + self.triggerDocumentChanged(); + }; + + params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna")); + }, + error: function(xhr) { + if ($('#header').hasClass('saving')) { + $('#header').removeClass('saving'); + $.blockUI({ + message: "

Nie udało się zapisać zmian.

" + }) + } + else { + try { + params['failure'](self, $.parseJSON(xhr.responseText)); + } + catch (e) { + params['failure'](self, { + "__message": "

Nie udało się zapisać - błąd serwera.

" + }); + }; + } + } + }); + + $('#save-hide').click(function(){ + $('#header').addClass('saving'); + $.unblockUI(); + $.wiki.blocking.unblock(); + }); + } /* end of save() */ + + revertToVersion(params) { + var self = this; + params = $.extend({}, noops, params); + + if (params.revision >= this.revision) { + params.failure(self, 'Proszę wybrać rewizję starszą niż aktualna.'); + return; } - }); - }; + // Serialize form to dictionary + var data = {}; + $.each(params['form'].serializeArray(), function() { + data[this.name] = this.value; + }); + + $.ajax({ + url: reverse("ajax_document_revert", self.id), + type: "POST", + dataType: "json", + data: data, + success: function(data) { + if (data.text) { + self.text = data.text; + self.revision = data.revision; + self.gallery = data.gallery; + self.triggerDocumentChanged(); + + params.success(self, "Udało się przywrócić wersję :)"); + } + else { + params.failure(self, "Przywracana wersja identyczna z aktualną. Anulowano przywracanie."); + } + }, + error: function(xhr) { + params.failure(self, "Nie udało się przywrócić wersji - błąd serwera."); + } + }); + } - WikiDocument.prototype.getLength = function(params) { - params = $.extend({}, noops, params); - var xml = this.text.replace(/\/(\s+)/g, '
$1'); - var parser = new DOMParser(); - var doc = parser.parseFromString(xml, 'text/xml'); - var error = $('parsererror', doc); + pubmark(params) { + params = $.extend({}, noops, params); + var self = this; + var data = { + "pubmark-id": self.id, + }; + + /* unpack form */ + $.each(params.form.serializeArray(), function() { + data[this.name] = this.value; + }); + + $.ajax({ + url: reverse("ajax_document_pubmark", self.id), + type: "POST", + dataType: "json", + data: data, + success: function(data) { + params.success(self, data.message); + }, + error: function(xhr) { + if (xhr.status == 403 || xhr.status == 401) { + params.failure(self, { + "__all__": ["Nie masz uprawnień lub nie jesteś zalogowany."] + }); + } + else { + try { + params.failure(self, $.parseJSON(xhr.responseText)); + } + catch (e) { + params.failure(self, { + "__all__": ["Nie udało się - błąd serwera."] + }); + }; + }; + } + }); + } - if (error.length > 0) { - throw "Not an XML document."; + refreshCover(params) { + var self = this; + var data = { + xml: self.text // TODO: send just DC + }; + $.ajax({ + url: reverse("ajax_cover_preview"), + type: "POST", + data: data, + success: function(data) { + params.success(data); + }, + error: function(xhr) { + // params.failure("Nie udało się odświeżyć okładki - błąd serwera."); + } + }); } - $.xmlns["rdf"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - $('rdf|RDF', doc).remove(); - if (params.noFootnotes) { - $('pa, pe, pr, pt', doc).remove(); + + getLength(params) { + params = $.extend({}, noops, params); + var xml = this.text.replace(/\/(\s+)/g, '
$1'); + var parser = new DOMParser(); + var doc = parser.parseFromString(xml, 'text/xml'); + var error = $('parsererror', doc); + + if (error.length > 0) { + throw "Not an XML document."; + } + $.xmlns["rdf"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + $('rdf|RDF', doc).remove(); + if (params.noFootnotes) { + $('pa, pe, pr, pt', doc).remove(); + } + if (params.noThemes) { + $('motyw', doc).remove(); + } + var text = $(doc).text(); + text = $.trim(text.replace(/\s{2,}/g, ' ')); + return text.length; } - if (params.noThemes) { - $('motyw', doc).remove(); + + /* Temporary workaround for relative images. */ + getBase() { + return '/media/dynamic/images/' + this.galleryLink + '/'; } - var text = $(doc).text(); - text = $.trim(text.replace(/\s{2,}/g, ' ')); - return text.length; } - /* Temporary workaround for relative images. */ - WikiDocument.prototype.getBase = function() { - return '/media/dynamic/images/' + this.galleryLink + '/'; - }; - - $.wikiapi.WikiDocument = WikiDocument; + $.wikiapi.WikiDocument = WikiDocument; })(jQuery); diff --git a/src/wiki/templates/wiki/document_details.html b/src/wiki/templates/wiki/document_details.html index b331e184..a4cbe4a9 100644 --- a/src/wiki/templates/wiki/document_details.html +++ b/src/wiki/templates/wiki/document_details.html @@ -52,6 +52,7 @@ {% include "wiki/save_dialog.html" %} {% include "wiki/revert_dialog.html" %} {% include "wiki/media_dialog.html" %} + {% include "wiki/gallery_dialog.html" %} {% if can_pubmark %} {% include "wiki/pubmark_dialog.html" %} {% endif %} diff --git a/src/wiki/templates/wiki/document_details_base.html b/src/wiki/templates/wiki/document_details_base.html index 6110fb8c..3bc94e41 100644 --- a/src/wiki/templates/wiki/document_details_base.html +++ b/src/wiki/templates/wiki/document_details_base.html @@ -15,16 +15,17 @@ var STATIC_URL = '{{STATIC_URL}}'; {% javascript 'detail' %} - + {% endblock %} {% block maincontent %}