From: zuber <marek@stepniowski.com>
Date: Thu, 27 Aug 2009 11:23:15 +0000 (+0200)
Subject: Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/d8e0011bca1bdc8bcfd10ce75a33372bfad0941d?ds=inline;hp=-c

Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma
---

d8e0011bca1bdc8bcfd10ce75a33372bfad0941d
diff --combined project/templates/explorer/panels/gallery.html
index bf753d05,f0ec99bf..4f5ea910
--- a/project/templates/explorer/panels/gallery.html
+++ b/project/templates/explorer/panels/gallery.html
@@@ -1,26 -1,24 +1,24 @@@
- <div class="panel">
-     <div class="toolbar">
-         <select name="folders" class="id_folders">
-             <option value="" selected="selected">-- Wybierz folder z obrazkami --</option>
-             <option value="andersen_basnie">andersen_basnie</option>
-         </select>
-     </div>
-     <div class="images-wrap">
-         <div class="images">
-         </div>
-     </div>
+ <div class="toolbar" style="height: 24px">
+ 	<select name="folders" class="id_folders">
+ 		<option value="" selected="selected">-- Wybierz folder z obrazkami --</option>
+         <option value="andersen_basnie">andersen_basnie</option>
+ 	</select>
+ </div>
+ 
+ <div class="images-wrap" style="position: absolute; top: 24px; left:0px; right:0px; bottom: 0px;">
+ 	<div class="images"><!-- To jest div na obrazki, które są wstawiane później --></div>
  </div>
  <script type="text/javascript" charset="utf-8">
  
  panel_hooks = {
  	load: function() {
  		var contentDiv = this.contentDiv;
 -		$('.id_folders', contentDiv).change(function() 
 -		{
 -        	$('.images', contentDiv).load('{% url folder_image_ajax %}' + $('.id_folders', contentDiv).val() + '/', 
 -				function() {
 +		$('.id_folders', contentDiv).change(function() {
 +        	$('.images', contentDiv).fadeOut('slow', function() { 
 +        	    $(this).html('').load('{% url folder_image_ajax %}' + $('.id_folders', contentDiv).val() + '/',  function() {
                      $('.images-wrap', contentDiv).data('lazyload:lastCheckedScrollTop', -10000);
                  });
 +		    })
  		});
  		
  		$('.images-wrap', contentDiv).lazyload('.image-box',