Merge branch 'master' of git@github.com:fnp/redakcja

diff --git a/apps/wiki/templates/wiki/tabs/gallery_view.html b/apps/wiki/templates/wiki/tabs/gallery_view.html
index 7bf6584..b4be533 100644 (file)
--- a/apps/wiki/templates/wiki/tabs/gallery_view.html
+++ b/apps/wiki/templates/wiki/tabs/gallery_view.html
@@ -7,7 +7,7 @@
                alt="{% trans "Previous" %}" title="{% trans "Previous" %}"/>
         </button>
         <input type="text" size="3" maxlength="3" value="0" class="page-number" />
-        <input type="text" id="imagesCount" disabled="disabled" value="0" maxlength="3" size="3">
+        <span id="imagesCount" id="">/1</span>
         <button class="next-page">
             <img src="{{STATIC_URL}}icons/go-next.png"
                alt="{% trans "Next" %}" title="{% trans "Next" %}"/>

diff --git a/redakcja/static/js/wiki/view_gallery.js b/redakcja/static/js/wiki/view_gallery.js
index 1be30bf..ec486bc 100644 (file)
--- a/redakcja/static/js/wiki/view_gallery.js
+++ b/redakcja/static/js/wiki/view_gallery.js
@@ -139,7 +139,7 @@
 
     ScanGalleryPerspective.prototype.setPage = function(newPage){
         newPage = normalizeNumber(newPage, this.doc.galleryImages.length);
-        $('#imagesCount').val(this.doc.galleryImages.length);
+        $('#imagesCount').html("/"+this.doc.galleryImages.length);
         this.$numberInput.val(newPage);
                this.config().page = newPage;
         $('.gallery-image img', this.$element).attr('src', this.doc.galleryImages[newPage - 1]);