From 92e49288fda5de1a079578f10512409a796ae24e Mon Sep 17 00:00:00 2001
From: Lukasz Anwajler <lukasz@anwajler.com>
Date: Tue, 13 Jul 2010 09:34:00 -0500
Subject: [PATCH] Images count in gallery. Gallery path fix.

---
 apps/wiki/templates/wiki/tabs/gallery_view.html | 6 ++++--
 redakcja/static/js/wiki/view_gallery.js         | 5 +++--
 redakcja/static/js/wiki/wikiapi.js              | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/wiki/templates/wiki/tabs/gallery_view.html b/apps/wiki/templates/wiki/tabs/gallery_view.html
index 2daff10b..47f6af26 100644
--- a/apps/wiki/templates/wiki/tabs/gallery_view.html
+++ b/apps/wiki/templates/wiki/tabs/gallery_view.html
@@ -7,7 +7,9 @@
         <button class="previous-page">
             <img src="{{STATIC_URL}}icons/go-previous.png"
             	alt="{% trans "Previous" %}" title="{% trans "Previous" %}"/>
-        </button><input type="text" size="3" maxlength="3" value="1" class="page-number" />
+        </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">
         <button class="next-page">
             <img src="{{STATIC_URL}}icons/go-next.png"
             	alt="{% trans "Next" %}" title="{% trans "Next" %}"/>
@@ -22,4 +24,4 @@
     <div class="gallery-image">
         <img src="{{MEDIA_URL}}images/empty.png" />
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/redakcja/static/js/wiki/view_gallery.js b/redakcja/static/js/wiki/view_gallery.js
index aa39e15f..c487d462 100644
--- a/redakcja/static/js/wiki/view_gallery.js
+++ b/redakcja/static/js/wiki/view_gallery.js
@@ -65,7 +65,7 @@
                 event.preventDefault();
                 self.setPage($(this).val());
             });
-
+                    
             $('.previous-page', this.$element).click(function(){
                 self.setPage(parseInt(self.$numberInput.val(),10) - 1);
             });
@@ -139,6 +139,7 @@
 
     ScanGalleryPerspective.prototype.setPage = function(newPage){
         newPage = normalizeNumber(newPage, this.doc.galleryImages.length);
+        $('#imagesCount').val(this.doc.galleryImages.length);
         this.$numberInput.val(newPage);
 		this.config().page = newPage;
         $('.gallery-image img', this.$element).attr('src', this.doc.galleryImages[newPage - 1]);
@@ -248,4 +249,4 @@
 
     $.wiki.ScanGalleryPerspective = ScanGalleryPerspective;
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/redakcja/static/js/wiki/wikiapi.js b/redakcja/static/js/wiki/wikiapi.js
index 3ec2fdc2..ad31af3f 100644
--- a/redakcja/static/js/wiki/wikiapi.js
+++ b/redakcja/static/js/wiki/wikiapi.js
@@ -33,7 +33,7 @@
 
 		if (vname == "ajax_document_gallery") {
 
-			return base_path + "/gallery/" + arguments[1];
+			return base_path + "/" + arguments[1] + "/gallery";
 		}
 
 		if (vname == "ajax_document_diff")
-- 
2.20.1