Dragging from the thumbgrid to an album in the tree now works.

Refactored the javascript to minimize duplication.

2 files changed, 5 insertions, 5 deletions

diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 5a3ace95..e679f907 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -4,7 +4,7 @@
   var FATAL_ERROR = "<?= t("Fatal Error") ?>";
   var item_id = <?= $item->id ?>;
   var csrf = "<?= $csrf ?>";
-  var rearrangeUrl = "<?= url::site("__URI__/{$item->id}__TASK_ID__?csrf=$csrf") ?>";
+  var rearrangeUrl = "<?= url::site("__URI__/__ITEM_ID____TASK_ID__?csrf=$csrf") ?>";
   $("#doc3").ready(function() {
     organize_dialog_init();
   });
diff --git a/modules/organize/views/organize_album.html.php b/modules/organize/views/organize_album.html.php
index 9f38a2cc..d4296918 100644
--- a/modules/organize/views/organize_album.html.php
+++ b/modules/organize/views/organize_album.html.php
@@ -3,13 +3,13 @@
   <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
     <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
           class="ui-icon <?= $album_icon ?><? if (empty($album_icon)): ?> gBranchEmpty<? endif ?>">> </span>
-    <span id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
+    <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
           class="<? if ($selected): ?>gBranchSelected <? endif ?>gBranchText">
       <?= $album->title ?>
-    </span>
-    <span id="gOrganizeChildren-<?= $album->id ?>"
+    </div>
+    <div id="gOrganizeChildren-<?= $album->id ?>"
           class="<? if ($album_icon == "ui-icon-plus"): ?>gBranchCollapsed<? endif ?>">
       <?= $children ?>
-    <span>
+    <div>
   </li>
 </ul>