Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch

1 files changed, 19 insertions, 9 deletions

diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index c80696ad..671e0ce4 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,12 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($children as $i => $child): ?>
-<? $item_class = "gPhoto"; ?>
-<? if ($child->is_album()): ?>
-  <? $item_class = "gAlbum"; ?>
-<? endif ?>
-<li id="thumb_<?= $child->id ?>" class="gMicroThumbContainer" ref="<?= $child->id ?>">
-  <div id="gMicroThumb-<?= $child->id ?>" class="gMicroThumb <?= $item_class ?>">
-    <?= $child->thumb_img(array("class" => "gThumbnail"), $thumbsize, true) ?>
-  </div>
+<? foreach ($item->children(25, $offset) as $child): ?>
+<li class="gMicroThumbGridCell" ref="<?= $child->id ?>">
+<div id="gMicroThumb_<?= $child->id ?>"
+    class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
+  <?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
+</div>
 </li>
 <? endforeach ?>
+
+<? if ($item->children_count() > $offset): ?>
+<script>
+  setTimeout(function() {
+    $.get("<?= url::site("organize/content/$item->id/" . ($offset + 25)) ?>",
+      function(data) {
+        $("#gMicroThumbGrid").append(data);
+        $.organize.set_handlers();
+      }
+    );
+  }, 50);
+</script>
+<? endif ?>