Tighten up the code by loading all the albums in the tree at once, removing

the events to populate the button bar.

3 files changed, 13 insertions, 18 deletions

diff --git a/modules/organize/views/organize_button_pane.html.php b/modules/organize/views/organize_button_pane.html.php
deleted file mode 100644
index 8eced107..00000000
--- a/modules/organize/views/organize_button_pane.html.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gOrganizeEditHandleButtonsRight">
-  <a id="gMicroThumbDone" href="#" ref="done"
-     class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
-</div>
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 1e6646e4..4f10297e 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="gOrganize">
-  <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($item->title))) ?></h1>
+  <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
       <div class="yui-u first">
@@ -12,7 +12,7 @@
     </div>
     <div class="yui-gf">
       <div id="gOrganizeTreeContainer" class="yui-u first">
-        <ul id="gOrganizeAlbumTree" ref="<?= url::site("organize/children/__ITEM_ID__") ?>">
+        <ul id="gOrganizeAlbumTree">
           <?= $album_tree ?>
         </ul>
       </div>
@@ -27,7 +27,10 @@
           <div id="gOrganizeEditDrawerPanel" class="yui-gf">
           </div>
           <div id="gOrganizeEditDrawerHandle">
-            <?= $button_pane ?>
+            <div id="gOrganizeEditHandleButtonsRight">
+              <a id="gMicroThumbDone" href="#" ref="done"
+                 class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
+            </div>
           </div>
         </div>
       </div>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index d64410d8..280bdc5f 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -8,15 +8,12 @@
     </span>
     <?= p::clean($album->title) ?>
   </div>
-  <? if (empty($children)): ?>
-    <div id="gOrganizeChildren-<?= $album->id ?>"></div>
-  <? else: ?>
-    <ul id="gOrganizeChildren-<?= $album->id ?>"
-       class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-      <? foreach ($children as $child): ?>
-        <?= $child ?>
-      <? endforeach ?>
-    </ul>
-  <? endif ?>
+  <ul id="gOrganizeChildren-<?= $album->id ?>"
+      class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
+    <li style="display:none">&nbsp;</li>
+    <? foreach ($children as $child): ?>
+      <?= $child ?>
+    <? endforeach ?>
+  </ul>
 </li>