Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 19 insertions, 8 deletions

diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index c80696ad..af7136fc 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,12 +1,23 @@
 <?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) ?>
+<? foreach ($album->children(25, $offset) as $child): ?>
+<li class="gOrganizeMicroThumbGridCell" ref="<?= $child->id ?>">
+  <div id="gOrganizeMicroThumb_<?= $child->id ?>"
+       class="gOrganizeMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
+    <?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
   </div>
 </li>
 <? endforeach ?>
+
+<? if ($album->children_count() > $offset): ?>
+<script>
+  setTimeout(function() {
+    $.get("<?= url::site("organize/album/$album->id/" . ($offset + 25)) ?>",
+          {},
+          function(data) {
+            $("#gOrganizeMicroThumbGrid").append(data.grid);
+            $.organize.set_handlers();
+          },
+          "json");
+  }, 50);
+</script>
+<? endif ?>