2 files changed, 18 insertions, 20 deletions
diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 62c55132..bac61df5 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -5,41 +5,33 @@
   var csrf = "<?= $csrf ?>";
   $("#doc3").ready(function() {
     organize_dialog_init();
-    $("#gMicroThumbContainer").scroll(function() {
-      get_more_data();
-    });
   });
 </script>
 <fieldset style="display: none">
   <legend><?= t("Organize %name", array("name" => $item->title)) ?></legend>
 </fieldset>
 <div id="doc3" class="yui-t1">
-  <div id="hd" ref="<?= url::site("organize/header/__ITEM_ID__") ?>">
-    <h2 id="gOrganizeAlbumTitle"><?= $item->title ?></h2>
-    <p id="gOrganizeAlbumDescription"><?= $item->description ?></p>
-  </div>
-
   <div id="bd" role="main">
     <div id="yui-main">
       <div class="yui-b">
-        <div class="yui-ge">
-          <div id="gMicroThumbContainer" class="yui-u first"
-               ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&offset=__OFFSET__") ?>">
+        <a id="gMicroThumbSelectAll" href="#"><?= t("select all") ?></a>
+        <a id="gMicroThumbUnselectAll" href="#" style="display: none"><?= t("unselect all") ?></a>
+        <div id="gMicroThumbContainer" class="yui-u first"
+             ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&offset=__OFFSET__") ?>">
             <ul id="gMicroThumbGrid">
             </ul>
-          </div>
-          <div id="gOrganizeEditContainer"  class="yui-u">
-            <?= $edit_form ?>
-          </div>
         </div>
+          <!-- div id="gOrganizeEditContainer"  class="yui-u">
+            < ?= $edit_form ? >
+          </div -->
       </div>
     </div>
     <div id="gOrganizeTreeContainer" class="yui-b">
+      <h3><?= t("Albums") ?></h3>
       <?= $album_tree ?>
     </div>
   </div>
-
-  <div id="ft">
+  <!-- div id="ft">
     <div class="gProgressBar" style="visibility: hidden"></div>
-  </div>
+  </div -->
 </div>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 1cbc4241..1f63f034 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -7,8 +7,14 @@
 <? if ($child->is_album()): ?>
   <? $item_class = "gAlbum"; ?>
 <? endif ?>
-<li id="gMicroThumb-<?= $child->id ?>" class="gMicroThumb <?= $item_class ?>">
-  <?= $child->micro_thumb_tag(array("class" => "gThumbnail"), $thumbsize) ?>
+<li>
+  <div>
+  <div class="gOrganizeReorderDropTarget" ref="<?= $child->id ?>">&nbsp;
+  </div>
+  <div id="gMicroThumb-<?= $child->id ?>" class="gMicroThumb <?= $item_class ?>">
+    <?= $child->thumb_tag(array("class" => "gThumbnail"), $thumbsize, true) ?>
+  </div>
+    </div>
 </li>
 <? endforeach ?>