From: Lukasz Anwajler <lukasz@anwajler.com>
Date: Thu, 5 Aug 2010 11:31:51 +0000 (-0500)
Subject: Merge branch 'master' of git@github.com:fnp/redakcja
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/74081c8b2e9a8588505c40257556e17274fc80de?ds=sidebyside;hp=-c

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

74081c8b2e9a8588505c40257556e17274fc80de
diff --combined apps/wiki/templates/wiki/tabs/gallery_view.html
index 8f18372b,7bf6584a..b4be5339
--- a/apps/wiki/templates/wiki/tabs/gallery_view.html
+++ b/apps/wiki/templates/wiki/tabs/gallery_view.html
@@@ -1,6 -1,4 +1,4 @@@
  {% load i18n %}
- <div class="vsplitbar" title="{% trans "Click to open/close gallery" %}">
- </div>
  <div id="side-gallery">
      <!-- gallery toolbar -->
      <div class="toolbar">
@@@ -9,7 -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 --combined redakcja/static/js/wiki/view_gallery.js
index 86793488,1be30bf6..ec486bc0
--- a/redakcja/static/js/wiki/view_gallery.js
+++ b/redakcja/static/js/wiki/view_gallery.js
@@@ -139,7 -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]);
@@@ -225,6 -225,8 +225,8 @@@
  
          $.wiki.Perspective.prototype.onEnter.call(this);
  
+         $('.vsplitbar').not('.active').trigger('click');
+ 
          this.doc.refreshGallery({
              success: function(doc, data){
                  self.$image.show();