From 050c82cf80b06a555252efaf701434b0cfd59bed Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 21 Jul 2009 11:09:23 -0700
Subject: Escape bare & symbols so that we use valid entities.  Fixes ticket
 #577.

---
 modules/organize/views/organize.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 65d67d04..1686d255 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -33,7 +33,7 @@ var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums an
         <?= $album_tree ?>
       </div>
       <div id="gMicroThumbPanel" class="yui-u"
-           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&offset=__OFFSET__") ?>">
+           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&amp;height=__HEIGHT__&amp;offset=__OFFSET__") ?>">
         <ul id="gMicroThumbGrid"></ul>
       </div>
       <div id="gOrganizeEditDrawer" class="yui-u">
-- 
cgit v1.2.3


From a25f08d433d504a53763feb358a1aa7f5f798de6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 3 Aug 2009 09:19:17 -0700
Subject: Checkpoint the organize module rewrite.  At this point, it doesn't
 really do anything, but get the dialog up, populate the album tree and
 intelligently populate the micro thumb grid. Still to do: 1) get the
 microthumbs laided out ptoperly 2) expand and collapse functionality in the
 album tree 3) use the album tree to change the content of the micro thumb
 grid 4) Actually add some functionality

At the moment, it supports a callback "" to allow modules to add icons
to the organize drawer label.  The close button is added outside of this
framework as it will always be last.
---
 modules/organize/controllers/organize.php          | 507 +--------------
 modules/organize/css/organize.css                  | 184 +-----
 modules/organize/helpers/organize_task.php         | 131 ----
 modules/organize/helpers/organize_theme.php        |   3 +-
 modules/organize/js/organize.js                    | 697 +++------------------
 modules/organize/js/organize_init.js               |  29 -
 modules/organize/views/organize.html.php           |  53 --
 modules/organize/views/organize_album.html.php     |  17 -
 .../organize/views/organize_button_pane.html.php   |  49 +-
 modules/organize/views/organize_dialog.html.php    |  37 ++
 modules/organize/views/organize_edit.html.php      |  14 -
 .../organize/views/organize_thumb_grid.html.php    |  23 +-
 modules/organize/views/organize_tree.html.php      |  20 +-
 13 files changed, 232 insertions(+), 1532 deletions(-)
 delete mode 100644 modules/organize/helpers/organize_task.php
 delete mode 100644 modules/organize/js/organize_init.js
 delete mode 100644 modules/organize/views/organize.html.php
 delete mode 100644 modules/organize/views/organize_album.html.php
 create mode 100644 modules/organize/views/organize_dialog.html.php
 delete mode 100644 modules/organize/views/organize_edit.html.php

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 898be509..d7854c53 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -19,54 +19,48 @@
  */
 class Organize_Controller extends Controller {
   private static $_MICRO_THUMB_SIZE = 90;
-  private static $_MICRO_THUMB_PADDING = 5;
+  private static $_MICRO_THUMB_PADDING = 10;
 
-  function index($item_id=1) {
+  function index($item_id) {
     $item = ORM::factory("item", $item_id);
     $root = ($item->id == 1) ? $item : ORM::factory("item", 1);
     access::required("view", $item);
     access::required("edit", $item);
 
-    $v = new View("organize.html");
+    $v = new View("organize_dialog.html");
     $v->root = $root;
     $v->item = $item;
-    $v->album_tree = $this->tree($item, $root);
+    $v->album_tree = $this->_tree($item, $root);
+    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item);
     $v->button_pane = new View("organize_button_pane.html");
+    $buttons = (object)array("left" => array(), "middle" =>array(), "right" => array(),
+                             "item" => $item);
+    module::event("organize_format_button_pane", $buttons);
+
+    $v->button_pane->buttons = $buttons;
     print $v;
   }
 
-  function content($item_id) {
+  function content($item_id, $offset=0) {
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
     access::required("edit", $item);
 
-    $width = $this->input->get("width");
-    $height = $this->input->get("height");
-    $offset = $this->input->get("offset", 0);
-    $thumbsize = self::$_MICRO_THUMB_SIZE + 2 * self::$_MICRO_THUMB_PADDING;
-    $page_size = ceil($width / $thumbsize) * ceil($height / $thumbsize);
+    $v = $this->_get_micro_thumb_grid($item, $offset);
+    print $v->__toString();
+  }
 
+  private function _get_micro_thumb_grid($item, $offset=0) {
     $v = new View("organize_thumb_grid.html");
-    $v->children = $item->children($page_size, $offset);
+    $v->item_id = $item->id;
+    $v->children = $item->children(25, $offset);
     $v->thumbsize = self::$_MICRO_THUMB_SIZE;
-    $v->padding = self::$_MICRO_THUMB_PADDING;
-    $v->offset = $offset;
-
-    print json_encode(array("count" => $v->children->count(),
-                            "data" => $v->__toString()));
-  }
-
-  function header($item_id) {
-    $item = ORM::factory("item", $item_id);
-    access::required("view", $item);
-    access::required("edit", $item);
+    $v->offset = $offset + 25;
 
-    print json_encode(
-      array("title" => p::purify($item->title),
-            "description" => empty($item->description) ? "" : p::purify($item->description)));
+    return $v;
   }
 
-  function tree($item, $parent) {
+  private function _tree($item, $parent, $selected=false) {
     access::required("view", $item);
     access::required("edit", $item);
 
@@ -75,466 +69,25 @@ class Organize_Controller extends Controller {
       ->orderby(array("title" => "ASC"))
       ->find_all();
 
-    $v = new View("organize_album.html");
+    $v = new View("organize_tree.html");
     $v->album = $parent;
-    $v->selected = $parent->id == $item->id;
-
-    if ($albums->count()) {
-      $v->album_icon = $parent->id == 1 || $v->selected ? "ui-icon-minus" : "ui-icon-plus";
-    } else {
-      $v->album_icon = "";
-    }
 
+    $v->selected = false;
     $v->children = "";
-    foreach ($albums as $album) {
-      $v->children .= $this->tree($item, $album);
-    }
-    return $v->__toString();
-  }
-
-  function startTask($operation, $id) {
-    access::verify_csrf();
-    $items = $this->input->post("item");
-
-    $item = ORM::factory("item", $id);
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $definition = $this->_getOperationDefinition($item, $operation);
-
-    $task_def = Task_Definition::factory()
-      ->callback("organize_task::run")
-      ->description($definition["description"])
-      ->name($definition["name"]);
-    $task = task::create($task_def, array("items" => $items, "position" => 0, "target" => $id,
-                                          "type" => $definition["type"],
-                                          "batch" => ceil(count($items) * .1)));
-    // @todo If there is only one item then call task_run($task->id); Maybe even change js so
-    // we can call finish as well.
-    batch::start();
-    print json_encode(
-      array("result" => "started",
-            "runningMsg" => $definition["runningMsg"],
-            "pauseMsg" => "<div class=\"gWarning\">{$definition['pauseMsg']}</div>",
-            "resumeMsg" => "<div class=\"gWarning\">{$definition['resumeMsg']}</div>",
-            "task" => array("id" => $task->id,
-                            "percent_complete" => $task->percent_complete,
-                            "type" => $task->get("type"),
-                            "status" => $task->status,
-                            "state" => $task->state,
-                            "done" => $task->done)));
-  }
-
-  function runTask($task_id) {
-    access::verify_csrf();
-
-    $task = task::run($task_id);
-    if (!$task->loaded || $task->owner_id != user::active()->id) {
-      access::forbidden();
-    }
-
-    print json_encode(array("result" => $task->done ? $task->state : "in_progress",
-                            "task" => array("id" => $task->id,
-                                            "percent_complete" => $task->percent_complete,
-                                            "type" => $task->get("type"),
-                                            "post_process" => $task->get("post_process"),
-                                            "status" => $task->status,
-                                            "state" => $task->state,
-                                            "done" => $task->done)));
-  }
-
-  function finishTask($task_id) {
-    access::verify_csrf();
-
-    $task = ORM::factory("task", $task_id);
-    if (!$task->loaded || $task->owner_id != user::active()->id) {
-      access::forbidden();
-    }
-
-    if ($task->done) {
-      $item = ORM::factory("item", (int)$task->get("target"));
-      $type = $task->get("type");
-      switch ($type) {
-      case "albumCover":
-        $task->status = t("Album cover set for '%album'", array("album" => $item->title));
-        break;
-      case "delete":
-        $task->status = t("Selection deleted");
-        break;
-      case "move":
-        $task->status = t("Move to '%album' completed", array("album" => $item->title));
-        break;
-      case "rearrange":
-        try {
-          $item->sort_column = "weight";
-          $item->save();
-          $task->status = t("Rearrange for '%album' completed", array("album" => $item->title));
-        } catch (Exception $e) {
-          $task->state = "error";
-          $task->status = $e->getMessage();
-        }
-        break;
-      case "rotateCcw":
-      case "rotateCw":
-        $task->status = t("Rotation completed");
-        break;
-      }
-      $task->save();
-   }
-
-    batch::stop();
-    print json_encode(array("result" => "success",
-                            "task" => array(
-                              "id" => $task->id,
-                              "percent_complete" => $task->percent_complete,
-                              "status" => $task->status,
-                              "state" => $task->state,
-                              "done" => $task->done)));
-  }
-
-  function cancelTask($task_id) {
-    access::verify_csrf();
-
-    $task = ORM::factory("task", $task_id);
-    if (!$task->loaded || $task->owner_id != user::active()->id) {
-      access::forbidden();
-    }
-
-    if (!$task->done) {
-      $task->done = 1;
-      $task->state = "cancelled";
-      $type = $task->get("type");
-      switch ($type) {
-      case "move":
-        $task->status = t("Move to album was cancelled prior to completion");
-        break;
-      case "rearrange":
-         $task->status = t("Rearrange album was cancelled prior to completion");
-      case "rotateCcw":
-      case "rotateCw":
-        $task->status = t("Rotation was cancelled prior to completion");
-        break;
-      }
-      $task->save();
-    }
-
-    batch::stop();
-    print json_encode(array("result" => "success",
-                            "task" => array(
-                              "id" => $task->id,
-                              "percent_complete" => $task->percent_complete,
-                              "status" => $task->status,
-                              "state" => $task->state,
-                              "done" => $task->done)));
-  }
-
-  function editForm() {
-    $event_parms = new stdClass();
-    $event_parms->panes = array();
-    $event_parms->itemids = $this->input->get("item");
-
-    // The following code should be done more dynamically i.e. use the event mechanism
-    if (count($event_parms->itemids) == 1) {
-      $item = ORM::factory("item")
-        ->in("id", $event_parms->itemids[0])
-        ->find();
-
-      access::required("view", $item);
-      access::required("edit", $item);
-
-      $event_parms->panes[] = array(
-        "label" => $item->is_album() ? t("Edit Album") : t("Edit Photo"),
-        "content" => organize::get_general_edit_form($item));
-
-      if ($item->is_album()) {
-        $event_parms->panes[] = array("label" => t("Sort Order"),
-                                      "content" => organize::get_sort_edit_form($item));
-      }
-    }
-
-    $event_parms->panes[] = array("label" => t("Manage Tags"),
-                                  "content" => organize::get_tag_form($event_parms->itemids));
-
-    $v = new View("organize_edit.html");
-    $v->panes = $event_parms->panes;
-    print $v->render();
-  }
-
-  // Handlers for the album/photo edit.  Probably should be in modules/gallery
-  public function general() {
-    access::verify_csrf();
-
-    $itemids = $this->input->post("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $form = organize::get_general_edit_form($item);
-    if ($form->validate()) {
-      $orig = clone $item;
-      $item->title = $form->title->value;
-      $item->description = $form->description->value;
-      $item->rename($form->dirname->value);
-      $item->save();
+    $v->album_icon = "ui-icon-plus";
+    if (!$selected) {
+      $v->selected = $parent->id == $item->id;
 
-      if ($item->is_album()) {
-        log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-        $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
-      } else {
-        log::success("content", "Updated photo", "<a href=\"photos/$item->id\">view</a>");
-        $message = t("Saved photo %photo_title", array("photo_title" => p::purify($item->title)));
+      if ($albums->count() && ($parent->id == 1 || $v->selected) ) {
+        $v->album_icon = "ui-icon-minus";
       }
-      print json_encode(array("form" => $form->__toString(), "message" => $message));
-    } else {
-      print json_encode(array("form" => $form->__toString()));
-    }
-  }
-
-  public function reset_general() {
-    $itemids = Input::instance()->get("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    print organize::get_general_edit_form($item);
-  }
-
-  public function sort() {
-    access::verify_csrf();
-
-    $itemids = $this->input->post("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $form = organize::get_sort_edit_form($item);
-    if ($form->validate()) {
-      $orig = clone $item;
-      $item->sort_column = $form->column->value;
-      $item->sort_order = $form->direction->value;
-      $item->save();
-
-      log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-      $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
-      print json_encode(array("form" => $form->__toString(), "message" => $message));
-    } else {
-      print json_encode(array("form" => $form->__toString()));
-    }
-  }
-
-  public function reset_sort() {
-    $itemids = Input::instance()->get("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    print organize::get_sort_edit_form($item);
-  }
-
-  public function edit_tags() {
-    access::verify_csrf();
 
-    $itemids = explode("|", $this->input->post("item"));
-    $form = organize::get_tag_form($itemids);
-    $old_tags = $form->tags->value;
-    if ($form->validate()) {
-
-      $old_tags = preg_split("/[;,\s]+/", $old_tags);
-      sort($old_tags);
-      $new_tags = preg_split("/[;,\s]+/", $form->tags->value);
-      sort($new_tags);
-
-      $HIGH_VALUE_STRING = "\256";
-      for ($old_index = $new_index = 0;;) {
-        $old_tag = $old_index >= count($old_tags) ? $HIGH_VALUE_STRING : $old_tags[$old_index];
-        $new_tag = $new_index >= count($new_tags) ? $HIGH_VALUE_STRING : $new_tags[$new_index];
-        if ($old_tag == $HIGH_VALUE_STRING && $new_tag == $HIGH_VALUE_STRING) {
-          break;
-        }
-        $matches = array();
-        $old_star = false;
-        if (preg_match("/(.*)(\*)$/", $old_tag, $matches)) {
-          $old_star = true;
-          $old_tag = $matches[1];
-        }
-        $new_star = false;
-        if (preg_match("/(.*)(\*)$/", $new_tag, $matches)) {
-          $new_star = true;
-          $new_tag = $matches[1];
-        }
-        if ($old_tag > $new_tag) {
-          // Its missing in the old list so add it
-          $this->_add_tag($new_tag, $itemids);
-          $new_index++;
-        } else if ($old_tag < $new_tag) {
-          // Its missing in the new list so its been removed
-          $this->_delete_tag($old_tag, $itemids);
-          $old_index++;
-        } else {
-          if ($old_star && !$new_star) {
-            // User wants tag to apply to all items, originally only on some of selected
-            $this->_update_tag($old_tag, $itemids);
-          } // Not changed ignore
-          $old_index++;
-          $new_index++;
-        }
+      foreach ($albums as $album) {
+        $v->children .= $this->_tree($item, $album, $v->selected);
       }
     }
-    print json_encode(array("form" => $form->__toString(), "message" => t("Tags updated")));
-  }
-
-  public function reset_edit_tags() {
-    $itemids = $this->input->get("item");
-
-    print organize::get_tag_form($itemids);
-  }
-
-  private function _add_tag($new_tag, $itemids) {
-    // Super lame security stopgap.  This code is going to get rewritten anyway.
-    foreach ($itemids as $item_id) {
-      $item = ORM::factory("item", $item_id);
-      access::required("view", $item);
-      access::required("edit", $item);
-    }
-
-    $tag = ORM::factory("tag")
-      ->where("name", $new_tag)
-      ->find();
-    if ($tag->loaded) {
-      $tag->count += count($itemids);
-    } else {
-      $tag->name = $new_tag;
-      $tag->count = count($itemids);
-    }
-    $tag->save();
-
-    $db = Database::instance();
-    foreach ($itemids as $item_id) {
-      $db->query("INSERT INTO {items_tags} SET item_id = $item_id, tag_id = {$tag->id};");
-    }
-  }
-
-  private function _delete_tag($new_tag, $itemids) {
-    // Super lame security stopgap.  This code is going to get rewritten anyway.
-    foreach ($itemids as $item_id) {
-      $item = ORM::factory("item", $item_id);
-      access::required("view", $item);
-      access::required("edit", $item);
-    }
-
-    $tag = ORM::factory("tag")
-      ->where("name", $new_tag)
-      ->find();
-    $tag->count -= count($itemids);
-    if ($tag->count > 0) {
-      $tag->save();
-    } else {
-      $tag->delete();
-    }
-
-    $ids = implode(", ", $itemids);
-    Database::instance()->query(
-      "DELETE FROM {items_tags} WHERE tag_id = {$tag->id} AND item_id IN ($ids);");
-  }
-
-  private function _update_tag($new_tag, $itemids) {
-    // Super lame security stopgap.  This code is going to get rewritten anyway.
-    foreach ($itemids as $item_id) {
-      $item = ORM::factory("item", $item_id);
-      access::required("view", $item);
-      access::required("edit", $item);
-    }
-
-    $tag = ORM::factory("tag")
-      ->where("name", $new_tag)
-      ->find();
-
-    $db = Database::instance();
-    $ids = implode(", ", $itemids);
-    $result = $db->query(
-      "SELECT item_id FROM {items_tags}
-        WHERE tag_id = {$tag->id}
-          AND item_id IN ($ids)");
-
-    $add_items = array_fill_keys($itemids, 1);
-    foreach($result as $row) {
-      unset($add_items[$row->item_id]);
-    }
-    $add_items = array_keys($add_items);
-    $tag->count += count($add_items);
-    $tag->save();
-    foreach ($add_items as $item_id) {
-      $db->query("INSERT INTO {items_tags} SET item_id = $item_id, tag_id = {$tag->id};");
-    }
+    return $v->__toString();
   }
 
-  private function _getOperationDefinition($item, $operation) {
-    switch ($operation) {
-    case "move":
-      return array("description" =>
-                     t("Move albums and photos to '%name'", array("name" => $item->title)),
-                   "name" => t("Move to '%name'", array("name" => $item->title)),
-                   "type" => "move",
-                   "runningMsg" => t("Move in progress"),
-                   "pauseMsg" => t("The move operation was paused"),
-                   "resumeMsg" => t("The move operation was resumed"));
-      break;
-
-    case "rearrange":
-      return array("description" => t("Rearrange the order of albums and photos"),
-                   "name" => t("Rearrange: %name", array("name" => $item->title)),
-                   "type" => "rearrange",
-                   "runningMsg" => t("Rearrange in progress"),
-                   "pauseMsg" => t("The rearrange operation was paused"),
-                   "resumeMsg" => t("The rearrange operation was resumed"));
-      break;
 
-    case "rotateCcw":
-      return array("description" => t("Rotate the selected photos counter clockwise"),
-                   "name" => t("Rotate images in %name", array("name" => $item->title)),
-                   "type" => "rotateCcw",
-                   "runningMsg" => t("Rotate Counter Clockwise in progress"),
-                   "pauseMsg" => t("The rotate operation was paused"),
-                   "resumeMsg" => t("The rotate operation was resumed"));
-      break;
-
-    case "rotateCw":
-      return array("description" => t("Rotate the selected photos clockwise"),
-                   "name" => t("Rotate images in %name", array("name" => $item->title)),
-                   "type" => "rotateCw",
-                   "runningMsg" => t("Rotate Clockwise in progress"),
-                   "pauseMsg" => t("The rotate operation was paused"),
-                   "resumeMsg" => t("The rotate operation was resumed"));
-      break;
-
-    case "delete":
-      return array("description" => t("Delete selected photos / albums"),
-                   "name" => t("Delete images in %name", array("name" => $item->title)),
-                   "type" => "delete",
-                   "runningMsg" => t("Delete images in progress"),
-                   "pauseMsg" => t("The delete operation was paused"),
-                   "resumeMsg" => t("The delete operation was resumed"));
-      break;
-
-    case "albumCover":
-      return array("description" => t("Reset Album Cover"),
-                   "name" => t("Reset Album cover for %name", array("name" => $item->title)),
-                   "type" => "albumCover",
-                   "runningMsg" => t("Reset Album Cover in progress"),
-                   "pauseMsg" => t("Reset album cover was paused"),
-                   "resumeMsg" => t("Reset album cover was resumed"));
-      break;
-
-    default:
-      throw new Exception("Operation '$operation' is not implmented");
-    }
-  }
 }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index e58cd5a5..4568a707 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,41 +1,44 @@
-/* @todo move to theme css */
 /*******************************************************************
  * Dialog wide stylings
  */
-#gMessage {
-  margin-bottom: .4em;
+#gOrganizeDialog {
+  text-align: left;
 }
 
-#gMessage .gInfo {
-  background-color: transparent;
-  background-image: none;
-  padding-left: .4em;
+#gOrganize {
+  overflow: hidden;
 }
 
-#gOrganizeProgressDialog {
-  text-align: left;
+#gOrganize .yui-u {
+  width: 75%;
+}
+
+#gOrganize .yui-gf .first {
+  width: 25%;
 }
 
-#gDialog .yui-gf div.first {
-  width: 20%;
+#gOrganize .yui-gf #gMessage {
+  margin-bottom: .4em;
+  width: 75%;
 }
 
-#gDialog .yui-gf .yui-u {
-  width: 80%;
+#gMessage .gInfo {
+  font-weight: bold;
+  padding-left: 2em;
 }
 
+
 /*******************************************************************
  * Album Tree styling
  */
 #gOrganizeTreeContainer {
-  overflow-y: auto;
+  overflow: auto;
   margin: 0 !important;
   padding: 0 !important;
 }
 
-#gOrganizeAlbumDescription {
-  height: 2em;
-  overflow-y: auto;
+#gOrganizeTreeContainer ul ul li {
+  padding-left: 1.2em;
 }
 
 .gBranchSelected {
@@ -45,37 +48,21 @@
   padding: .3em 0;
 }
 
-.gBranchDroppable {
-  border: 1px dotted;
-}
-
-.gBranchText {
-  cursor: pointer;
-  width: auto;
-}
-
 .gBranchCollapsed {
   display: none;
 }
 
-.gBranchEmpty {
-  visibility: hidden;
+.gOrganizeBranch span {
+  cursor: pointer;
 }
 
-#gOrganizeTreeContainer ul ul li {
-  padding-left: 1.2em;
+.gBranchText {
+  cursor: pointer;
+  width: auto;
 }
-
 /*******************************************************************
  * Album Panel Styles
  */
-
-#gMicroThumbUnselectAll,
-#gMicroThumbSelectAll {
-  font-size: 1em;
-  font-weight: bold;
-}
-
 #gMicroThumbPanel {
   margin: 0 !important;
   padding: 0 !important;
@@ -83,33 +70,27 @@
   border: 1px solid #999 !important;
   border-top: none !important;
   border-left: none !important;
-  margin-left: -1em !important;
   overflow-x: hidden;
   overflow-y: auto;
 }
 
 #gMicroThumbGrid {
-  padding: .5em;
 }
 
 .gMicroThumbContainer {
-  display: block;
-  float: left;
-  font-size: .7em;
-  height: 9em;
-  margin-bottom: 1em;
-  margin-left: 1em;
-  opacity: .4;
-  padding: 0 .5em;
+//  padding: 0 .5em;
+//  opacity: .4;
 }
 
 .gMicroThumb {
-  height: 9em;
-  width: 9em;
-  background-color: #fff;
   display: block;
   float: left;
+//  font-size: .7em;
+  height: 9em;
+  margin-bottom: 1em;
+  margin-left: 1em;
   text-align: center;
+  width: 9em;
 }
 
 #gMicroThumbPanel #gMicroThumbGrid .gAlbum {
@@ -120,35 +101,12 @@
   opacity: 1;
 }
 
-.gMicroThumbContainer.ui-selected {
-  opacity: 1;
-}
-
-#gDragHelper .gMicroThumbGrid {
-  background-color: transparent;
-  padding: 0;
-  overflow: visible;
-}
-
-#gDragHelper .gMicroThumbContainer {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-
-#gDragHelper .gMicroThumb {
-  background-color: transparent;
-  height: auto;
-  width: auto;
-}
-
-
 /****************************************************************
  * Organize Edit Drawer styling
  */
 #gOrganizeEditDrawer {
   background-color: #13A;
-  width: 90%;
+  width: 100% !important;
 }
 
 #gOrganizeEditDrawerPanel {
@@ -204,79 +162,3 @@
   height: 30px;
   width: 15px;
 }
-
-#gOrganizeFormButtons {
-  bottom: 0.5em;
-}
-
-#gOrganizeFormButtons .submit {
-  display: inline;
-  float: none;
-  left: 0.5em;
-  position: relative;
-}
-
-/* yui-u gives 80% width, but then we wrap so do it ourselves */
-#gOrganizeEditForm {
-  float: right;
-  width: 79%;
-  //  height: 100px;
-}
-
-#gOrganizeFormThumbs {
-  overflow: hidden;
-}
-
-#gOrganizeFormThumbs div {
-  margin: 0;
-  text-align: center;
-  background: transparent none repeat scroll 0 0;
-}
-
-#gOrganizeFormThumbs .gMicroThumbContainer {
-  display: block;
-  float: left;
-  opacity: 1;
-  position: absolute;
-}
-
-/****************************************************************
- * Organize Edit From tabs styling
- */
-#gOrganizeEditForm.ui-tabs .ui-tabs-hide {
-  display: block !important;
-  left: -10000px;
-  position: absolute;
-}
-
-#gOrganizeEditForm.ui-widget {
-  font-size: .75em;
-}
-
-.gOrganizeEditPane {
-  height: 135px;
-  overflow-y: auto;
-}
-
-.textbox,
-.textarea {
-  border: 1px solid #e8e8e8;
-  border-top-color: #ccc;
-  border-left-color: #ccc;
-  color: #333;
-  width: 100%;
-}
-
-.textarea {
-  height: 6em;
-}
-
-.textbox  {
-  height: 1.3em;
-  width: 50%
-}
-
-.gTagGroup {
-  float:left;
-  margin: .5em;
-}
diff --git a/modules/organize/helpers/organize_task.php b/modules/organize/helpers/organize_task.php
deleted file mode 100644
index dc474818..00000000
--- a/modules/organize/helpers/organize_task.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class organize_task_Core {
-  static function available_tasks() {
-    // Return empty array so nothing appears in the maintenance screen
-    return array();
-  }
-
-  static function run($task) {
-    $context = unserialize($task->context);
-    $taskType = $context["type"];
-
-    try {
-      $target = ORM::factory("item", $context["target"]);
-      $total = count($context["items"]);
-      $stop = min($total - $context["position"], $context["batch"]);
-      $context["post_process"] = array();
-      for ($offset = 0; $offset < $stop; $offset++) {
-        $current_id = $context["position"] + $offset;
-        $id = $context["items"][$current_id];
-        switch ($taskType) {
-        case "move":
-          $source = ORM::factory("item", $id);
-          access::required("view", $source);
-          access::required("view", $target);
-          access::required("edit", $source);
-          access::required("edit", $target);
-
-          item::move($source, $target);
-          break;
-
-        case "rearrange":
-          $item = ORM::factory("item", $id);
-          access::required("view", $item);
-          access::required("edit", $item);
-
-          Database::instance()
-            ->query("Update {items} set weight = {$context["position"]} where id=$id;");
-          break;
-
-        case "rotateCcw":
-        case "rotateCw":
-          $item = ORM::factory("item", $id);
-          access::required("view", $item);
-          access::required("edit", $item);
-
-          if ($item->is_photo()) {
-            $context["post_process"]["reload"][] =
-              self::_do_rotation($item, $taskType == "rotateCcw" ? -90 : 90);
-          }
-          break;
-
-        case "albumCover":
-          $item = ORM::factory("item", $id);
-          access::required("view", $item);
-          access::required("view", $item->parent());
-          access::required("edit", $item->parent());
-
-          item::make_album_cover($item);
-          break;
-
-        case "delete":
-          $item = ORM::factory("item", $id);
-          access::required("view", $item);
-          access::required("edit", $item);
-
-          $item->delete();
-          $context["post_process"]["remove"][] = array("id" => $id);
-          break;
-
-        default:
-          throw new Exception("Task '$taskType' is not implemented");
-        }
-      }
-      $context["position"] += $stop;
-      $task->state = "success";
-    } catch(Exception $e) {
-      $task->status = $e->getMessage();
-      $task->state = "error";
-      $task->save();
-      throw $e;
-    }
-    $task->context = serialize($context);
-    $total = count($context["items"]);
-    $task->percent_complete = $context["position"] / (float)$total * 100;
-    $task->done = $context["position"] == $total || $task->state == "error";
-  }
-
-  private static function _do_rotation($item, $degrees) {
-    // This code is copied from Quick_Controller::rotate
-    graphics::rotate($item->file_path(), $item->file_path(), array("degrees" => $degrees));
-
-    list($item->width, $item->height) = getimagesize($item->file_path());
-    $item->resize_dirty= 1;
-    $item->thumb_dirty= 1;
-    $item->save();
-
-    graphics::generate($item);
-
-    $parent = $item->parent();
-    if ($parent->album_cover_item_id == $item->id) {
-      copy($item->thumb_path(), $parent->thumb_path());
-      $parent->thumb_width = $item->thumb_width;
-      $parent->thumb_height = $item->thumb_height;
-      $parent->save();
-    }
-    list ($height, $width) = $item->scale_dimensions(90);
-    $margin_top = (90 - $height) / 20;
-
-    return array("src" => $item->thumb_url() . "?rnd=" . rand(),
-                 "id" => $item->id,
-                 "marginTop" => "{$margin_top}em", "width" => $width, "height" => $height);
-  }
-}
\ No newline at end of file
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index e4feba2b..f01ab88b 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -19,8 +19,7 @@
  */
 class organize_theme {
   static function head($theme) {
-    // @tdo remove the addition css and organize.js (just here to test)
-    $theme->script("organize_init.js");
+    //$theme->script("organize_init.js");
     $theme->script("organize.js");
     $theme->css("organize.css");
   }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 12d8a5b5..e84afd03 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,621 +1,116 @@
-/*
- * @todo Trap resize of dialog and resize the child areas (tree, grid and edit form)
- */
-var url;
-var paused = false;
-var task = null;
-var transitItems = [];
-var heightMicroThumbPanel;
-
-// **************************************************************************
-// JQuery UI Widgets
-// Draggable
-var draggable = {
-  handle: ".gMicroThumbContainer.ui-selected",
-  revert: true,
-  zindex: 2000,
-  distance: 10,
-  helper: function(event, ui) {
-    if (!$(event.currentTarget).hasClass("ui-selected")) {
-      $(event.currentTarget).addClass("ui-selected");
-      setDrawerButtonState();
-    }
-    $("#gMicroThumbPanel").append("<div id=\"gDragHelper\"><ul></ul></div>");
-    var beginTop = event.pageY;
-    var beginLeft = event.pageX;
-    var zindex = $(".gMicroThumbContainer").draggable("option", "zindex");
-    $("#gDragHelper").css('top', event.pageY - 22.5);
-    $("#gDragHelper").css('left', event.pageX + 22.5);
-    var placeHolder = $(this).clone();
-    $(placeHolder).attr("id", "gPlaceHolder");
-    $(placeHolder).css("visibility", "hidden");
-    $(placeHolder).removeClass("ui-selected");
-    $(placeHolder).removeClass("ui-draggable");
-    $(this).after(placeHolder);
-
-    $("li.ui-selected").each(function(i) {
-      var clone = $(this).clone();
-      $(clone).attr("id", "drag_clone_" + $(this).attr("ref"));
-      $("#gDragHelper ul").append(clone);
-      $(clone).css("position", "absolute");
-      $(clone).css("top", beginTop);
-      $(clone).css("left", beginLeft);
-      $(clone).css("z-index", zindex--);
-      $(this).hide();
-
-      var children = $(clone).find(".gMicroThumb .gThumbnail");
-      var width = new String(children.css("width")).replace(/[^0-9]/g,"") * .5;
-      var height = new String(children.css("height")).replace(/[^0-9]/g,"") * .5;
-      var marginTop = new String(children.css("margin-top")).replace(/[^\.0-9]/g,"") * .5;
-      children.attr("width", width);
-      children.attr("height", height);
-      children.css("margin-top", marginTop);
-      if (i < 9) {
-        beginTop -= 5;
-        beginLeft += 5;
-      }
-    });
-    return $("#gDragHelper");
-  },
-  stop: function(event, ui) {
-    $("#gDragHelper li").each(function(i) {
-      $("#thumb_" + $(this).attr("ref")).show();
-    });
-    $(".gMicroThumbContainer.ui-selected").css("z-index", null);
-    $("#gDragHelper").remove();
-    $("#gPlaceHolder").remove();
-  }
-};
-
-// Thumbnail Grid Droppable
-var thumbDroppable =  {
-  tolerance: "pointer",
-  over: function(event, ui) {
-    $("#gPlaceHolder").show();
-  },
-  out:  function(event, ui) {
-    $("#gPlaceHolder").hide();
-  },
-  drop: function(event, ui) {
-    $("#gDragHelper").hide();
-    $("#gPlaceHolder").hide();
-    var newOrder = "";
-    $("#gMicroThumbGrid .gMicroThumbContainer").each(function(i) {
-      if ($(this).attr("id") == "gPlaceHolder") {
-        $("#gDragHelper li").each(function(i) {
-          newOrder += "&item[]=" + $(this).attr("ref");
-        });
-      } else if ($(this).css("display") != "none") {
-        newOrder += "&item[]=" + $(this).attr("ref");
-      } else  {
-        // If its not displayed then its one of the ones being moved so ignore.
-      }
-    });
-    $("#gDragHelper li").each(function(i) {
-      $("#gPlaceHolder").before($("#thumb_" + $(this).attr("ref")).show());
-    });
-    $.ajax({
-      data: newOrder,
-      dataType: "json",
-      success: operationCallback,
-      type: "POST",
-      url: get_organize_url("organize/startTask/rearrange", {item_id: item_id})
-    });
-  }
-};
-
-// Album Tree Droppable
-var treeDroppable =  {
-  tolerance: "pointer",
-  greedy: true,
-  hoverClass: "gBranchDroppable",
-  drop: function(event, ui) {
-    $("#gDragHelper").hide();
-    var targetItemId = $(this).attr("ref");
-    if ($(this).hasClass("gBranchSelected")) {
-      $("#gMessage").empty().append(INVALID_DROP_TARGET);
-      ui.draggable.trigger("stop", event);
-      return false;
-    }
-    var postData = serializeItemIds("#gDragHelper li");
-    var okToMove = true;
-    $("#gDragHelper li").each(function(i) {
-      okToMove &= targetItemId != $(this).attr("ref");
-    });
-    if (!okToMove) {
-      $("#gMessage").empty().append(INVALID_DROP_TARGET);
-      ui.draggable.trigger("stop", event);
-      return false;
-    }
-    $("#gDragHelper li").each(function(i) {
-      $("#thumb_" + $(this).attr("ref")).remove();
-    });
-    $.ajax({
-      data: postData,
-      dataType: "json",
-      success: operationCallback,
-      type: "POST",
-      url: get_organize_url("organize/startTask/move", {item_id: targetItemId})
-    });
-    return true;
-  }
-};
-
-// Selectable
-var selectable = {
-  filter: ".gMicroThumbContainer",
-  selected: function(event, ui) {
-    setDrawerButtonState();
-  },
-  unselected: function(event, ui) {
-    setDrawerButtonState();
-  },
-  stop: function(event, ui) {
-    getEditForm();
-  }
-};
-
-// **************************************************************************
-// Event Handlers
-// MicroThumbContainer mouseup
-var onMicroThumbContainerMouseup = function(event) {
-  // For simplicity always remove the ui-selected class.  If it was unselected
-  // it will get added back
-  $(this).toggleClass("ui-selected");
-
-  setDrawerButtonState();
-  if ($("#gMicroThumbGrid li.ui-selected").length > 0) {
-    getEditForm();
-  }
-};
-
-// MicroThumbContainer mousemove
-var onMicroThumbContainerMousemove = function(event) {
-  if ($("#gDragHelper").length > 0 && $(this).attr("id") != "gPlaceHolder") {
-    if (event.pageX < $(this).offset().left + $(this).width() / 2) {
-      $(this).before($("#gPlaceHolder"));
-    } else {
-      $(this).after($("#gPlaceHolder"));
-    }
-    var container = $("#gMicroThumbPanel").get(0);
-    var scrollHeight = container.scrollHeight;
-    var scrollTop = container.scrollTop;
-    var height = $(container).height();
-    if (event.pageY > height + scrollTop) {
-      container.scrollTop = this.offsetTop;
-    } else if (event.pageY < scrollTop) {
-      container.scrollTop -= height;
-    }
-  }
-};
-
-// Handle click events on the buttons on the drawer handle
-function drawerHandleButtonsClick(event) {
-  event.preventDefault();
-  if (!$(this).attr("disabled")) {
-    var operation = $(this).attr("ref");
-    switch (operation) {
-    case "edit":
-    case "close":
-      $("#gOrganizeEditDrawerPanel").animate(
-        {"height": "toggle", "display": "block"},
-        {duration: "fast",
-         complete: function() {
-           setSelectedThumbs();
-           if (operation == "close") {
-             $("#gOrganizeEditHandleButtonsLeft a[ref='edit']").css("display", "inline-block");
-             $("#gOrganizeEditHandleButtonsLeft a[ref='close']").css("display", "none");
-             $("#gOrganizeEditHandleButtonsMiddle a").css("display", "none");
-           } else {
-             $("#gOrganizeEditHandleButtonsLeft a[ref='edit']").css("display", "none");
-             $("#gOrganizeEditHandleButtonsLeft a[ref='close']").css("display", "inline-block");
-             $("#gOrganizeEditHandleButtonsMiddle a").css("display", "inline-block");
-           }
-         },
-         step: function() {
-           $("#gMicroThumbPanel").height(heightMicroThumbPanel - $(this).height());
-         }
-      });
-      break;
-    case "select-all":
-      $("#gMicroThumbGrid li").addClass("ui-selected");
-      $("#gMicroThumbSelectAll").hide();
-      $("#gMicroThumbUnselectAll").show();
-      setDrawerButtonState();
-      getEditForm();
-      break;
-    case "unselect-all":
-      $("#gMicroThumbGrid li").removeClass("ui-selected");
-      $("#gMicroThumbSelectAll").show();
-      $("#gMicroThumbUnselectAll").hide();
-      setDrawerButtonState();
-      break;
-    case "done":
-      $("#gDialog").dialog("close");
-      break;
-    case "submit":
-      var currentTab = $("#gOrganizeEditForm").tabs("option", "selected");
-      var form = $("#pane-"+currentTab+" form");
-      var url = $(form).attr("action")
-        .replace("__FUNCTION__", $(form).attr("ref"));
-      $.ajax({
-        data: $(form).serialize(),
-        dataType: "json",
-        success: function (data, textStatus) {
-          $("#pane-"+currentTab).children("form").replaceWith(data.form);
-          if (data.message) {
-            $("#gMessage").empty().append("<div class='gSuccess'>" + data.message + "</div>");
-          }
-        },
-        type: "POST",
-        url: url
-      });
-      break;
-    case "reset":
-      currentTab = $("#gOrganizeEditForm").tabs("option", "selected");
-      form = $("#pane-"+currentTab+" form");
-      $.ajax({
-        data: serializeItemIds("#gMicroThumbPanel li.ui-selected"),
-        dataType: "html",
-        success: function (data, textStatus) {
-          $("#pane-"+currentTab + " form").replaceWith(data);
-        },
-        type: "GET",
-        url: $(form).attr("action").replace("__FUNCTION__", "reset_" + $(form).attr("ref"))
+(function($) {
+  $.fn.organize = function(options) {
+    var size = $.getViewportSize();
+    var height = size.height() - 100;     // Leave 50 pixels on the top and bottom of the dialog
+    var width = size.width() - 100;       // Leave 50 pixels on the left and right of the dialog
+    var opts = $.extend({}, $.fn.organize.defaults, {width: width, height: height}, options);
+    return this.each(function() {
+      $(this).click(function(event) {
+        var href = event.target.href;
+        var size = $.getViewportSize();
+
+        $("body").append('<div id="gOrganizeDialog"></div>');
+
+        $("#gOrganizeDialog").dialog(opts);
+        // Pass the approx height and width of the thumb grid to optimize thumb retrieval
+        $.get(href, _init);
+        return false;
       });
-      break;
-    case "delete":
-      if (!confirm(CONFIRM_DELETE)) {
-        break;
-      }
-    default:
-      $.ajax({
-        data: serializeItemIds("#gMicroThumbPanel li.ui-selected"),
-        dataType: "json",
-        success: operationCallback,
-        type: "POST",
-        url: get_organize_url("organize/startTask/" + operation, {item_id: item_id})
-      });
-      break;
-    }
-  }
-};
-
-// **************************************************************************
-// AJAX Callbacks
-// MicroThumbContainer click
-var getMicroThumbsCallback = function(json, textStatus) {
-  if (json.count > 0) {
-    $("#gMicroThumbGrid").append(json.data);
-    retrieveMicroThumbs();
-    $(".gMicroThumbContainer").mouseup(onMicroThumbContainerMouseup);
-    $(".gMicroThumbContainer").mousemove(onMicroThumbContainerMousemove);
-    $(".gMicroThumbContainer").draggable(draggable);
-  }
-};
-
-var operationCallback = function (data, textStatus) {
-  var done = false;
-  if (!paused) {
-    createProgressDialog(data.runningMsg);
-    task = data.task;
-    task.pauseMsg = data.pauseMsg;
-    task.resumeMsg = data.resumeMsg;
-    done = data.task.done;
-  }
-  $(".gMicroThumbContainer").draggable("disable");
-  paused = false;
-  while (!done && !paused) {
-    $.ajax({async: false,
-      success: function(data, textStatus) {
-        $(".gProgressBar").progressbar("value", data.task.percent_complete);
-        done = data.task.done;
-        if (data.task.post_process.reload) {
-          $.each(data.task.post_process.reload, function() {
-            var selector = "#gMicroThumb-" + this.id + " img";
-            $(selector).attr("height", this.height);
-            $(selector).attr("width", this.width);
-            $(selector).attr("src", this.src);
-            $(selector).css("margin-top", this.marginTop);
-          });
-        }
-        if (data.task.post_process.remove) {
-          $.each(data.task.post_process.remove, function() {
-            $("#thumb_" + this.id).remove();
-          });
-        }
-      },
-      error: function(XMLHttpRequest, textStatus, errorThrown) {
-        paused = true;
-        displayAjaxError(XMLHttpRequest.responseText);
-      },
-      dataType: "json",
-      type: "POST",
-      url: get_organize_url("organize/runTask", {task_id: task.id})
-    });
-  }
-  if (!paused) {
-    $("#gOrganizeProgressDialog").dialog("destroy").remove();
-    $.ajax({async: false,
-      success: function(data, textStatus) {
-        setDrawerButtonState();
-        task = null;
-        $("#gMessage").empty().append("<div class='gSuccess'>" + data.task.status + "</div>");
-      },
-      dataType: "json",
-      type: "POST",
-      url: get_organize_url("organize/finishTask", {task_id: task.id})
     });
-  }
-  $(".gMicroThumbContainer").draggable("enable");
-};
-
-// **************************************************************************
-
-/**
- * Dynamically initialize the organize dialog when it is displayed
- */
-function organize_dialog_init() {
-  var size = getViewportSize();
-  heightMicroThumbPanel = size.height() - 100;
-  var width = size.width() - 100;
-
-  // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
-  $(".sf-menu li.sfHover ul").css("z-index", 70);
-
-  $("#gDialog").dialog("option", "width", width);
-  $("#gDialog").dialog("option", "height", heightMicroThumbPanel);
-
-  $("#gDialog").dialog("open");
-  if ($("#gDialog h1").length) {
-    $("#gDialog").dialog('option', 'title', $("#gDialog h1:eq(0)").html());
-  } else if ($("#gDialog fieldset legend").length) {
-    $("#gDialog").dialog('option', 'title', $("#gDialog fieldset legend:eq(0)").html());
-  }
-
-  $("#gDialog").bind("organize_close", function(target) {
-    $.gallery_reload();
-  });
-
-  heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-top"));
-  heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-bottom"));
-  heightMicroThumbPanel -= $("#gMicroThumbPanel").position().top;
-  heightMicroThumbPanel -= $("#gDialog #ft").height();
-  heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").height();
-  heightMicroThumbPanel = Math.round(heightMicroThumbPanel);
-
-  $("#gMicroThumbPanel").height(heightMicroThumbPanel);
-  $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
-
-  $(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
-  $(".gBranchText").droppable(treeDroppable);
-  $(".gBranchText").click(organizeOpenFolder);
-  retrieveMicroThumbs(item_id);
-  //showLoading("#gDialog");
-
-  $("#gMicroThumbPanel").droppable(thumbDroppable);
-  $("#gMicroThumbPanel").selectable(selectable);
-  $("#gOrganizeEditDrawerHandle a").click(drawerHandleButtonsClick);
-}
-
-function retrieveMicroThumbs() {
-  var offset = $("#gMicroThumbGrid li").length;
-  if (url == null) {
-    var grid_width = $("#gMicroThumbPanel").width();
-    url = $("#gMicroThumbPanel").attr("ref");
-    url = url.replace("__WIDTH__", grid_width);
-    url = url.replace("__HEIGHT__", heightMicroThumbPanel);
-  }
-  var url_data = url.replace("__OFFSET__", offset);
-  url_data = url_data.replace("__ITEM_ID__", item_id);
-  $.getJSON(url_data, getMicroThumbsCallback);
-}
+  };
 
-function organizeToggleChildren(event) {
-  var id = $(this).attr("ref");
-  var span_children = $("#gOrganizeChildren-" + id);
-  if ($(this).hasClass("ui-icon-plus")) {
-    $(this).removeClass("ui-icon-plus");
-    $(this).addClass("ui-icon-minus");
-    $("#gOrganizeChildren-" + id).removeClass("gBranchCollapsed");
-  } else {
-    $(this).removeClass("ui-icon-minus");
-    $(this).addClass("ui-icon-plus");
-    $("#gOrganizeChildren-" + id).addClass("gBranchCollapsed");
-  }
-  event.preventDefault();
-}
+  $.fn.organize.defaults = {
+    autoOpen: false,
+    modal: true,
+    resizable: false,
+    minWidth: 600,
+    minHeight: 500,
+    position: "center",
+    close: function () {
+      $("#gOrganizeDialog").trigger("organize_close");
+      $("#gOrganizeDialog").dialog("destroy").remove();
+    },
+    zIndex: 75
+  };
 
-function organizeOpenFolder(event) {
-  var selected = $(".gBranchSelected");
-  if ($(selected).attr("id") != $(this).attr("id")) {
-    $(selected).removeClass("gBranchSelected");
-    $(this).addClass("gBranchSelected");
-    item_id = $(this).attr("ref");
-    $("#gMicroThumbGrid").empty();
-    retrieveMicroThumbs();
-  }
-  event.preventDefault();
-}
+  /**
+   * Dynamically initialize the organize dialog when it is displayed
+   */
+  function _init(data) {
 
-function get_organize_url(uri, parms) {
-  var url = rearrangeUrl;
-  url = url.replace("__URI__", uri);
-  url = url.replace("__ITEM_ID__", !parms.item_id ? "" : parms.item_id);
-  url += (parms.item_id && parms.task_id) ? "/" : "";
-  url = url.replace("__TASK_ID__", !parms.task_id ? "" : parms.task_id);
-  return url;
-}
+    // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
+    $(".sf-menu li.sfHover ul").css("z-index", 70);
 
-/**
- * Set the enabled/disabled state of the buttons.  The album cover is only enabled if
- * there is only 1 image selected
- */
-function setDrawerButtonState() {
-  $("#gOrganizeFormThumbStack").empty();
-  $("#gOrganizeEditForm").empty();
-  var selectedCount = $("#gMicroThumbGrid li.ui-selected").length;
-  if (selectedCount) {
-    $("#gOrganizeEditHandleButtonsLeft a").removeAttr("disabled");
-    $("#gOrganizeEditHandleButtonsLeft a").removeClass("ui-state-disabled");
+    $("#gOrganizeDialog").html(data);
+    $("#gOrganizeDialog").dialog("open");
 
-    if (selectedCount > 1) {
-      $("#gOrganizeEditHandleButtonsLeft a[ref='albumCover']").attr("disabled", true);
-      $("#gOrganizeEditHandleButtonsLeft a[ref='albumCover']").addClass("ui-state-disabled");
-    }
-    setSelectedThumbs();
-  } else {
-    if ($("#gOrganizeEditDrawerPanel::visible").length) {
-      $("#gOrganizeEditHandleButtonsLeft a[ref='close']").trigger("click");
-    }
-    $("#gOrganizeEditHandleButtonsLeft a").attr("disabled", true);
-    $("#gOrganizeEditHandleButtonsLeft a").addClass("ui-state-disabled");
-  }
-}
+    var heightMicroThumbPanel = $("#gOrganizeDialog").innerHeight();
+    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
+    heightMicroThumbPanel -= $("#gMessage").outerHeight();
+    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
+    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
 
-function setSelectedThumbs() {
-  if (!$("#gOrganizeEditDrawerPanel::visible").length) {
-    return;
-  }
-  var position = $("#gOrganizeFormThumbStack").position();
-  var beginLeft = position.left;
-  var beginTop = 50;
-  var zindex = 2000;
-  $("li.ui-selected").each(function(i) {
-    var clone = $(this).clone();
-    $(clone).attr("id", "edit_clone_" + $(this).attr("ref"));
-    $("#gOrganizeFormThumbStack").append(clone);
-    $(clone).removeClass("ui-draggable");
-    $(clone).removeClass("ui-selected");
-    $(clone).css("margin-top", beginTop);
-    $(clone).css("left", beginLeft);
-    $(clone).css("z-index", zindex--);
+    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
+    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
 
-    if (i < 9) {
-      beginTop -= 5;
-      beginLeft += 5;
+    if ($("#gOrganizeDialog h1").length) {
+      $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog h1:eq(0)").html());
+    } else if ($("#gOrganizeDialog fieldset legend").length) {
+      $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog fieldset legend:eq(0)").html());
     }
-  });
-}
 
-function getEditForm() {
-  if ($("#gMicroThumbGrid li.ui-selected").length > 0) {
-    var postData = serializeItemIds("li.ui-selected");
-    var url_data = get_organize_url("organize/editForm", {}) + postData;
-    $.get(url_data, function(data, textStatus) {
-      $("#gOrganizeEditForm").tabs("destroy");
-      $("#gOrganizeEditForm").html(data);
-      if ($("#gOrganizeEditForm ul li").length) {
-        $("#gOrganizeEditForm").tabs();
-        $("#gOrganizeEditHandleButtonsMiddle a").removeAttr("disabled");
-        $("#gOrganizeEditHandleButtonsMiddle a").removeClass("ui-state-disabled");
-      } else {
-        $("#gOrganizeEditHandleButtonsMiddle a").attr("disabled", true);
-        $("#gOrganizeEditHandleButtonsMiddle a").addClass("ui-state-disabled");
-      }
+    $("#gOrganizeDialog #gMicroThumbDone").click(_dialog_close);
+    $("#gOrganizeDialog").bind("organize_close", function(target) {
+      $.gallery_reload();
     });
-  } else {
-    $("#gOrganizeEditForm").tabs("destroy");
-    $("#gOrganizeEditForm").empty();
-  }
-}
-
-function serializeItemIds(selector) {
-  var postData = "";
-  $(selector).each(function(i) {
-    postData += "&item[]=" + $(this).attr("ref");
-  });
-
-  return postData;
-}
 
-function submitCurrentForm(event) {
-  console.log("submitCurrentForm");
-  return false;
-}
+    //$(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
+    //$(".gBranchText").droppable(treeDroppable);
+    //$(".gBranchText").click(organizeOpenFolder);
+    //retrieveMicroThumbs(item_id);
+    //showLoading("#gOrganizeDialog");
 
-function resetCurrentForm(event) {
-  console.log("resetCurrentForm");
-  return false;
-}
+    //$("#gMicroThumbPanel").droppable(thumbDroppable);
+    //$("#gMicroThumbPanel").selectable(selectable);
+    //$("#gOrganizeEditDrawerHandle a").click(drawerHandleButtonsClick);
 
-function createProgressDialog(title) {
-  $("body").append("<div id='gOrganizeProgressDialog'>" +
-      "<div class='gProgressBar'></div>" +
-      "<button id='gOrganizeTaskPause' class='ui-state-default ui-corner-all'>" + PAUSE_BUTTON + "</button>" +
-      "<button id='gOrganizeTaskResume' class='ui-state-default ui-corner-all' style='display: none'>" + RESUME_BUTTON + "</button>" +
-      "<button id='gOrganizeTaskCancel' class='ui-state-default ui-corner-all' style='display: none'>" + CANCEL_BUTTON + "</button>" +
-    "</div>");
-  $("#gOrganizeProgressDialog").dialog({
-    autoOpen: true,
-    autoResize: false,
-    modal: true,
-    resizable: false,
-    title: title
-  });
-
-  $(".gProgressBar").progressbar();
-  $("#gOrganizeTaskPause").click(function(event) {
-    paused = true;
-    $("#gOrganizeTaskPause").hide();
-    $("#gOrganizeTaskResume").show();
-    $("#gOrganizeTaskCancel").show();
-    $("#gMessage").empty().append(task.pauseMsg);
-  });
-  $("#gOrganizeTaskResume").click(function(event) {
-    $("#gOrganizeTaskPause").show();
-    $("#gOrganizeTaskResume").hide();
-    $("#gOrganizeTaskCancel").hide();
-    $("#gMessage").empty().append(task.resumeMsg);
-    operationCallback();
-    //startRearrangeCallback();
-  });
-  $("#gOrganizeTaskCancel").click(function(event) {
-    $("#gOrganizeTaskPause").show();
-    $("#gOrganizeTaskResume").hide();
-    $("#gOrganizeTaskCancel").hide();
+    $(window).bind("resize", _size_dialog);
+  };
 
-    $.ajax({async: false,
-      success: function(data, textStatus) {
-        task = null;
-        paused = false;
-        transitItems = [];
-        $("#gMessage").empty().append("<div class='gWarning'>" + data.task.status + "</div>");
-        $("#gOrganizeProgressDialog").dialog("destroy").remove();
-      },
-      dataType: "json",
-      type: "POST",
-      url: get_organize_url("organize/cancelTask", {task_id: task.id})
-    });
-  });
-}
+  /**
+   * Dynamically initialize the organize dialog when it is displayed
+   */
+  function _size_dialog(event) {
+    var size = $.getViewportSize();
+    var h = $("#gOrganizeDialog").dialog("option", "minHeight");
+    var sh = size.height() - 100;
+    var height  = Math.max(sh, h);
+    var w = $("#gOrganizeDialog").dialog("option", "minWidth");
+    var sw = size.width() - 100;
+    var width = Math.max(w, sw);
+
+    $("#gOrganizeDialog").parent().css("height", height);
+    $("#gOrganizeDialog").parent().css("width", width);
+    $("#gOrganizeDialog").parent().css("left", "50px");
+    $("#gOrganizeDialog").parent().css("top", "50px");
+
+    var heightMicroThumbPanel = height - 50;
+    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
+    heightMicroThumbPanel -= $("#gMessage").outerHeight();
+    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
+    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
+
+    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
+    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
+  };
 
-// **************************************************************************
-// Functions that should probably be in a gallery namespace
-function getViewportSize() {
-  return {
-      width : function() {
-        return window.innerWidth
-          || document.documentElement && document.documentElement.clientWidth
-          || document.body.clientWidth;
-      },
-      height : function() {
-        return window.innerHeight
-          || document.documentElement && document.documentElement.clientHeight
-          || document.body.clientHeight;
-      }
+  function _dialog_close(event) {
+    event.preventDefault();
+    $("#gOrganizeDialog").dialog("close");
   };
-}
 
-function displayAjaxError(error) {
-  $("body").append("<div id=\"gAjaxError\" title=\"" + FATAL_ERROR + "\">" + error + "</div>");
+})(jQuery);
 
-  $("#gAjaxError").dialog({
-    autoOpen: true,
-    autoResize: false,
-    modal: true,
-    resizable: true,
-    width: 610,
-    height: $("#gDialog").height()
-  });
-}
+$("document").ready(function() {
+  $("#gOrganizeLink").organize();
+});
diff --git a/modules/organize/js/organize_init.js b/modules/organize/js/organize_init.js
deleted file mode 100644
index ed036fdb..00000000
--- a/modules/organize/js/organize_init.js
+++ /dev/null
@@ -1,29 +0,0 @@
-$("document").ready(function() {
-  $("#gOrganizeLink").click(function(event) {
-    event.preventDefault();
-    var href = event.target.href;
-
-    $("body").append('<div id="gDialog"></div>');
-
-    $("#gDialog").dialog({
-      autoOpen: false,
-      autoResize: false,
-      modal: true,
-      resizable: false,
-      close: function () {
-        $("#gDialog").trigger("organize_close");
-        $("#gDialog").dialog("destroy").remove();
-      },
-      zIndex: 75
-    });
-
-    //showLoading("#gDialog");
-
-    $.get(href, function(data) {
-      $("#gDialog").html(data);
-    });
-    return false;
-  });
-});
-
-
diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
deleted file mode 100644
index 1686d255..00000000
--- a/modules/organize/views/organize.html.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!-- ?= html::script("modules/organize/js/organize.js") ? -->
-<script>
-  var FATAL_ERROR = "<?= t("Fatal Error") ?>";
-  var PAUSE_BUTTON = "<?= t("Pause") ?>";
-  var RESUME_BUTTON = "<?= t("Resume") ?>";
-  var CANCEL_BUTTON = "<?= t("Cancel") ?>";
-  var INVALID_DROP_TARGET = "<div class=\"gError\"><?= t("Drop cancelled as it would result in a recursive move") ?></div>";
-var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums and/or photos") ?>"
-  var item_id = <?= $item->id ?>;
-
-  var csrf = "<?= $csrf ?>";
-  var rearrangeUrl = "<?= url::site("__URI__/__ITEM_ID____TASK_ID__?csrf=$csrf") ?>";
-  $("#doc3").ready(function() {
-    organize_dialog_init();
-  });
-</script>
-<fieldset style="display: none">
-  <legend><?= t("Organize %name", array("name" => p::purify($item->title))) ?></legend>
-</fieldset>
-<div id="doc3" class="yui-t7">
-  <div id="bd">
-    <div class="yui-gf">
-      <div class="yui-u first">
-        <h3><?= t("Albums") ?></h3>
-      </div>
-      <div id="gMessage" class="yui-u">
-        <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
-      </div>
-    </div>
-    <div class="yui-gf">
-      <div id="gOrganizeTreeContainer" class="yui-u first">
-        <?= $album_tree ?>
-      </div>
-      <div id="gMicroThumbPanel" class="yui-u"
-           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&amp;height=__HEIGHT__&amp;offset=__OFFSET__") ?>">
-        <ul id="gMicroThumbGrid"></ul>
-      </div>
-      <div id="gOrganizeEditDrawer" class="yui-u">
-        <div id="gOrganizeEditDrawerPanel" class="yui-gf">
-          <div id="gOrganizeFormThumbs" class="yui-u first">
-            <ul id="gOrganizeFormThumbStack" />
-          </div>
-          <div id="gOrganizeEditForm">
-          </div>
-        </div>
-        <div id="gOrganizeEditDrawerHandle">
-          <?= $button_pane ?>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/modules/organize/views/organize_album.html.php b/modules/organize/views/organize_album.html.php
deleted file mode 100644
index ae2d5d51..00000000
--- a/modules/organize/views/organize_album.html.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul>
-  <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
-    <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-          class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
-    </span>
-
-    <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
-          class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
-      <?= p::clean($album->title) ?>
-    </div>
-    <div id="gOrganizeChildren-<?= $album->id ?>"
-          class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-      <?= $children ?>
-    <div>
-  </li>
-</ul>
diff --git a/modules/organize/views/organize_button_pane.html.php b/modules/organize/views/organize_button_pane.html.php
index c5839a44..8eced107 100644
--- a/modules/organize/views/organize_button_pane.html.php
+++ b/modules/organize/views/organize_button_pane.html.php
@@ -1,50 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gOrganizeEditHandleButtonsLeft">
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="edit"
-     disabled="1" title="<?= t("Open Drawer") ?>">
-    <span class="ui-icon ui-icon-arrowthickstop-1-n"><?= t("Open Drawer") ?></span>
-  </a>
-
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="close"
-     disabled="1" title="<?= t("Close Drawer") ?>" style="display: none">
-    <span class="ui-icon ui-icon-arrowthickstop-1-s"><?= t("Close Drawer") ?></span>
-  </a>
-
-  <? if (graphics::can("rotate")): ?>
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="rotateCcw"
-     disabled="1" title="<?= t("Rotate 90 degrees counter clockwise") ?>">
-    <span class="ui-icon ui-icon-rotate-ccw"><?= t("Rotate 90 degrees counter clockwise") ?></span>
-  </a>
-
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="rotateCw"
-     disabled="1" title="<?= t("Rotate 90 degrees clockwise") ?>">
-    <span class="ui-icon ui-icon-rotate-cw"> <?= t("Rotate 90 degrees clockwise") ?></span>
-  </a>
-  <? endif ?>
-
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="albumCover"
-     disabled="1" title="<?= t("Choose this photo as the album cover") ?>">
-    <span class="ui-icon ui-icon-star"><?= t("Choose this photo as the album cover") ?></span>
-  </a>
-
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="delete"
-     disabled="1" title="<?= t("Delete selection") ?>">
-    <span class="ui-icon ui-icon-trash"><?= t("Delete selection") ?></span>
-  </a>
-</div>
-<div id="gOrganizeEditHandleButtonsMiddle">
-  <a class="gButtonLink ui-corner-all ui-state-default" href="#" ref="submit"
-     title="<?= t("Apply Changes") ?>" style="display: none" >
-    <span class="ui-icon ui-icon-check"><?= t("Apply Changes") ?></span>
-  </a>
-
-  <a class="gButtonLink ui-corner-all ui-state-default" href="#" ref="reset"
-     title="<?= t("Reset Form") ?>" style="display: none" >
-    <span class="ui-icon ui-icon-closethick"><?= t("Reset Form") ?></span>
-  </a>
-</div>
 <div id="gOrganizeEditHandleButtonsRight">
-  <a id="gMicroThumbSelectAll" href="#" ref="select-all" class="gButtonLink ui-corner-all ui-state-default"><?= t("Select all") ?></a>
-  <a id="gMicroThumbUnselectAll" href="#" ref="unselect-all" style="display: none" class="gButtonLink ui-corner-all ui-state-default"><?= t("Deselect all") ?></a>
-  <a id="gMicroThumbDone" href="#" ref="done" class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
+  <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
new file mode 100644
index 00000000..cf3fd478
--- /dev/null
+++ b/modules/organize/views/organize_dialog.html.php
@@ -0,0 +1,37 @@
+<?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>
+  <div id="bd">
+    <div class="yui-gf">
+      <div class="yui-u first">
+        <h3><?= t("Albums") ?></h3>
+      </div>
+      <div id="gMessage" class="yui-u">
+        <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
+      </div>
+    </div>
+    <div class="yui-gf">
+      <div id="gOrganizeTreeContainer" class="yui-u first">
+        <ul id="gOrganizeAlbumTree">
+          <?= $album_tree ?>
+        </ul>
+      </div>
+      <div id="gOrganizeDetail" class="yui-u">
+        <div id="gMicroThumbPanel"
+           ref="<?= url::site("organize/content/__ITEM_ID__/__OFFSET__") ?>">
+          <ul id="gMicroThumbGrid">
+            <?= $micro_thumb_grid ?>
+          </ul>
+        </div>
+        <div id="gOrganizeEditDrawer" class="yui-u">
+          <div id="gOrganizeEditDrawerPanel" class="yui-gf">
+          </div>
+          <div id="gOrganizeEditDrawerHandle">
+            <?= $button_pane ?>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/modules/organize/views/organize_edit.html.php b/modules/organize/views/organize_edit.html.php
deleted file mode 100644
index 1adf290f..00000000
--- a/modules/organize/views/organize_edit.html.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul>
-<? foreach ($panes as $idx => $pane): ?>
-  <li><a href="#pane-<?= $idx ?>"><?= $pane["label"] ?></a></li>
-<? endforeach?>
-</ul>
-
-<? if (count($panes) > 0): ?>
-  <? foreach ($panes as $idx => $pane): ?>
-    <div id="pane-<?= $idx ?>" class="gOrganizeEditPane ui-tabs-hide"><?= $pane["content"] ?></div>
-  <? endforeach?>
-<? else: ?>
-<div class="gWarning"><?= t("No Edit pages apply to the selected items") ?></div>
-<? endif ?>
\ No newline at end of file
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index c80696ad..e6b7aec0 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,12 +1,19 @@
 <?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 ?>">
+  <? $item_class = "gPhoto"; ?>
+  <? if ($child->is_album()): ?>
+    <? $item_class = "gAlbum"; ?>
+  <? endif ?>
+  <li id="gMicroThumb_<?= $child->id ?>" class="gMicroThumb  <?= $item_class ?>" ref="<?= $child->id ?>">
     <?= $child->thumb_img(array("class" => "gThumbnail"), $thumbsize, true) ?>
-  </div>
-</li>
+  </li>
 <? endforeach ?>
+<? if (count($children) >= 25): ?>
+<script>
+   $.get("<?= url::site("organize/content/{$item_id}/$offset") ?>",
+     function(data) {
+       $("#gMicroThumbGrid").append(data);
+     }
+   );
+</script>
+<? endif ?>
\ No newline at end of file
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index d2cdd957..28b45be0 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,4 +1,20 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($children as $i => $child): ?>
-<? endforeach ?>
+<li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
+  <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
+        class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
+  </span>
+
+  <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
+       class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
+    <?= 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" : "" ?>">
+      <?= $children ?>
+    </ul>
+  <? endif ?>
+</li>
 
-- 
cgit v1.2.3


From 869c3de9612a598dae0ce400991bdbe173a2decc Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 08:31:58 -0700
Subject: Enable the expand/collapse of branches by clicking on the plus/minus
 icons.  Branches with no albums, will not have an icon.

---
 modules/organize/controllers/organize.php       | 59 ++++++++++++++++---------
 modules/organize/css/organize.css               |  8 ++++
 modules/organize/js/organize.js                 | 28 +++++++++++-
 modules/organize/views/organize_dialog.html.php |  2 +-
 modules/organize/views/organize_tree.html.php   | 10 +++--
 5 files changed, 80 insertions(+), 27 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index d7854c53..e10e33b5 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -50,6 +50,27 @@ class Organize_Controller extends Controller {
     print $v->__toString();
   }
 
+  function children($item_id) {
+    $item = ORM::factory("item", $item_id);
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    $albums = $item->children(null, 0, "album", array("title" => "ASC"));
+
+    $children = "";
+    foreach ($albums as $album) {
+      $v = new View("organize_tree.html");
+      $v->album = $album;
+      $v->selected = false;
+      $v->children = array();
+      $v->album_icon = $album->children_count("album") ? "ui-icon-plus" : "gBranchEmpty";
+
+      $children .= $v->__toString();
+    }
+
+    print $children;
+  }
+
   private function _get_micro_thumb_grid($item, $offset=0) {
     $v = new View("organize_thumb_grid.html");
     $v->item_id = $item->id;
@@ -60,34 +81,30 @@ class Organize_Controller extends Controller {
     return $v;
   }
 
-  private function _tree($item, $parent, $selected=false) {
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $albums = ORM::factory("item")
-      ->where(array("parent_id" => $parent->id, "type" => "album"))
-      ->orderby(array("title" => "ASC"))
-      ->find_all();
+  private function _tree($item, $parent, $depth=0) {
+    $albums = $parent->children(null, 0, "album", array("title" => "ASC"));
 
     $v = new View("organize_tree.html");
     $v->album = $parent;
 
-    $v->selected = false;
-    $v->children = "";
-    $v->album_icon = "ui-icon-plus";
-    if (!$selected) {
-      $v->selected = $parent->id == $item->id;
+    if ($parent->id == $item->id) {
+      $v->selected = true;
+      $depth = 1;
+    } else {
+      $v->selected = false;
+    }
+    $v->children = array();
+    $v->album_icon = "gBranchEmpty";
+    if ($albums->count()) {
+      $v->album_icon = "ui-icon-plus";
 
-      if ($albums->count() && ($parent->id == 1 || $v->selected) ) {
+      if ($depth <= 1) {
         $v->album_icon = "ui-icon-minus";
-      }
-
-      foreach ($albums as $album) {
-        $v->children .= $this->_tree($item, $album, $v->selected);
+        foreach ($albums as $album) {
+          $v->children[] = $this->_tree($item, $album, ++$depth);
+        }
       }
     }
-    return $v->__toString();
+    return $v;
   }
-
-
 }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4568a707..7c2d9c5b 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -41,6 +41,14 @@
   padding-left: 1.2em;
 }
 
+.gBranchText:hover {
+  border: 1px dashed #999;
+}
+
+.gBranchEmpty {
+  visibility: hidden;
+}
+
 .gBranchSelected {
   background-color: #cfdeff !important;
   border-bottom: 1px solid #999 !important;
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index e84afd03..74b02569 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -37,7 +37,6 @@
    * Dynamically initialize the organize dialog when it is displayed
    */
   function _init(data) {
-
     // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
     $(".sf-menu li.sfHover ul").css("z-index", 70);
 
@@ -64,6 +63,8 @@
       $.gallery_reload();
     });
 
+    $(".gBranchText span").click(_collapse_or_expanded_tree);
+
     //$(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
     //$(".gBranchText").droppable(treeDroppable);
     //$(".gBranchText").click(organizeOpenFolder);
@@ -109,6 +110,31 @@
     $("#gOrganizeDialog").dialog("close");
   };
 
+  /**
+   * Open or close a branch. If the children is a div placeholder, replace with <ul>
+   */
+  function _collapse_or_expanded_tree(event) {
+    var id = $(event.currentTarget).attr("ref");
+    if ($(event.currentTarget).hasClass("ui-icon-minus")) {
+      $(event.currentTarget).removeClass("ui-icon-minus");
+      $(event.currentTarget).addClass("ui-icon-plus");
+      $("#gOrganizeChildren-" + id).hide();
+    } else {
+      if ($("#gOrganizeChildren-" + id).is("div")) {
+        $("#gOrganizeChildren-" + id).remove();
+        $("#gOrganizeBranch-" + id).after("<ul id=\"gOrganizeChildren-" + id + "></ul>");
+        var url = $("#gOrganizeAlbumTree").attr("ref").replace("__ITEM_ID__", id);
+        $.get(url, function(data) {
+          $("#gOrganizeChildren-" + id).html(data);
+          $(".gBranchText span").click(_collapse_or_expanded_tree);
+        });;
+      }
+      $("#gOrganizeChildren-" + id).show();
+      $(event.currentTarget).removeClass("ui-icon-plus");
+      $(event.currentTarget).addClass("ui-icon-minus");
+    }
+  }
+
 })(jQuery);
 
 $("document").ready(function() {
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index cf3fd478..1e6646e4 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -12,7 +12,7 @@
     </div>
     <div class="yui-gf">
       <div id="gOrganizeTreeContainer" class="yui-u first">
-        <ul id="gOrganizeAlbumTree">
+        <ul id="gOrganizeAlbumTree" ref="<?= url::site("organize/children/__ITEM_ID__") ?>">
           <?= $album_tree ?>
         </ul>
       </div>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 28b45be0..d64410d8 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
-  <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-        class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
-  </span>
 
   <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
        class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
+    <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
+          class="ui-icon <?= $album_icon ?>">
+    </span>
     <?= p::clean($album->title) ?>
   </div>
   <? if (empty($children)): ?>
@@ -13,7 +13,9 @@
   <? else: ?>
     <ul id="gOrganizeChildren-<?= $album->id ?>"
        class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-      <?= $children ?>
+      <? foreach ($children as $child): ?>
+        <?= $child ?>
+      <? endforeach ?>
     </ul>
   <? endif ?>
 </li>
-- 
cgit v1.2.3


From e37526f94df74a52a9cf36f0a5a5e641958ebbb3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 09:23:01 -0700
Subject: Revert "Enable the expand/collapse of branches by clicking on the
 plus/minus"

This reverts commit 869c3de9612a598dae0ce400991bdbe173a2decc.
---
 modules/organize/controllers/organize.php       | 59 +++++++++----------------
 modules/organize/css/organize.css               |  8 ----
 modules/organize/js/organize.js                 | 28 +-----------
 modules/organize/views/organize_dialog.html.php |  2 +-
 modules/organize/views/organize_tree.html.php   | 10 ++---
 5 files changed, 27 insertions(+), 80 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index e10e33b5..d7854c53 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -50,27 +50,6 @@ class Organize_Controller extends Controller {
     print $v->__toString();
   }
 
-  function children($item_id) {
-    $item = ORM::factory("item", $item_id);
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $albums = $item->children(null, 0, "album", array("title" => "ASC"));
-
-    $children = "";
-    foreach ($albums as $album) {
-      $v = new View("organize_tree.html");
-      $v->album = $album;
-      $v->selected = false;
-      $v->children = array();
-      $v->album_icon = $album->children_count("album") ? "ui-icon-plus" : "gBranchEmpty";
-
-      $children .= $v->__toString();
-    }
-
-    print $children;
-  }
-
   private function _get_micro_thumb_grid($item, $offset=0) {
     $v = new View("organize_thumb_grid.html");
     $v->item_id = $item->id;
@@ -81,30 +60,34 @@ class Organize_Controller extends Controller {
     return $v;
   }
 
-  private function _tree($item, $parent, $depth=0) {
-    $albums = $parent->children(null, 0, "album", array("title" => "ASC"));
+  private function _tree($item, $parent, $selected=false) {
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    $albums = ORM::factory("item")
+      ->where(array("parent_id" => $parent->id, "type" => "album"))
+      ->orderby(array("title" => "ASC"))
+      ->find_all();
 
     $v = new View("organize_tree.html");
     $v->album = $parent;
 
-    if ($parent->id == $item->id) {
-      $v->selected = true;
-      $depth = 1;
-    } else {
-      $v->selected = false;
-    }
-    $v->children = array();
-    $v->album_icon = "gBranchEmpty";
-    if ($albums->count()) {
-      $v->album_icon = "ui-icon-plus";
+    $v->selected = false;
+    $v->children = "";
+    $v->album_icon = "ui-icon-plus";
+    if (!$selected) {
+      $v->selected = $parent->id == $item->id;
 
-      if ($depth <= 1) {
+      if ($albums->count() && ($parent->id == 1 || $v->selected) ) {
         $v->album_icon = "ui-icon-minus";
-        foreach ($albums as $album) {
-          $v->children[] = $this->_tree($item, $album, ++$depth);
-        }
+      }
+
+      foreach ($albums as $album) {
+        $v->children .= $this->_tree($item, $album, $v->selected);
       }
     }
-    return $v;
+    return $v->__toString();
   }
+
+
 }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 7c2d9c5b..4568a707 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -41,14 +41,6 @@
   padding-left: 1.2em;
 }
 
-.gBranchText:hover {
-  border: 1px dashed #999;
-}
-
-.gBranchEmpty {
-  visibility: hidden;
-}
-
 .gBranchSelected {
   background-color: #cfdeff !important;
   border-bottom: 1px solid #999 !important;
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 74b02569..e84afd03 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -37,6 +37,7 @@
    * Dynamically initialize the organize dialog when it is displayed
    */
   function _init(data) {
+
     // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
     $(".sf-menu li.sfHover ul").css("z-index", 70);
 
@@ -63,8 +64,6 @@
       $.gallery_reload();
     });
 
-    $(".gBranchText span").click(_collapse_or_expanded_tree);
-
     //$(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
     //$(".gBranchText").droppable(treeDroppable);
     //$(".gBranchText").click(organizeOpenFolder);
@@ -110,31 +109,6 @@
     $("#gOrganizeDialog").dialog("close");
   };
 
-  /**
-   * Open or close a branch. If the children is a div placeholder, replace with <ul>
-   */
-  function _collapse_or_expanded_tree(event) {
-    var id = $(event.currentTarget).attr("ref");
-    if ($(event.currentTarget).hasClass("ui-icon-minus")) {
-      $(event.currentTarget).removeClass("ui-icon-minus");
-      $(event.currentTarget).addClass("ui-icon-plus");
-      $("#gOrganizeChildren-" + id).hide();
-    } else {
-      if ($("#gOrganizeChildren-" + id).is("div")) {
-        $("#gOrganizeChildren-" + id).remove();
-        $("#gOrganizeBranch-" + id).after("<ul id=\"gOrganizeChildren-" + id + "></ul>");
-        var url = $("#gOrganizeAlbumTree").attr("ref").replace("__ITEM_ID__", id);
-        $.get(url, function(data) {
-          $("#gOrganizeChildren-" + id).html(data);
-          $(".gBranchText span").click(_collapse_or_expanded_tree);
-        });;
-      }
-      $("#gOrganizeChildren-" + id).show();
-      $(event.currentTarget).removeClass("ui-icon-plus");
-      $(event.currentTarget).addClass("ui-icon-minus");
-    }
-  }
-
 })(jQuery);
 
 $("document").ready(function() {
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 1e6646e4..cf3fd478 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -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>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index d64410d8..28b45be0 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
+  <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
+        class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
+  </span>
 
   <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
        class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
-    <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-          class="ui-icon <?= $album_icon ?>">
-    </span>
     <?= p::clean($album->title) ?>
   </div>
   <? if (empty($children)): ?>
@@ -13,9 +13,7 @@
   <? else: ?>
     <ul id="gOrganizeChildren-<?= $album->id ?>"
        class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-      <? foreach ($children as $child): ?>
-        <?= $child ?>
-      <? endforeach ?>
+      <?= $children ?>
     </ul>
   <? endif ?>
 </li>
-- 
cgit v1.2.3


From 397468c47b8fc3fefeb54ff19a73980ed1dd8c20 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 09:23:32 -0700
Subject: Revert "Checkpoint the organize module rewrite.  At this point, it
 doesn't really do"

This reverts commit a25f08d433d504a53763feb358a1aa7f5f798de6.
---
 modules/organize/controllers/organize.php          | 507 ++++++++++++++-
 modules/organize/css/organize.css                  | 184 +++++-
 modules/organize/helpers/organize_task.php         | 131 ++++
 modules/organize/helpers/organize_theme.php        |   3 +-
 modules/organize/js/organize.js                    | 697 ++++++++++++++++++---
 modules/organize/js/organize_init.js               |  29 +
 modules/organize/views/organize.html.php           |  53 ++
 modules/organize/views/organize_album.html.php     |  17 +
 .../organize/views/organize_button_pane.html.php   |  49 +-
 modules/organize/views/organize_dialog.html.php    |  37 --
 modules/organize/views/organize_edit.html.php      |  14 +
 .../organize/views/organize_thumb_grid.html.php    |  23 +-
 modules/organize/views/organize_tree.html.php      |  20 +-
 13 files changed, 1532 insertions(+), 232 deletions(-)
 create mode 100644 modules/organize/helpers/organize_task.php
 create mode 100644 modules/organize/js/organize_init.js
 create mode 100644 modules/organize/views/organize.html.php
 create mode 100644 modules/organize/views/organize_album.html.php
 delete mode 100644 modules/organize/views/organize_dialog.html.php
 create mode 100644 modules/organize/views/organize_edit.html.php

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index d7854c53..898be509 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -19,48 +19,54 @@
  */
 class Organize_Controller extends Controller {
   private static $_MICRO_THUMB_SIZE = 90;
-  private static $_MICRO_THUMB_PADDING = 10;
+  private static $_MICRO_THUMB_PADDING = 5;
 
-  function index($item_id) {
+  function index($item_id=1) {
     $item = ORM::factory("item", $item_id);
     $root = ($item->id == 1) ? $item : ORM::factory("item", 1);
     access::required("view", $item);
     access::required("edit", $item);
 
-    $v = new View("organize_dialog.html");
+    $v = new View("organize.html");
     $v->root = $root;
     $v->item = $item;
-    $v->album_tree = $this->_tree($item, $root);
-    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item);
+    $v->album_tree = $this->tree($item, $root);
     $v->button_pane = new View("organize_button_pane.html");
-    $buttons = (object)array("left" => array(), "middle" =>array(), "right" => array(),
-                             "item" => $item);
-    module::event("organize_format_button_pane", $buttons);
-
-    $v->button_pane->buttons = $buttons;
     print $v;
   }
 
-  function content($item_id, $offset=0) {
+  function content($item_id) {
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
     access::required("edit", $item);
 
-    $v = $this->_get_micro_thumb_grid($item, $offset);
-    print $v->__toString();
-  }
+    $width = $this->input->get("width");
+    $height = $this->input->get("height");
+    $offset = $this->input->get("offset", 0);
+    $thumbsize = self::$_MICRO_THUMB_SIZE + 2 * self::$_MICRO_THUMB_PADDING;
+    $page_size = ceil($width / $thumbsize) * ceil($height / $thumbsize);
 
-  private function _get_micro_thumb_grid($item, $offset=0) {
     $v = new View("organize_thumb_grid.html");
-    $v->item_id = $item->id;
-    $v->children = $item->children(25, $offset);
+    $v->children = $item->children($page_size, $offset);
     $v->thumbsize = self::$_MICRO_THUMB_SIZE;
-    $v->offset = $offset + 25;
+    $v->padding = self::$_MICRO_THUMB_PADDING;
+    $v->offset = $offset;
+
+    print json_encode(array("count" => $v->children->count(),
+                            "data" => $v->__toString()));
+  }
+
+  function header($item_id) {
+    $item = ORM::factory("item", $item_id);
+    access::required("view", $item);
+    access::required("edit", $item);
 
-    return $v;
+    print json_encode(
+      array("title" => p::purify($item->title),
+            "description" => empty($item->description) ? "" : p::purify($item->description)));
   }
 
-  private function _tree($item, $parent, $selected=false) {
+  function tree($item, $parent) {
     access::required("view", $item);
     access::required("edit", $item);
 
@@ -69,25 +75,466 @@ class Organize_Controller extends Controller {
       ->orderby(array("title" => "ASC"))
       ->find_all();
 
-    $v = new View("organize_tree.html");
+    $v = new View("organize_album.html");
     $v->album = $parent;
+    $v->selected = $parent->id == $item->id;
+
+    if ($albums->count()) {
+      $v->album_icon = $parent->id == 1 || $v->selected ? "ui-icon-minus" : "ui-icon-plus";
+    } else {
+      $v->album_icon = "";
+    }
 
-    $v->selected = false;
     $v->children = "";
-    $v->album_icon = "ui-icon-plus";
-    if (!$selected) {
-      $v->selected = $parent->id == $item->id;
+    foreach ($albums as $album) {
+      $v->children .= $this->tree($item, $album);
+    }
+    return $v->__toString();
+  }
+
+  function startTask($operation, $id) {
+    access::verify_csrf();
+    $items = $this->input->post("item");
+
+    $item = ORM::factory("item", $id);
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    $definition = $this->_getOperationDefinition($item, $operation);
+
+    $task_def = Task_Definition::factory()
+      ->callback("organize_task::run")
+      ->description($definition["description"])
+      ->name($definition["name"]);
+    $task = task::create($task_def, array("items" => $items, "position" => 0, "target" => $id,
+                                          "type" => $definition["type"],
+                                          "batch" => ceil(count($items) * .1)));
+    // @todo If there is only one item then call task_run($task->id); Maybe even change js so
+    // we can call finish as well.
+    batch::start();
+    print json_encode(
+      array("result" => "started",
+            "runningMsg" => $definition["runningMsg"],
+            "pauseMsg" => "<div class=\"gWarning\">{$definition['pauseMsg']}</div>",
+            "resumeMsg" => "<div class=\"gWarning\">{$definition['resumeMsg']}</div>",
+            "task" => array("id" => $task->id,
+                            "percent_complete" => $task->percent_complete,
+                            "type" => $task->get("type"),
+                            "status" => $task->status,
+                            "state" => $task->state,
+                            "done" => $task->done)));
+  }
+
+  function runTask($task_id) {
+    access::verify_csrf();
+
+    $task = task::run($task_id);
+    if (!$task->loaded || $task->owner_id != user::active()->id) {
+      access::forbidden();
+    }
+
+    print json_encode(array("result" => $task->done ? $task->state : "in_progress",
+                            "task" => array("id" => $task->id,
+                                            "percent_complete" => $task->percent_complete,
+                                            "type" => $task->get("type"),
+                                            "post_process" => $task->get("post_process"),
+                                            "status" => $task->status,
+                                            "state" => $task->state,
+                                            "done" => $task->done)));
+  }
+
+  function finishTask($task_id) {
+    access::verify_csrf();
+
+    $task = ORM::factory("task", $task_id);
+    if (!$task->loaded || $task->owner_id != user::active()->id) {
+      access::forbidden();
+    }
 
-      if ($albums->count() && ($parent->id == 1 || $v->selected) ) {
-        $v->album_icon = "ui-icon-minus";
+    if ($task->done) {
+      $item = ORM::factory("item", (int)$task->get("target"));
+      $type = $task->get("type");
+      switch ($type) {
+      case "albumCover":
+        $task->status = t("Album cover set for '%album'", array("album" => $item->title));
+        break;
+      case "delete":
+        $task->status = t("Selection deleted");
+        break;
+      case "move":
+        $task->status = t("Move to '%album' completed", array("album" => $item->title));
+        break;
+      case "rearrange":
+        try {
+          $item->sort_column = "weight";
+          $item->save();
+          $task->status = t("Rearrange for '%album' completed", array("album" => $item->title));
+        } catch (Exception $e) {
+          $task->state = "error";
+          $task->status = $e->getMessage();
+        }
+        break;
+      case "rotateCcw":
+      case "rotateCw":
+        $task->status = t("Rotation completed");
+        break;
       }
+      $task->save();
+   }
 
-      foreach ($albums as $album) {
-        $v->children .= $this->_tree($item, $album, $v->selected);
+    batch::stop();
+    print json_encode(array("result" => "success",
+                            "task" => array(
+                              "id" => $task->id,
+                              "percent_complete" => $task->percent_complete,
+                              "status" => $task->status,
+                              "state" => $task->state,
+                              "done" => $task->done)));
+  }
+
+  function cancelTask($task_id) {
+    access::verify_csrf();
+
+    $task = ORM::factory("task", $task_id);
+    if (!$task->loaded || $task->owner_id != user::active()->id) {
+      access::forbidden();
+    }
+
+    if (!$task->done) {
+      $task->done = 1;
+      $task->state = "cancelled";
+      $type = $task->get("type");
+      switch ($type) {
+      case "move":
+        $task->status = t("Move to album was cancelled prior to completion");
+        break;
+      case "rearrange":
+         $task->status = t("Rearrange album was cancelled prior to completion");
+      case "rotateCcw":
+      case "rotateCw":
+        $task->status = t("Rotation was cancelled prior to completion");
+        break;
       }
+      $task->save();
     }
-    return $v->__toString();
+
+    batch::stop();
+    print json_encode(array("result" => "success",
+                            "task" => array(
+                              "id" => $task->id,
+                              "percent_complete" => $task->percent_complete,
+                              "status" => $task->status,
+                              "state" => $task->state,
+                              "done" => $task->done)));
+  }
+
+  function editForm() {
+    $event_parms = new stdClass();
+    $event_parms->panes = array();
+    $event_parms->itemids = $this->input->get("item");
+
+    // The following code should be done more dynamically i.e. use the event mechanism
+    if (count($event_parms->itemids) == 1) {
+      $item = ORM::factory("item")
+        ->in("id", $event_parms->itemids[0])
+        ->find();
+
+      access::required("view", $item);
+      access::required("edit", $item);
+
+      $event_parms->panes[] = array(
+        "label" => $item->is_album() ? t("Edit Album") : t("Edit Photo"),
+        "content" => organize::get_general_edit_form($item));
+
+      if ($item->is_album()) {
+        $event_parms->panes[] = array("label" => t("Sort Order"),
+                                      "content" => organize::get_sort_edit_form($item));
+      }
+    }
+
+    $event_parms->panes[] = array("label" => t("Manage Tags"),
+                                  "content" => organize::get_tag_form($event_parms->itemids));
+
+    $v = new View("organize_edit.html");
+    $v->panes = $event_parms->panes;
+    print $v->render();
+  }
+
+  // Handlers for the album/photo edit.  Probably should be in modules/gallery
+  public function general() {
+    access::verify_csrf();
+
+    $itemids = $this->input->post("item");
+    $item = ORM::factory("item")
+      ->in("id", $itemids[0])
+      ->find();
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    $form = organize::get_general_edit_form($item);
+    if ($form->validate()) {
+      $orig = clone $item;
+      $item->title = $form->title->value;
+      $item->description = $form->description->value;
+      $item->rename($form->dirname->value);
+      $item->save();
+
+      if ($item->is_album()) {
+        log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
+        $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
+      } else {
+        log::success("content", "Updated photo", "<a href=\"photos/$item->id\">view</a>");
+        $message = t("Saved photo %photo_title", array("photo_title" => p::purify($item->title)));
+      }
+      print json_encode(array("form" => $form->__toString(), "message" => $message));
+    } else {
+      print json_encode(array("form" => $form->__toString()));
+    }
+  }
+
+  public function reset_general() {
+    $itemids = Input::instance()->get("item");
+    $item = ORM::factory("item")
+      ->in("id", $itemids[0])
+      ->find();
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    print organize::get_general_edit_form($item);
+  }
+
+  public function sort() {
+    access::verify_csrf();
+
+    $itemids = $this->input->post("item");
+    $item = ORM::factory("item")
+      ->in("id", $itemids[0])
+      ->find();
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    $form = organize::get_sort_edit_form($item);
+    if ($form->validate()) {
+      $orig = clone $item;
+      $item->sort_column = $form->column->value;
+      $item->sort_order = $form->direction->value;
+      $item->save();
+
+      log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
+      $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
+      print json_encode(array("form" => $form->__toString(), "message" => $message));
+    } else {
+      print json_encode(array("form" => $form->__toString()));
+    }
+  }
+
+  public function reset_sort() {
+    $itemids = Input::instance()->get("item");
+    $item = ORM::factory("item")
+      ->in("id", $itemids[0])
+      ->find();
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    print organize::get_sort_edit_form($item);
+  }
+
+  public function edit_tags() {
+    access::verify_csrf();
+
+    $itemids = explode("|", $this->input->post("item"));
+    $form = organize::get_tag_form($itemids);
+    $old_tags = $form->tags->value;
+    if ($form->validate()) {
+
+      $old_tags = preg_split("/[;,\s]+/", $old_tags);
+      sort($old_tags);
+      $new_tags = preg_split("/[;,\s]+/", $form->tags->value);
+      sort($new_tags);
+
+      $HIGH_VALUE_STRING = "\256";
+      for ($old_index = $new_index = 0;;) {
+        $old_tag = $old_index >= count($old_tags) ? $HIGH_VALUE_STRING : $old_tags[$old_index];
+        $new_tag = $new_index >= count($new_tags) ? $HIGH_VALUE_STRING : $new_tags[$new_index];
+        if ($old_tag == $HIGH_VALUE_STRING && $new_tag == $HIGH_VALUE_STRING) {
+          break;
+        }
+        $matches = array();
+        $old_star = false;
+        if (preg_match("/(.*)(\*)$/", $old_tag, $matches)) {
+          $old_star = true;
+          $old_tag = $matches[1];
+        }
+        $new_star = false;
+        if (preg_match("/(.*)(\*)$/", $new_tag, $matches)) {
+          $new_star = true;
+          $new_tag = $matches[1];
+        }
+        if ($old_tag > $new_tag) {
+          // Its missing in the old list so add it
+          $this->_add_tag($new_tag, $itemids);
+          $new_index++;
+        } else if ($old_tag < $new_tag) {
+          // Its missing in the new list so its been removed
+          $this->_delete_tag($old_tag, $itemids);
+          $old_index++;
+        } else {
+          if ($old_star && !$new_star) {
+            // User wants tag to apply to all items, originally only on some of selected
+            $this->_update_tag($old_tag, $itemids);
+          } // Not changed ignore
+          $old_index++;
+          $new_index++;
+        }
+      }
+    }
+    print json_encode(array("form" => $form->__toString(), "message" => t("Tags updated")));
   }
 
+  public function reset_edit_tags() {
+    $itemids = $this->input->get("item");
+
+    print organize::get_tag_form($itemids);
+  }
+
+  private function _add_tag($new_tag, $itemids) {
+    // Super lame security stopgap.  This code is going to get rewritten anyway.
+    foreach ($itemids as $item_id) {
+      $item = ORM::factory("item", $item_id);
+      access::required("view", $item);
+      access::required("edit", $item);
+    }
 
+    $tag = ORM::factory("tag")
+      ->where("name", $new_tag)
+      ->find();
+    if ($tag->loaded) {
+      $tag->count += count($itemids);
+    } else {
+      $tag->name = $new_tag;
+      $tag->count = count($itemids);
+    }
+    $tag->save();
+
+    $db = Database::instance();
+    foreach ($itemids as $item_id) {
+      $db->query("INSERT INTO {items_tags} SET item_id = $item_id, tag_id = {$tag->id};");
+    }
+  }
+
+  private function _delete_tag($new_tag, $itemids) {
+    // Super lame security stopgap.  This code is going to get rewritten anyway.
+    foreach ($itemids as $item_id) {
+      $item = ORM::factory("item", $item_id);
+      access::required("view", $item);
+      access::required("edit", $item);
+    }
+
+    $tag = ORM::factory("tag")
+      ->where("name", $new_tag)
+      ->find();
+    $tag->count -= count($itemids);
+    if ($tag->count > 0) {
+      $tag->save();
+    } else {
+      $tag->delete();
+    }
+
+    $ids = implode(", ", $itemids);
+    Database::instance()->query(
+      "DELETE FROM {items_tags} WHERE tag_id = {$tag->id} AND item_id IN ($ids);");
+  }
+
+  private function _update_tag($new_tag, $itemids) {
+    // Super lame security stopgap.  This code is going to get rewritten anyway.
+    foreach ($itemids as $item_id) {
+      $item = ORM::factory("item", $item_id);
+      access::required("view", $item);
+      access::required("edit", $item);
+    }
+
+    $tag = ORM::factory("tag")
+      ->where("name", $new_tag)
+      ->find();
+
+    $db = Database::instance();
+    $ids = implode(", ", $itemids);
+    $result = $db->query(
+      "SELECT item_id FROM {items_tags}
+        WHERE tag_id = {$tag->id}
+          AND item_id IN ($ids)");
+
+    $add_items = array_fill_keys($itemids, 1);
+    foreach($result as $row) {
+      unset($add_items[$row->item_id]);
+    }
+    $add_items = array_keys($add_items);
+    $tag->count += count($add_items);
+    $tag->save();
+    foreach ($add_items as $item_id) {
+      $db->query("INSERT INTO {items_tags} SET item_id = $item_id, tag_id = {$tag->id};");
+    }
+  }
+
+  private function _getOperationDefinition($item, $operation) {
+    switch ($operation) {
+    case "move":
+      return array("description" =>
+                     t("Move albums and photos to '%name'", array("name" => $item->title)),
+                   "name" => t("Move to '%name'", array("name" => $item->title)),
+                   "type" => "move",
+                   "runningMsg" => t("Move in progress"),
+                   "pauseMsg" => t("The move operation was paused"),
+                   "resumeMsg" => t("The move operation was resumed"));
+      break;
+
+    case "rearrange":
+      return array("description" => t("Rearrange the order of albums and photos"),
+                   "name" => t("Rearrange: %name", array("name" => $item->title)),
+                   "type" => "rearrange",
+                   "runningMsg" => t("Rearrange in progress"),
+                   "pauseMsg" => t("The rearrange operation was paused"),
+                   "resumeMsg" => t("The rearrange operation was resumed"));
+      break;
+
+    case "rotateCcw":
+      return array("description" => t("Rotate the selected photos counter clockwise"),
+                   "name" => t("Rotate images in %name", array("name" => $item->title)),
+                   "type" => "rotateCcw",
+                   "runningMsg" => t("Rotate Counter Clockwise in progress"),
+                   "pauseMsg" => t("The rotate operation was paused"),
+                   "resumeMsg" => t("The rotate operation was resumed"));
+      break;
+
+    case "rotateCw":
+      return array("description" => t("Rotate the selected photos clockwise"),
+                   "name" => t("Rotate images in %name", array("name" => $item->title)),
+                   "type" => "rotateCw",
+                   "runningMsg" => t("Rotate Clockwise in progress"),
+                   "pauseMsg" => t("The rotate operation was paused"),
+                   "resumeMsg" => t("The rotate operation was resumed"));
+      break;
+
+    case "delete":
+      return array("description" => t("Delete selected photos / albums"),
+                   "name" => t("Delete images in %name", array("name" => $item->title)),
+                   "type" => "delete",
+                   "runningMsg" => t("Delete images in progress"),
+                   "pauseMsg" => t("The delete operation was paused"),
+                   "resumeMsg" => t("The delete operation was resumed"));
+      break;
+
+    case "albumCover":
+      return array("description" => t("Reset Album Cover"),
+                   "name" => t("Reset Album cover for %name", array("name" => $item->title)),
+                   "type" => "albumCover",
+                   "runningMsg" => t("Reset Album Cover in progress"),
+                   "pauseMsg" => t("Reset album cover was paused"),
+                   "resumeMsg" => t("Reset album cover was resumed"));
+      break;
+
+    default:
+      throw new Exception("Operation '$operation' is not implmented");
+    }
+  }
 }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4568a707..e58cd5a5 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,44 +1,41 @@
+/* @todo move to theme css */
 /*******************************************************************
  * Dialog wide stylings
  */
-#gOrganizeDialog {
-  text-align: left;
-}
-
-#gOrganize {
-  overflow: hidden;
+#gMessage {
+  margin-bottom: .4em;
 }
 
-#gOrganize .yui-u {
-  width: 75%;
+#gMessage .gInfo {
+  background-color: transparent;
+  background-image: none;
+  padding-left: .4em;
 }
 
-#gOrganize .yui-gf .first {
-  width: 25%;
+#gOrganizeProgressDialog {
+  text-align: left;
 }
 
-#gOrganize .yui-gf #gMessage {
-  margin-bottom: .4em;
-  width: 75%;
+#gDialog .yui-gf div.first {
+  width: 20%;
 }
 
-#gMessage .gInfo {
-  font-weight: bold;
-  padding-left: 2em;
+#gDialog .yui-gf .yui-u {
+  width: 80%;
 }
 
-
 /*******************************************************************
  * Album Tree styling
  */
 #gOrganizeTreeContainer {
-  overflow: auto;
+  overflow-y: auto;
   margin: 0 !important;
   padding: 0 !important;
 }
 
-#gOrganizeTreeContainer ul ul li {
-  padding-left: 1.2em;
+#gOrganizeAlbumDescription {
+  height: 2em;
+  overflow-y: auto;
 }
 
 .gBranchSelected {
@@ -48,21 +45,37 @@
   padding: .3em 0;
 }
 
+.gBranchDroppable {
+  border: 1px dotted;
+}
+
+.gBranchText {
+  cursor: pointer;
+  width: auto;
+}
+
 .gBranchCollapsed {
   display: none;
 }
 
-.gOrganizeBranch span {
-  cursor: pointer;
+.gBranchEmpty {
+  visibility: hidden;
 }
 
-.gBranchText {
-  cursor: pointer;
-  width: auto;
+#gOrganizeTreeContainer ul ul li {
+  padding-left: 1.2em;
 }
+
 /*******************************************************************
  * Album Panel Styles
  */
+
+#gMicroThumbUnselectAll,
+#gMicroThumbSelectAll {
+  font-size: 1em;
+  font-weight: bold;
+}
+
 #gMicroThumbPanel {
   margin: 0 !important;
   padding: 0 !important;
@@ -70,27 +83,33 @@
   border: 1px solid #999 !important;
   border-top: none !important;
   border-left: none !important;
+  margin-left: -1em !important;
   overflow-x: hidden;
   overflow-y: auto;
 }
 
 #gMicroThumbGrid {
+  padding: .5em;
 }
 
 .gMicroThumbContainer {
-//  padding: 0 .5em;
-//  opacity: .4;
-}
-
-.gMicroThumb {
   display: block;
   float: left;
-//  font-size: .7em;
+  font-size: .7em;
   height: 9em;
   margin-bottom: 1em;
   margin-left: 1em;
-  text-align: center;
+  opacity: .4;
+  padding: 0 .5em;
+}
+
+.gMicroThumb {
+  height: 9em;
   width: 9em;
+  background-color: #fff;
+  display: block;
+  float: left;
+  text-align: center;
 }
 
 #gMicroThumbPanel #gMicroThumbGrid .gAlbum {
@@ -101,12 +120,35 @@
   opacity: 1;
 }
 
+.gMicroThumbContainer.ui-selected {
+  opacity: 1;
+}
+
+#gDragHelper .gMicroThumbGrid {
+  background-color: transparent;
+  padding: 0;
+  overflow: visible;
+}
+
+#gDragHelper .gMicroThumbContainer {
+  display: block;
+  margin: 0;
+  padding: 0;
+}
+
+#gDragHelper .gMicroThumb {
+  background-color: transparent;
+  height: auto;
+  width: auto;
+}
+
+
 /****************************************************************
  * Organize Edit Drawer styling
  */
 #gOrganizeEditDrawer {
   background-color: #13A;
-  width: 100% !important;
+  width: 90%;
 }
 
 #gOrganizeEditDrawerPanel {
@@ -162,3 +204,79 @@
   height: 30px;
   width: 15px;
 }
+
+#gOrganizeFormButtons {
+  bottom: 0.5em;
+}
+
+#gOrganizeFormButtons .submit {
+  display: inline;
+  float: none;
+  left: 0.5em;
+  position: relative;
+}
+
+/* yui-u gives 80% width, but then we wrap so do it ourselves */
+#gOrganizeEditForm {
+  float: right;
+  width: 79%;
+  //  height: 100px;
+}
+
+#gOrganizeFormThumbs {
+  overflow: hidden;
+}
+
+#gOrganizeFormThumbs div {
+  margin: 0;
+  text-align: center;
+  background: transparent none repeat scroll 0 0;
+}
+
+#gOrganizeFormThumbs .gMicroThumbContainer {
+  display: block;
+  float: left;
+  opacity: 1;
+  position: absolute;
+}
+
+/****************************************************************
+ * Organize Edit From tabs styling
+ */
+#gOrganizeEditForm.ui-tabs .ui-tabs-hide {
+  display: block !important;
+  left: -10000px;
+  position: absolute;
+}
+
+#gOrganizeEditForm.ui-widget {
+  font-size: .75em;
+}
+
+.gOrganizeEditPane {
+  height: 135px;
+  overflow-y: auto;
+}
+
+.textbox,
+.textarea {
+  border: 1px solid #e8e8e8;
+  border-top-color: #ccc;
+  border-left-color: #ccc;
+  color: #333;
+  width: 100%;
+}
+
+.textarea {
+  height: 6em;
+}
+
+.textbox  {
+  height: 1.3em;
+  width: 50%
+}
+
+.gTagGroup {
+  float:left;
+  margin: .5em;
+}
diff --git a/modules/organize/helpers/organize_task.php b/modules/organize/helpers/organize_task.php
new file mode 100644
index 00000000..dc474818
--- /dev/null
+++ b/modules/organize/helpers/organize_task.php
@@ -0,0 +1,131 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class organize_task_Core {
+  static function available_tasks() {
+    // Return empty array so nothing appears in the maintenance screen
+    return array();
+  }
+
+  static function run($task) {
+    $context = unserialize($task->context);
+    $taskType = $context["type"];
+
+    try {
+      $target = ORM::factory("item", $context["target"]);
+      $total = count($context["items"]);
+      $stop = min($total - $context["position"], $context["batch"]);
+      $context["post_process"] = array();
+      for ($offset = 0; $offset < $stop; $offset++) {
+        $current_id = $context["position"] + $offset;
+        $id = $context["items"][$current_id];
+        switch ($taskType) {
+        case "move":
+          $source = ORM::factory("item", $id);
+          access::required("view", $source);
+          access::required("view", $target);
+          access::required("edit", $source);
+          access::required("edit", $target);
+
+          item::move($source, $target);
+          break;
+
+        case "rearrange":
+          $item = ORM::factory("item", $id);
+          access::required("view", $item);
+          access::required("edit", $item);
+
+          Database::instance()
+            ->query("Update {items} set weight = {$context["position"]} where id=$id;");
+          break;
+
+        case "rotateCcw":
+        case "rotateCw":
+          $item = ORM::factory("item", $id);
+          access::required("view", $item);
+          access::required("edit", $item);
+
+          if ($item->is_photo()) {
+            $context["post_process"]["reload"][] =
+              self::_do_rotation($item, $taskType == "rotateCcw" ? -90 : 90);
+          }
+          break;
+
+        case "albumCover":
+          $item = ORM::factory("item", $id);
+          access::required("view", $item);
+          access::required("view", $item->parent());
+          access::required("edit", $item->parent());
+
+          item::make_album_cover($item);
+          break;
+
+        case "delete":
+          $item = ORM::factory("item", $id);
+          access::required("view", $item);
+          access::required("edit", $item);
+
+          $item->delete();
+          $context["post_process"]["remove"][] = array("id" => $id);
+          break;
+
+        default:
+          throw new Exception("Task '$taskType' is not implemented");
+        }
+      }
+      $context["position"] += $stop;
+      $task->state = "success";
+    } catch(Exception $e) {
+      $task->status = $e->getMessage();
+      $task->state = "error";
+      $task->save();
+      throw $e;
+    }
+    $task->context = serialize($context);
+    $total = count($context["items"]);
+    $task->percent_complete = $context["position"] / (float)$total * 100;
+    $task->done = $context["position"] == $total || $task->state == "error";
+  }
+
+  private static function _do_rotation($item, $degrees) {
+    // This code is copied from Quick_Controller::rotate
+    graphics::rotate($item->file_path(), $item->file_path(), array("degrees" => $degrees));
+
+    list($item->width, $item->height) = getimagesize($item->file_path());
+    $item->resize_dirty= 1;
+    $item->thumb_dirty= 1;
+    $item->save();
+
+    graphics::generate($item);
+
+    $parent = $item->parent();
+    if ($parent->album_cover_item_id == $item->id) {
+      copy($item->thumb_path(), $parent->thumb_path());
+      $parent->thumb_width = $item->thumb_width;
+      $parent->thumb_height = $item->thumb_height;
+      $parent->save();
+    }
+    list ($height, $width) = $item->scale_dimensions(90);
+    $margin_top = (90 - $height) / 20;
+
+    return array("src" => $item->thumb_url() . "?rnd=" . rand(),
+                 "id" => $item->id,
+                 "marginTop" => "{$margin_top}em", "width" => $width, "height" => $height);
+  }
+}
\ No newline at end of file
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index f01ab88b..e4feba2b 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -19,7 +19,8 @@
  */
 class organize_theme {
   static function head($theme) {
-    //$theme->script("organize_init.js");
+    // @tdo remove the addition css and organize.js (just here to test)
+    $theme->script("organize_init.js");
     $theme->script("organize.js");
     $theme->css("organize.css");
   }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index e84afd03..12d8a5b5 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,116 +1,621 @@
-(function($) {
-  $.fn.organize = function(options) {
-    var size = $.getViewportSize();
-    var height = size.height() - 100;     // Leave 50 pixels on the top and bottom of the dialog
-    var width = size.width() - 100;       // Leave 50 pixels on the left and right of the dialog
-    var opts = $.extend({}, $.fn.organize.defaults, {width: width, height: height}, options);
-    return this.each(function() {
-      $(this).click(function(event) {
-        var href = event.target.href;
-        var size = $.getViewportSize();
-
-        $("body").append('<div id="gOrganizeDialog"></div>');
-
-        $("#gOrganizeDialog").dialog(opts);
-        // Pass the approx height and width of the thumb grid to optimize thumb retrieval
-        $.get(href, _init);
-        return false;
+/*
+ * @todo Trap resize of dialog and resize the child areas (tree, grid and edit form)
+ */
+var url;
+var paused = false;
+var task = null;
+var transitItems = [];
+var heightMicroThumbPanel;
+
+// **************************************************************************
+// JQuery UI Widgets
+// Draggable
+var draggable = {
+  handle: ".gMicroThumbContainer.ui-selected",
+  revert: true,
+  zindex: 2000,
+  distance: 10,
+  helper: function(event, ui) {
+    if (!$(event.currentTarget).hasClass("ui-selected")) {
+      $(event.currentTarget).addClass("ui-selected");
+      setDrawerButtonState();
+    }
+    $("#gMicroThumbPanel").append("<div id=\"gDragHelper\"><ul></ul></div>");
+    var beginTop = event.pageY;
+    var beginLeft = event.pageX;
+    var zindex = $(".gMicroThumbContainer").draggable("option", "zindex");
+    $("#gDragHelper").css('top', event.pageY - 22.5);
+    $("#gDragHelper").css('left', event.pageX + 22.5);
+    var placeHolder = $(this).clone();
+    $(placeHolder).attr("id", "gPlaceHolder");
+    $(placeHolder).css("visibility", "hidden");
+    $(placeHolder).removeClass("ui-selected");
+    $(placeHolder).removeClass("ui-draggable");
+    $(this).after(placeHolder);
+
+    $("li.ui-selected").each(function(i) {
+      var clone = $(this).clone();
+      $(clone).attr("id", "drag_clone_" + $(this).attr("ref"));
+      $("#gDragHelper ul").append(clone);
+      $(clone).css("position", "absolute");
+      $(clone).css("top", beginTop);
+      $(clone).css("left", beginLeft);
+      $(clone).css("z-index", zindex--);
+      $(this).hide();
+
+      var children = $(clone).find(".gMicroThumb .gThumbnail");
+      var width = new String(children.css("width")).replace(/[^0-9]/g,"") * .5;
+      var height = new String(children.css("height")).replace(/[^0-9]/g,"") * .5;
+      var marginTop = new String(children.css("margin-top")).replace(/[^\.0-9]/g,"") * .5;
+      children.attr("width", width);
+      children.attr("height", height);
+      children.css("margin-top", marginTop);
+      if (i < 9) {
+        beginTop -= 5;
+        beginLeft += 5;
+      }
+    });
+    return $("#gDragHelper");
+  },
+  stop: function(event, ui) {
+    $("#gDragHelper li").each(function(i) {
+      $("#thumb_" + $(this).attr("ref")).show();
+    });
+    $(".gMicroThumbContainer.ui-selected").css("z-index", null);
+    $("#gDragHelper").remove();
+    $("#gPlaceHolder").remove();
+  }
+};
+
+// Thumbnail Grid Droppable
+var thumbDroppable =  {
+  tolerance: "pointer",
+  over: function(event, ui) {
+    $("#gPlaceHolder").show();
+  },
+  out:  function(event, ui) {
+    $("#gPlaceHolder").hide();
+  },
+  drop: function(event, ui) {
+    $("#gDragHelper").hide();
+    $("#gPlaceHolder").hide();
+    var newOrder = "";
+    $("#gMicroThumbGrid .gMicroThumbContainer").each(function(i) {
+      if ($(this).attr("id") == "gPlaceHolder") {
+        $("#gDragHelper li").each(function(i) {
+          newOrder += "&item[]=" + $(this).attr("ref");
+        });
+      } else if ($(this).css("display") != "none") {
+        newOrder += "&item[]=" + $(this).attr("ref");
+      } else  {
+        // If its not displayed then its one of the ones being moved so ignore.
+      }
+    });
+    $("#gDragHelper li").each(function(i) {
+      $("#gPlaceHolder").before($("#thumb_" + $(this).attr("ref")).show());
+    });
+    $.ajax({
+      data: newOrder,
+      dataType: "json",
+      success: operationCallback,
+      type: "POST",
+      url: get_organize_url("organize/startTask/rearrange", {item_id: item_id})
+    });
+  }
+};
+
+// Album Tree Droppable
+var treeDroppable =  {
+  tolerance: "pointer",
+  greedy: true,
+  hoverClass: "gBranchDroppable",
+  drop: function(event, ui) {
+    $("#gDragHelper").hide();
+    var targetItemId = $(this).attr("ref");
+    if ($(this).hasClass("gBranchSelected")) {
+      $("#gMessage").empty().append(INVALID_DROP_TARGET);
+      ui.draggable.trigger("stop", event);
+      return false;
+    }
+    var postData = serializeItemIds("#gDragHelper li");
+    var okToMove = true;
+    $("#gDragHelper li").each(function(i) {
+      okToMove &= targetItemId != $(this).attr("ref");
+    });
+    if (!okToMove) {
+      $("#gMessage").empty().append(INVALID_DROP_TARGET);
+      ui.draggable.trigger("stop", event);
+      return false;
+    }
+    $("#gDragHelper li").each(function(i) {
+      $("#thumb_" + $(this).attr("ref")).remove();
+    });
+    $.ajax({
+      data: postData,
+      dataType: "json",
+      success: operationCallback,
+      type: "POST",
+      url: get_organize_url("organize/startTask/move", {item_id: targetItemId})
+    });
+    return true;
+  }
+};
+
+// Selectable
+var selectable = {
+  filter: ".gMicroThumbContainer",
+  selected: function(event, ui) {
+    setDrawerButtonState();
+  },
+  unselected: function(event, ui) {
+    setDrawerButtonState();
+  },
+  stop: function(event, ui) {
+    getEditForm();
+  }
+};
+
+// **************************************************************************
+// Event Handlers
+// MicroThumbContainer mouseup
+var onMicroThumbContainerMouseup = function(event) {
+  // For simplicity always remove the ui-selected class.  If it was unselected
+  // it will get added back
+  $(this).toggleClass("ui-selected");
+
+  setDrawerButtonState();
+  if ($("#gMicroThumbGrid li.ui-selected").length > 0) {
+    getEditForm();
+  }
+};
+
+// MicroThumbContainer mousemove
+var onMicroThumbContainerMousemove = function(event) {
+  if ($("#gDragHelper").length > 0 && $(this).attr("id") != "gPlaceHolder") {
+    if (event.pageX < $(this).offset().left + $(this).width() / 2) {
+      $(this).before($("#gPlaceHolder"));
+    } else {
+      $(this).after($("#gPlaceHolder"));
+    }
+    var container = $("#gMicroThumbPanel").get(0);
+    var scrollHeight = container.scrollHeight;
+    var scrollTop = container.scrollTop;
+    var height = $(container).height();
+    if (event.pageY > height + scrollTop) {
+      container.scrollTop = this.offsetTop;
+    } else if (event.pageY < scrollTop) {
+      container.scrollTop -= height;
+    }
+  }
+};
+
+// Handle click events on the buttons on the drawer handle
+function drawerHandleButtonsClick(event) {
+  event.preventDefault();
+  if (!$(this).attr("disabled")) {
+    var operation = $(this).attr("ref");
+    switch (operation) {
+    case "edit":
+    case "close":
+      $("#gOrganizeEditDrawerPanel").animate(
+        {"height": "toggle", "display": "block"},
+        {duration: "fast",
+         complete: function() {
+           setSelectedThumbs();
+           if (operation == "close") {
+             $("#gOrganizeEditHandleButtonsLeft a[ref='edit']").css("display", "inline-block");
+             $("#gOrganizeEditHandleButtonsLeft a[ref='close']").css("display", "none");
+             $("#gOrganizeEditHandleButtonsMiddle a").css("display", "none");
+           } else {
+             $("#gOrganizeEditHandleButtonsLeft a[ref='edit']").css("display", "none");
+             $("#gOrganizeEditHandleButtonsLeft a[ref='close']").css("display", "inline-block");
+             $("#gOrganizeEditHandleButtonsMiddle a").css("display", "inline-block");
+           }
+         },
+         step: function() {
+           $("#gMicroThumbPanel").height(heightMicroThumbPanel - $(this).height());
+         }
+      });
+      break;
+    case "select-all":
+      $("#gMicroThumbGrid li").addClass("ui-selected");
+      $("#gMicroThumbSelectAll").hide();
+      $("#gMicroThumbUnselectAll").show();
+      setDrawerButtonState();
+      getEditForm();
+      break;
+    case "unselect-all":
+      $("#gMicroThumbGrid li").removeClass("ui-selected");
+      $("#gMicroThumbSelectAll").show();
+      $("#gMicroThumbUnselectAll").hide();
+      setDrawerButtonState();
+      break;
+    case "done":
+      $("#gDialog").dialog("close");
+      break;
+    case "submit":
+      var currentTab = $("#gOrganizeEditForm").tabs("option", "selected");
+      var form = $("#pane-"+currentTab+" form");
+      var url = $(form).attr("action")
+        .replace("__FUNCTION__", $(form).attr("ref"));
+      $.ajax({
+        data: $(form).serialize(),
+        dataType: "json",
+        success: function (data, textStatus) {
+          $("#pane-"+currentTab).children("form").replaceWith(data.form);
+          if (data.message) {
+            $("#gMessage").empty().append("<div class='gSuccess'>" + data.message + "</div>");
+          }
+        },
+        type: "POST",
+        url: url
+      });
+      break;
+    case "reset":
+      currentTab = $("#gOrganizeEditForm").tabs("option", "selected");
+      form = $("#pane-"+currentTab+" form");
+      $.ajax({
+        data: serializeItemIds("#gMicroThumbPanel li.ui-selected"),
+        dataType: "html",
+        success: function (data, textStatus) {
+          $("#pane-"+currentTab + " form").replaceWith(data);
+        },
+        type: "GET",
+        url: $(form).attr("action").replace("__FUNCTION__", "reset_" + $(form).attr("ref"))
       });
+      break;
+    case "delete":
+      if (!confirm(CONFIRM_DELETE)) {
+        break;
+      }
+    default:
+      $.ajax({
+        data: serializeItemIds("#gMicroThumbPanel li.ui-selected"),
+        dataType: "json",
+        success: operationCallback,
+        type: "POST",
+        url: get_organize_url("organize/startTask/" + operation, {item_id: item_id})
+      });
+      break;
+    }
+  }
+};
+
+// **************************************************************************
+// AJAX Callbacks
+// MicroThumbContainer click
+var getMicroThumbsCallback = function(json, textStatus) {
+  if (json.count > 0) {
+    $("#gMicroThumbGrid").append(json.data);
+    retrieveMicroThumbs();
+    $(".gMicroThumbContainer").mouseup(onMicroThumbContainerMouseup);
+    $(".gMicroThumbContainer").mousemove(onMicroThumbContainerMousemove);
+    $(".gMicroThumbContainer").draggable(draggable);
+  }
+};
+
+var operationCallback = function (data, textStatus) {
+  var done = false;
+  if (!paused) {
+    createProgressDialog(data.runningMsg);
+    task = data.task;
+    task.pauseMsg = data.pauseMsg;
+    task.resumeMsg = data.resumeMsg;
+    done = data.task.done;
+  }
+  $(".gMicroThumbContainer").draggable("disable");
+  paused = false;
+  while (!done && !paused) {
+    $.ajax({async: false,
+      success: function(data, textStatus) {
+        $(".gProgressBar").progressbar("value", data.task.percent_complete);
+        done = data.task.done;
+        if (data.task.post_process.reload) {
+          $.each(data.task.post_process.reload, function() {
+            var selector = "#gMicroThumb-" + this.id + " img";
+            $(selector).attr("height", this.height);
+            $(selector).attr("width", this.width);
+            $(selector).attr("src", this.src);
+            $(selector).css("margin-top", this.marginTop);
+          });
+        }
+        if (data.task.post_process.remove) {
+          $.each(data.task.post_process.remove, function() {
+            $("#thumb_" + this.id).remove();
+          });
+        }
+      },
+      error: function(XMLHttpRequest, textStatus, errorThrown) {
+        paused = true;
+        displayAjaxError(XMLHttpRequest.responseText);
+      },
+      dataType: "json",
+      type: "POST",
+      url: get_organize_url("organize/runTask", {task_id: task.id})
     });
-  };
+  }
+  if (!paused) {
+    $("#gOrganizeProgressDialog").dialog("destroy").remove();
+    $.ajax({async: false,
+      success: function(data, textStatus) {
+        setDrawerButtonState();
+        task = null;
+        $("#gMessage").empty().append("<div class='gSuccess'>" + data.task.status + "</div>");
+      },
+      dataType: "json",
+      type: "POST",
+      url: get_organize_url("organize/finishTask", {task_id: task.id})
+    });
+  }
+  $(".gMicroThumbContainer").draggable("enable");
+};
 
-  $.fn.organize.defaults = {
-    autoOpen: false,
-    modal: true,
-    resizable: false,
-    minWidth: 600,
-    minHeight: 500,
-    position: "center",
-    close: function () {
-      $("#gOrganizeDialog").trigger("organize_close");
-      $("#gOrganizeDialog").dialog("destroy").remove();
-    },
-    zIndex: 75
-  };
+// **************************************************************************
+
+/**
+ * Dynamically initialize the organize dialog when it is displayed
+ */
+function organize_dialog_init() {
+  var size = getViewportSize();
+  heightMicroThumbPanel = size.height() - 100;
+  var width = size.width() - 100;
+
+  // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
+  $(".sf-menu li.sfHover ul").css("z-index", 70);
+
+  $("#gDialog").dialog("option", "width", width);
+  $("#gDialog").dialog("option", "height", heightMicroThumbPanel);
+
+  $("#gDialog").dialog("open");
+  if ($("#gDialog h1").length) {
+    $("#gDialog").dialog('option', 'title', $("#gDialog h1:eq(0)").html());
+  } else if ($("#gDialog fieldset legend").length) {
+    $("#gDialog").dialog('option', 'title', $("#gDialog fieldset legend:eq(0)").html());
+  }
+
+  $("#gDialog").bind("organize_close", function(target) {
+    $.gallery_reload();
+  });
+
+  heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-top"));
+  heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-bottom"));
+  heightMicroThumbPanel -= $("#gMicroThumbPanel").position().top;
+  heightMicroThumbPanel -= $("#gDialog #ft").height();
+  heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").height();
+  heightMicroThumbPanel = Math.round(heightMicroThumbPanel);
+
+  $("#gMicroThumbPanel").height(heightMicroThumbPanel);
+  $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
+
+  $(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
+  $(".gBranchText").droppable(treeDroppable);
+  $(".gBranchText").click(organizeOpenFolder);
+  retrieveMicroThumbs(item_id);
+  //showLoading("#gDialog");
 
-  /**
-   * Dynamically initialize the organize dialog when it is displayed
-   */
-  function _init(data) {
+  $("#gMicroThumbPanel").droppable(thumbDroppable);
+  $("#gMicroThumbPanel").selectable(selectable);
+  $("#gOrganizeEditDrawerHandle a").click(drawerHandleButtonsClick);
+}
 
-    // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
-    $(".sf-menu li.sfHover ul").css("z-index", 70);
+function retrieveMicroThumbs() {
+  var offset = $("#gMicroThumbGrid li").length;
+  if (url == null) {
+    var grid_width = $("#gMicroThumbPanel").width();
+    url = $("#gMicroThumbPanel").attr("ref");
+    url = url.replace("__WIDTH__", grid_width);
+    url = url.replace("__HEIGHT__", heightMicroThumbPanel);
+  }
+  var url_data = url.replace("__OFFSET__", offset);
+  url_data = url_data.replace("__ITEM_ID__", item_id);
+  $.getJSON(url_data, getMicroThumbsCallback);
+}
 
-    $("#gOrganizeDialog").html(data);
-    $("#gOrganizeDialog").dialog("open");
+function organizeToggleChildren(event) {
+  var id = $(this).attr("ref");
+  var span_children = $("#gOrganizeChildren-" + id);
+  if ($(this).hasClass("ui-icon-plus")) {
+    $(this).removeClass("ui-icon-plus");
+    $(this).addClass("ui-icon-minus");
+    $("#gOrganizeChildren-" + id).removeClass("gBranchCollapsed");
+  } else {
+    $(this).removeClass("ui-icon-minus");
+    $(this).addClass("ui-icon-plus");
+    $("#gOrganizeChildren-" + id).addClass("gBranchCollapsed");
+  }
+  event.preventDefault();
+}
 
-    var heightMicroThumbPanel = $("#gOrganizeDialog").innerHeight();
-    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
-    heightMicroThumbPanel -= $("#gMessage").outerHeight();
-    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
-    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
+function organizeOpenFolder(event) {
+  var selected = $(".gBranchSelected");
+  if ($(selected).attr("id") != $(this).attr("id")) {
+    $(selected).removeClass("gBranchSelected");
+    $(this).addClass("gBranchSelected");
+    item_id = $(this).attr("ref");
+    $("#gMicroThumbGrid").empty();
+    retrieveMicroThumbs();
+  }
+  event.preventDefault();
+}
 
-    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
-    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
+function get_organize_url(uri, parms) {
+  var url = rearrangeUrl;
+  url = url.replace("__URI__", uri);
+  url = url.replace("__ITEM_ID__", !parms.item_id ? "" : parms.item_id);
+  url += (parms.item_id && parms.task_id) ? "/" : "";
+  url = url.replace("__TASK_ID__", !parms.task_id ? "" : parms.task_id);
+  return url;
+}
 
-    if ($("#gOrganizeDialog h1").length) {
-      $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog h1:eq(0)").html());
-    } else if ($("#gOrganizeDialog fieldset legend").length) {
-      $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog fieldset legend:eq(0)").html());
+/**
+ * Set the enabled/disabled state of the buttons.  The album cover is only enabled if
+ * there is only 1 image selected
+ */
+function setDrawerButtonState() {
+  $("#gOrganizeFormThumbStack").empty();
+  $("#gOrganizeEditForm").empty();
+  var selectedCount = $("#gMicroThumbGrid li.ui-selected").length;
+  if (selectedCount) {
+    $("#gOrganizeEditHandleButtonsLeft a").removeAttr("disabled");
+    $("#gOrganizeEditHandleButtonsLeft a").removeClass("ui-state-disabled");
+
+    if (selectedCount > 1) {
+      $("#gOrganizeEditHandleButtonsLeft a[ref='albumCover']").attr("disabled", true);
+      $("#gOrganizeEditHandleButtonsLeft a[ref='albumCover']").addClass("ui-state-disabled");
+    }
+    setSelectedThumbs();
+  } else {
+    if ($("#gOrganizeEditDrawerPanel::visible").length) {
+      $("#gOrganizeEditHandleButtonsLeft a[ref='close']").trigger("click");
     }
+    $("#gOrganizeEditHandleButtonsLeft a").attr("disabled", true);
+    $("#gOrganizeEditHandleButtonsLeft a").addClass("ui-state-disabled");
+  }
+}
 
-    $("#gOrganizeDialog #gMicroThumbDone").click(_dialog_close);
-    $("#gOrganizeDialog").bind("organize_close", function(target) {
-      $.gallery_reload();
+function setSelectedThumbs() {
+  if (!$("#gOrganizeEditDrawerPanel::visible").length) {
+    return;
+  }
+  var position = $("#gOrganizeFormThumbStack").position();
+  var beginLeft = position.left;
+  var beginTop = 50;
+  var zindex = 2000;
+  $("li.ui-selected").each(function(i) {
+    var clone = $(this).clone();
+    $(clone).attr("id", "edit_clone_" + $(this).attr("ref"));
+    $("#gOrganizeFormThumbStack").append(clone);
+    $(clone).removeClass("ui-draggable");
+    $(clone).removeClass("ui-selected");
+    $(clone).css("margin-top", beginTop);
+    $(clone).css("left", beginLeft);
+    $(clone).css("z-index", zindex--);
+
+    if (i < 9) {
+      beginTop -= 5;
+      beginLeft += 5;
+    }
+  });
+}
+
+function getEditForm() {
+  if ($("#gMicroThumbGrid li.ui-selected").length > 0) {
+    var postData = serializeItemIds("li.ui-selected");
+    var url_data = get_organize_url("organize/editForm", {}) + postData;
+    $.get(url_data, function(data, textStatus) {
+      $("#gOrganizeEditForm").tabs("destroy");
+      $("#gOrganizeEditForm").html(data);
+      if ($("#gOrganizeEditForm ul li").length) {
+        $("#gOrganizeEditForm").tabs();
+        $("#gOrganizeEditHandleButtonsMiddle a").removeAttr("disabled");
+        $("#gOrganizeEditHandleButtonsMiddle a").removeClass("ui-state-disabled");
+      } else {
+        $("#gOrganizeEditHandleButtonsMiddle a").attr("disabled", true);
+        $("#gOrganizeEditHandleButtonsMiddle a").addClass("ui-state-disabled");
+      }
     });
+  } else {
+    $("#gOrganizeEditForm").tabs("destroy");
+    $("#gOrganizeEditForm").empty();
+  }
+}
 
-    //$(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
-    //$(".gBranchText").droppable(treeDroppable);
-    //$(".gBranchText").click(organizeOpenFolder);
-    //retrieveMicroThumbs(item_id);
-    //showLoading("#gOrganizeDialog");
+function serializeItemIds(selector) {
+  var postData = "";
+  $(selector).each(function(i) {
+    postData += "&item[]=" + $(this).attr("ref");
+  });
 
-    //$("#gMicroThumbPanel").droppable(thumbDroppable);
-    //$("#gMicroThumbPanel").selectable(selectable);
-    //$("#gOrganizeEditDrawerHandle a").click(drawerHandleButtonsClick);
+  return postData;
+}
 
-    $(window).bind("resize", _size_dialog);
-  };
+function submitCurrentForm(event) {
+  console.log("submitCurrentForm");
+  return false;
+}
 
-  /**
-   * Dynamically initialize the organize dialog when it is displayed
-   */
-  function _size_dialog(event) {
-    var size = $.getViewportSize();
-    var h = $("#gOrganizeDialog").dialog("option", "minHeight");
-    var sh = size.height() - 100;
-    var height  = Math.max(sh, h);
-    var w = $("#gOrganizeDialog").dialog("option", "minWidth");
-    var sw = size.width() - 100;
-    var width = Math.max(w, sw);
-
-    $("#gOrganizeDialog").parent().css("height", height);
-    $("#gOrganizeDialog").parent().css("width", width);
-    $("#gOrganizeDialog").parent().css("left", "50px");
-    $("#gOrganizeDialog").parent().css("top", "50px");
-
-    var heightMicroThumbPanel = height - 50;
-    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
-    heightMicroThumbPanel -= $("#gMessage").outerHeight();
-    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
-    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
-
-    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
-    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
-  };
+function resetCurrentForm(event) {
+  console.log("resetCurrentForm");
+  return false;
+}
 
-  function _dialog_close(event) {
-    event.preventDefault();
-    $("#gOrganizeDialog").dialog("close");
+function createProgressDialog(title) {
+  $("body").append("<div id='gOrganizeProgressDialog'>" +
+      "<div class='gProgressBar'></div>" +
+      "<button id='gOrganizeTaskPause' class='ui-state-default ui-corner-all'>" + PAUSE_BUTTON + "</button>" +
+      "<button id='gOrganizeTaskResume' class='ui-state-default ui-corner-all' style='display: none'>" + RESUME_BUTTON + "</button>" +
+      "<button id='gOrganizeTaskCancel' class='ui-state-default ui-corner-all' style='display: none'>" + CANCEL_BUTTON + "</button>" +
+    "</div>");
+  $("#gOrganizeProgressDialog").dialog({
+    autoOpen: true,
+    autoResize: false,
+    modal: true,
+    resizable: false,
+    title: title
+  });
+
+  $(".gProgressBar").progressbar();
+  $("#gOrganizeTaskPause").click(function(event) {
+    paused = true;
+    $("#gOrganizeTaskPause").hide();
+    $("#gOrganizeTaskResume").show();
+    $("#gOrganizeTaskCancel").show();
+    $("#gMessage").empty().append(task.pauseMsg);
+  });
+  $("#gOrganizeTaskResume").click(function(event) {
+    $("#gOrganizeTaskPause").show();
+    $("#gOrganizeTaskResume").hide();
+    $("#gOrganizeTaskCancel").hide();
+    $("#gMessage").empty().append(task.resumeMsg);
+    operationCallback();
+    //startRearrangeCallback();
+  });
+  $("#gOrganizeTaskCancel").click(function(event) {
+    $("#gOrganizeTaskPause").show();
+    $("#gOrganizeTaskResume").hide();
+    $("#gOrganizeTaskCancel").hide();
+
+    $.ajax({async: false,
+      success: function(data, textStatus) {
+        task = null;
+        paused = false;
+        transitItems = [];
+        $("#gMessage").empty().append("<div class='gWarning'>" + data.task.status + "</div>");
+        $("#gOrganizeProgressDialog").dialog("destroy").remove();
+      },
+      dataType: "json",
+      type: "POST",
+      url: get_organize_url("organize/cancelTask", {task_id: task.id})
+    });
+  });
+}
+
+// **************************************************************************
+// Functions that should probably be in a gallery namespace
+function getViewportSize() {
+  return {
+      width : function() {
+        return window.innerWidth
+          || document.documentElement && document.documentElement.clientWidth
+          || document.body.clientWidth;
+      },
+      height : function() {
+        return window.innerHeight
+          || document.documentElement && document.documentElement.clientHeight
+          || document.body.clientHeight;
+      }
   };
+}
 
-})(jQuery);
+function displayAjaxError(error) {
+  $("body").append("<div id=\"gAjaxError\" title=\"" + FATAL_ERROR + "\">" + error + "</div>");
 
-$("document").ready(function() {
-  $("#gOrganizeLink").organize();
-});
+  $("#gAjaxError").dialog({
+    autoOpen: true,
+    autoResize: false,
+    modal: true,
+    resizable: true,
+    width: 610,
+    height: $("#gDialog").height()
+  });
+}
diff --git a/modules/organize/js/organize_init.js b/modules/organize/js/organize_init.js
new file mode 100644
index 00000000..ed036fdb
--- /dev/null
+++ b/modules/organize/js/organize_init.js
@@ -0,0 +1,29 @@
+$("document").ready(function() {
+  $("#gOrganizeLink").click(function(event) {
+    event.preventDefault();
+    var href = event.target.href;
+
+    $("body").append('<div id="gDialog"></div>');
+
+    $("#gDialog").dialog({
+      autoOpen: false,
+      autoResize: false,
+      modal: true,
+      resizable: false,
+      close: function () {
+        $("#gDialog").trigger("organize_close");
+        $("#gDialog").dialog("destroy").remove();
+      },
+      zIndex: 75
+    });
+
+    //showLoading("#gDialog");
+
+    $.get(href, function(data) {
+      $("#gDialog").html(data);
+    });
+    return false;
+  });
+});
+
+
diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
new file mode 100644
index 00000000..1686d255
--- /dev/null
+++ b/modules/organize/views/organize.html.php
@@ -0,0 +1,53 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<!-- ?= html::script("modules/organize/js/organize.js") ? -->
+<script>
+  var FATAL_ERROR = "<?= t("Fatal Error") ?>";
+  var PAUSE_BUTTON = "<?= t("Pause") ?>";
+  var RESUME_BUTTON = "<?= t("Resume") ?>";
+  var CANCEL_BUTTON = "<?= t("Cancel") ?>";
+  var INVALID_DROP_TARGET = "<div class=\"gError\"><?= t("Drop cancelled as it would result in a recursive move") ?></div>";
+var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums and/or photos") ?>"
+  var item_id = <?= $item->id ?>;
+
+  var csrf = "<?= $csrf ?>";
+  var rearrangeUrl = "<?= url::site("__URI__/__ITEM_ID____TASK_ID__?csrf=$csrf") ?>";
+  $("#doc3").ready(function() {
+    organize_dialog_init();
+  });
+</script>
+<fieldset style="display: none">
+  <legend><?= t("Organize %name", array("name" => p::purify($item->title))) ?></legend>
+</fieldset>
+<div id="doc3" class="yui-t7">
+  <div id="bd">
+    <div class="yui-gf">
+      <div class="yui-u first">
+        <h3><?= t("Albums") ?></h3>
+      </div>
+      <div id="gMessage" class="yui-u">
+        <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
+      </div>
+    </div>
+    <div class="yui-gf">
+      <div id="gOrganizeTreeContainer" class="yui-u first">
+        <?= $album_tree ?>
+      </div>
+      <div id="gMicroThumbPanel" class="yui-u"
+           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&amp;height=__HEIGHT__&amp;offset=__OFFSET__") ?>">
+        <ul id="gMicroThumbGrid"></ul>
+      </div>
+      <div id="gOrganizeEditDrawer" class="yui-u">
+        <div id="gOrganizeEditDrawerPanel" class="yui-gf">
+          <div id="gOrganizeFormThumbs" class="yui-u first">
+            <ul id="gOrganizeFormThumbStack" />
+          </div>
+          <div id="gOrganizeEditForm">
+          </div>
+        </div>
+        <div id="gOrganizeEditDrawerHandle">
+          <?= $button_pane ?>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/modules/organize/views/organize_album.html.php b/modules/organize/views/organize_album.html.php
new file mode 100644
index 00000000..ae2d5d51
--- /dev/null
+++ b/modules/organize/views/organize_album.html.php
@@ -0,0 +1,17 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<ul>
+  <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
+    <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
+          class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
+    </span>
+
+    <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
+          class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
+      <?= p::clean($album->title) ?>
+    </div>
+    <div id="gOrganizeChildren-<?= $album->id ?>"
+          class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
+      <?= $children ?>
+    <div>
+  </li>
+</ul>
diff --git a/modules/organize/views/organize_button_pane.html.php b/modules/organize/views/organize_button_pane.html.php
index 8eced107..c5839a44 100644
--- a/modules/organize/views/organize_button_pane.html.php
+++ b/modules/organize/views/organize_button_pane.html.php
@@ -1,5 +1,50 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="gOrganizeEditHandleButtonsLeft">
+  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="edit"
+     disabled="1" title="<?= t("Open Drawer") ?>">
+    <span class="ui-icon ui-icon-arrowthickstop-1-n"><?= t("Open Drawer") ?></span>
+  </a>
+
+  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="close"
+     disabled="1" title="<?= t("Close Drawer") ?>" style="display: none">
+    <span class="ui-icon ui-icon-arrowthickstop-1-s"><?= t("Close Drawer") ?></span>
+  </a>
+
+  <? if (graphics::can("rotate")): ?>
+  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="rotateCcw"
+     disabled="1" title="<?= t("Rotate 90 degrees counter clockwise") ?>">
+    <span class="ui-icon ui-icon-rotate-ccw"><?= t("Rotate 90 degrees counter clockwise") ?></span>
+  </a>
+
+  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="rotateCw"
+     disabled="1" title="<?= t("Rotate 90 degrees clockwise") ?>">
+    <span class="ui-icon ui-icon-rotate-cw"> <?= t("Rotate 90 degrees clockwise") ?></span>
+  </a>
+  <? endif ?>
+
+  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="albumCover"
+     disabled="1" title="<?= t("Choose this photo as the album cover") ?>">
+    <span class="ui-icon ui-icon-star"><?= t("Choose this photo as the album cover") ?></span>
+  </a>
+
+  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="delete"
+     disabled="1" title="<?= t("Delete selection") ?>">
+    <span class="ui-icon ui-icon-trash"><?= t("Delete selection") ?></span>
+  </a>
+</div>
+<div id="gOrganizeEditHandleButtonsMiddle">
+  <a class="gButtonLink ui-corner-all ui-state-default" href="#" ref="submit"
+     title="<?= t("Apply Changes") ?>" style="display: none" >
+    <span class="ui-icon ui-icon-check"><?= t("Apply Changes") ?></span>
+  </a>
+
+  <a class="gButtonLink ui-corner-all ui-state-default" href="#" ref="reset"
+     title="<?= t("Reset Form") ?>" style="display: none" >
+    <span class="ui-icon ui-icon-closethick"><?= t("Reset Form") ?></span>
+  </a>
+</div>
 <div id="gOrganizeEditHandleButtonsRight">
-  <a id="gMicroThumbDone" href="#" ref="done"
-     class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
+  <a id="gMicroThumbSelectAll" href="#" ref="select-all" class="gButtonLink ui-corner-all ui-state-default"><?= t("Select all") ?></a>
+  <a id="gMicroThumbUnselectAll" href="#" ref="unselect-all" style="display: none" class="gButtonLink ui-corner-all ui-state-default"><?= t("Deselect all") ?></a>
+  <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
deleted file mode 100644
index cf3fd478..00000000
--- a/modules/organize/views/organize_dialog.html.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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>
-  <div id="bd">
-    <div class="yui-gf">
-      <div class="yui-u first">
-        <h3><?= t("Albums") ?></h3>
-      </div>
-      <div id="gMessage" class="yui-u">
-        <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
-      </div>
-    </div>
-    <div class="yui-gf">
-      <div id="gOrganizeTreeContainer" class="yui-u first">
-        <ul id="gOrganizeAlbumTree">
-          <?= $album_tree ?>
-        </ul>
-      </div>
-      <div id="gOrganizeDetail" class="yui-u">
-        <div id="gMicroThumbPanel"
-           ref="<?= url::site("organize/content/__ITEM_ID__/__OFFSET__") ?>">
-          <ul id="gMicroThumbGrid">
-            <?= $micro_thumb_grid ?>
-          </ul>
-        </div>
-        <div id="gOrganizeEditDrawer" class="yui-u">
-          <div id="gOrganizeEditDrawerPanel" class="yui-gf">
-          </div>
-          <div id="gOrganizeEditDrawerHandle">
-            <?= $button_pane ?>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
diff --git a/modules/organize/views/organize_edit.html.php b/modules/organize/views/organize_edit.html.php
new file mode 100644
index 00000000..1adf290f
--- /dev/null
+++ b/modules/organize/views/organize_edit.html.php
@@ -0,0 +1,14 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<ul>
+<? foreach ($panes as $idx => $pane): ?>
+  <li><a href="#pane-<?= $idx ?>"><?= $pane["label"] ?></a></li>
+<? endforeach?>
+</ul>
+
+<? if (count($panes) > 0): ?>
+  <? foreach ($panes as $idx => $pane): ?>
+    <div id="pane-<?= $idx ?>" class="gOrganizeEditPane ui-tabs-hide"><?= $pane["content"] ?></div>
+  <? endforeach?>
+<? else: ?>
+<div class="gWarning"><?= t("No Edit pages apply to the selected items") ?></div>
+<? endif ?>
\ No newline at end of file
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index e6b7aec0..c80696ad 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,19 +1,12 @@
 <?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="gMicroThumb_<?= $child->id ?>" class="gMicroThumb  <?= $item_class ?>" ref="<?= $child->id ?>">
+<? $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) ?>
-  </li>
+  </div>
+</li>
 <? endforeach ?>
-<? if (count($children) >= 25): ?>
-<script>
-   $.get("<?= url::site("organize/content/{$item_id}/$offset") ?>",
-     function(data) {
-       $("#gMicroThumbGrid").append(data);
-     }
-   );
-</script>
-<? endif ?>
\ No newline at end of file
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 28b45be0..d2cdd957 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,20 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
-  <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-        class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
-  </span>
-
-  <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
-       class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
-    <?= 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" : "" ?>">
-      <?= $children ?>
-    </ul>
-  <? endif ?>
-</li>
+<? foreach ($children as $i => $child): ?>
+<? endforeach ?>
 
-- 
cgit v1.2.3


From 65c850c393ce6159289e3fd05056c33e7d62e961 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 10:26:11 -0700
Subject: Revert "Revert "Checkpoint the organize module rewrite.  At this
 point, it doesn't really do""

This reverts commit 397468c47b8fc3fefeb54ff19a73980ed1dd8c20.
---
 modules/organize/controllers/organize.php          | 507 +--------------
 modules/organize/css/organize.css                  | 184 +-----
 modules/organize/helpers/organize_task.php         | 131 ----
 modules/organize/helpers/organize_theme.php        |   3 +-
 modules/organize/js/organize.js                    | 697 +++------------------
 modules/organize/js/organize_init.js               |  29 -
 modules/organize/views/organize.html.php           |  53 --
 modules/organize/views/organize_album.html.php     |  17 -
 .../organize/views/organize_button_pane.html.php   |  49 +-
 modules/organize/views/organize_dialog.html.php    |  37 ++
 modules/organize/views/organize_edit.html.php      |  14 -
 .../organize/views/organize_thumb_grid.html.php    |  23 +-
 modules/organize/views/organize_tree.html.php      |  20 +-
 13 files changed, 232 insertions(+), 1532 deletions(-)
 delete mode 100644 modules/organize/helpers/organize_task.php
 delete mode 100644 modules/organize/js/organize_init.js
 delete mode 100644 modules/organize/views/organize.html.php
 delete mode 100644 modules/organize/views/organize_album.html.php
 create mode 100644 modules/organize/views/organize_dialog.html.php
 delete mode 100644 modules/organize/views/organize_edit.html.php

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 898be509..d7854c53 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -19,54 +19,48 @@
  */
 class Organize_Controller extends Controller {
   private static $_MICRO_THUMB_SIZE = 90;
-  private static $_MICRO_THUMB_PADDING = 5;
+  private static $_MICRO_THUMB_PADDING = 10;
 
-  function index($item_id=1) {
+  function index($item_id) {
     $item = ORM::factory("item", $item_id);
     $root = ($item->id == 1) ? $item : ORM::factory("item", 1);
     access::required("view", $item);
     access::required("edit", $item);
 
-    $v = new View("organize.html");
+    $v = new View("organize_dialog.html");
     $v->root = $root;
     $v->item = $item;
-    $v->album_tree = $this->tree($item, $root);
+    $v->album_tree = $this->_tree($item, $root);
+    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item);
     $v->button_pane = new View("organize_button_pane.html");
+    $buttons = (object)array("left" => array(), "middle" =>array(), "right" => array(),
+                             "item" => $item);
+    module::event("organize_format_button_pane", $buttons);
+
+    $v->button_pane->buttons = $buttons;
     print $v;
   }
 
-  function content($item_id) {
+  function content($item_id, $offset=0) {
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
     access::required("edit", $item);
 
-    $width = $this->input->get("width");
-    $height = $this->input->get("height");
-    $offset = $this->input->get("offset", 0);
-    $thumbsize = self::$_MICRO_THUMB_SIZE + 2 * self::$_MICRO_THUMB_PADDING;
-    $page_size = ceil($width / $thumbsize) * ceil($height / $thumbsize);
+    $v = $this->_get_micro_thumb_grid($item, $offset);
+    print $v->__toString();
+  }
 
+  private function _get_micro_thumb_grid($item, $offset=0) {
     $v = new View("organize_thumb_grid.html");
-    $v->children = $item->children($page_size, $offset);
+    $v->item_id = $item->id;
+    $v->children = $item->children(25, $offset);
     $v->thumbsize = self::$_MICRO_THUMB_SIZE;
-    $v->padding = self::$_MICRO_THUMB_PADDING;
-    $v->offset = $offset;
-
-    print json_encode(array("count" => $v->children->count(),
-                            "data" => $v->__toString()));
-  }
-
-  function header($item_id) {
-    $item = ORM::factory("item", $item_id);
-    access::required("view", $item);
-    access::required("edit", $item);
+    $v->offset = $offset + 25;
 
-    print json_encode(
-      array("title" => p::purify($item->title),
-            "description" => empty($item->description) ? "" : p::purify($item->description)));
+    return $v;
   }
 
-  function tree($item, $parent) {
+  private function _tree($item, $parent, $selected=false) {
     access::required("view", $item);
     access::required("edit", $item);
 
@@ -75,466 +69,25 @@ class Organize_Controller extends Controller {
       ->orderby(array("title" => "ASC"))
       ->find_all();
 
-    $v = new View("organize_album.html");
+    $v = new View("organize_tree.html");
     $v->album = $parent;
-    $v->selected = $parent->id == $item->id;
-
-    if ($albums->count()) {
-      $v->album_icon = $parent->id == 1 || $v->selected ? "ui-icon-minus" : "ui-icon-plus";
-    } else {
-      $v->album_icon = "";
-    }
 
+    $v->selected = false;
     $v->children = "";
-    foreach ($albums as $album) {
-      $v->children .= $this->tree($item, $album);
-    }
-    return $v->__toString();
-  }
-
-  function startTask($operation, $id) {
-    access::verify_csrf();
-    $items = $this->input->post("item");
-
-    $item = ORM::factory("item", $id);
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $definition = $this->_getOperationDefinition($item, $operation);
-
-    $task_def = Task_Definition::factory()
-      ->callback("organize_task::run")
-      ->description($definition["description"])
-      ->name($definition["name"]);
-    $task = task::create($task_def, array("items" => $items, "position" => 0, "target" => $id,
-                                          "type" => $definition["type"],
-                                          "batch" => ceil(count($items) * .1)));
-    // @todo If there is only one item then call task_run($task->id); Maybe even change js so
-    // we can call finish as well.
-    batch::start();
-    print json_encode(
-      array("result" => "started",
-            "runningMsg" => $definition["runningMsg"],
-            "pauseMsg" => "<div class=\"gWarning\">{$definition['pauseMsg']}</div>",
-            "resumeMsg" => "<div class=\"gWarning\">{$definition['resumeMsg']}</div>",
-            "task" => array("id" => $task->id,
-                            "percent_complete" => $task->percent_complete,
-                            "type" => $task->get("type"),
-                            "status" => $task->status,
-                            "state" => $task->state,
-                            "done" => $task->done)));
-  }
-
-  function runTask($task_id) {
-    access::verify_csrf();
-
-    $task = task::run($task_id);
-    if (!$task->loaded || $task->owner_id != user::active()->id) {
-      access::forbidden();
-    }
-
-    print json_encode(array("result" => $task->done ? $task->state : "in_progress",
-                            "task" => array("id" => $task->id,
-                                            "percent_complete" => $task->percent_complete,
-                                            "type" => $task->get("type"),
-                                            "post_process" => $task->get("post_process"),
-                                            "status" => $task->status,
-                                            "state" => $task->state,
-                                            "done" => $task->done)));
-  }
-
-  function finishTask($task_id) {
-    access::verify_csrf();
-
-    $task = ORM::factory("task", $task_id);
-    if (!$task->loaded || $task->owner_id != user::active()->id) {
-      access::forbidden();
-    }
-
-    if ($task->done) {
-      $item = ORM::factory("item", (int)$task->get("target"));
-      $type = $task->get("type");
-      switch ($type) {
-      case "albumCover":
-        $task->status = t("Album cover set for '%album'", array("album" => $item->title));
-        break;
-      case "delete":
-        $task->status = t("Selection deleted");
-        break;
-      case "move":
-        $task->status = t("Move to '%album' completed", array("album" => $item->title));
-        break;
-      case "rearrange":
-        try {
-          $item->sort_column = "weight";
-          $item->save();
-          $task->status = t("Rearrange for '%album' completed", array("album" => $item->title));
-        } catch (Exception $e) {
-          $task->state = "error";
-          $task->status = $e->getMessage();
-        }
-        break;
-      case "rotateCcw":
-      case "rotateCw":
-        $task->status = t("Rotation completed");
-        break;
-      }
-      $task->save();
-   }
-
-    batch::stop();
-    print json_encode(array("result" => "success",
-                            "task" => array(
-                              "id" => $task->id,
-                              "percent_complete" => $task->percent_complete,
-                              "status" => $task->status,
-                              "state" => $task->state,
-                              "done" => $task->done)));
-  }
-
-  function cancelTask($task_id) {
-    access::verify_csrf();
-
-    $task = ORM::factory("task", $task_id);
-    if (!$task->loaded || $task->owner_id != user::active()->id) {
-      access::forbidden();
-    }
-
-    if (!$task->done) {
-      $task->done = 1;
-      $task->state = "cancelled";
-      $type = $task->get("type");
-      switch ($type) {
-      case "move":
-        $task->status = t("Move to album was cancelled prior to completion");
-        break;
-      case "rearrange":
-         $task->status = t("Rearrange album was cancelled prior to completion");
-      case "rotateCcw":
-      case "rotateCw":
-        $task->status = t("Rotation was cancelled prior to completion");
-        break;
-      }
-      $task->save();
-    }
-
-    batch::stop();
-    print json_encode(array("result" => "success",
-                            "task" => array(
-                              "id" => $task->id,
-                              "percent_complete" => $task->percent_complete,
-                              "status" => $task->status,
-                              "state" => $task->state,
-                              "done" => $task->done)));
-  }
-
-  function editForm() {
-    $event_parms = new stdClass();
-    $event_parms->panes = array();
-    $event_parms->itemids = $this->input->get("item");
-
-    // The following code should be done more dynamically i.e. use the event mechanism
-    if (count($event_parms->itemids) == 1) {
-      $item = ORM::factory("item")
-        ->in("id", $event_parms->itemids[0])
-        ->find();
-
-      access::required("view", $item);
-      access::required("edit", $item);
-
-      $event_parms->panes[] = array(
-        "label" => $item->is_album() ? t("Edit Album") : t("Edit Photo"),
-        "content" => organize::get_general_edit_form($item));
-
-      if ($item->is_album()) {
-        $event_parms->panes[] = array("label" => t("Sort Order"),
-                                      "content" => organize::get_sort_edit_form($item));
-      }
-    }
-
-    $event_parms->panes[] = array("label" => t("Manage Tags"),
-                                  "content" => organize::get_tag_form($event_parms->itemids));
-
-    $v = new View("organize_edit.html");
-    $v->panes = $event_parms->panes;
-    print $v->render();
-  }
-
-  // Handlers for the album/photo edit.  Probably should be in modules/gallery
-  public function general() {
-    access::verify_csrf();
-
-    $itemids = $this->input->post("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $form = organize::get_general_edit_form($item);
-    if ($form->validate()) {
-      $orig = clone $item;
-      $item->title = $form->title->value;
-      $item->description = $form->description->value;
-      $item->rename($form->dirname->value);
-      $item->save();
+    $v->album_icon = "ui-icon-plus";
+    if (!$selected) {
+      $v->selected = $parent->id == $item->id;
 
-      if ($item->is_album()) {
-        log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-        $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
-      } else {
-        log::success("content", "Updated photo", "<a href=\"photos/$item->id\">view</a>");
-        $message = t("Saved photo %photo_title", array("photo_title" => p::purify($item->title)));
+      if ($albums->count() && ($parent->id == 1 || $v->selected) ) {
+        $v->album_icon = "ui-icon-minus";
       }
-      print json_encode(array("form" => $form->__toString(), "message" => $message));
-    } else {
-      print json_encode(array("form" => $form->__toString()));
-    }
-  }
-
-  public function reset_general() {
-    $itemids = Input::instance()->get("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    print organize::get_general_edit_form($item);
-  }
-
-  public function sort() {
-    access::verify_csrf();
-
-    $itemids = $this->input->post("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $form = organize::get_sort_edit_form($item);
-    if ($form->validate()) {
-      $orig = clone $item;
-      $item->sort_column = $form->column->value;
-      $item->sort_order = $form->direction->value;
-      $item->save();
-
-      log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-      $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
-      print json_encode(array("form" => $form->__toString(), "message" => $message));
-    } else {
-      print json_encode(array("form" => $form->__toString()));
-    }
-  }
-
-  public function reset_sort() {
-    $itemids = Input::instance()->get("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    print organize::get_sort_edit_form($item);
-  }
-
-  public function edit_tags() {
-    access::verify_csrf();
 
-    $itemids = explode("|", $this->input->post("item"));
-    $form = organize::get_tag_form($itemids);
-    $old_tags = $form->tags->value;
-    if ($form->validate()) {
-
-      $old_tags = preg_split("/[;,\s]+/", $old_tags);
-      sort($old_tags);
-      $new_tags = preg_split("/[;,\s]+/", $form->tags->value);
-      sort($new_tags);
-
-      $HIGH_VALUE_STRING = "\256";
-      for ($old_index = $new_index = 0;;) {
-        $old_tag = $old_index >= count($old_tags) ? $HIGH_VALUE_STRING : $old_tags[$old_index];
-        $new_tag = $new_index >= count($new_tags) ? $HIGH_VALUE_STRING : $new_tags[$new_index];
-        if ($old_tag == $HIGH_VALUE_STRING && $new_tag == $HIGH_VALUE_STRING) {
-          break;
-        }
-        $matches = array();
-        $old_star = false;
-        if (preg_match("/(.*)(\*)$/", $old_tag, $matches)) {
-          $old_star = true;
-          $old_tag = $matches[1];
-        }
-        $new_star = false;
-        if (preg_match("/(.*)(\*)$/", $new_tag, $matches)) {
-          $new_star = true;
-          $new_tag = $matches[1];
-        }
-        if ($old_tag > $new_tag) {
-          // Its missing in the old list so add it
-          $this->_add_tag($new_tag, $itemids);
-          $new_index++;
-        } else if ($old_tag < $new_tag) {
-          // Its missing in the new list so its been removed
-          $this->_delete_tag($old_tag, $itemids);
-          $old_index++;
-        } else {
-          if ($old_star && !$new_star) {
-            // User wants tag to apply to all items, originally only on some of selected
-            $this->_update_tag($old_tag, $itemids);
-          } // Not changed ignore
-          $old_index++;
-          $new_index++;
-        }
+      foreach ($albums as $album) {
+        $v->children .= $this->_tree($item, $album, $v->selected);
       }
     }
-    print json_encode(array("form" => $form->__toString(), "message" => t("Tags updated")));
-  }
-
-  public function reset_edit_tags() {
-    $itemids = $this->input->get("item");
-
-    print organize::get_tag_form($itemids);
-  }
-
-  private function _add_tag($new_tag, $itemids) {
-    // Super lame security stopgap.  This code is going to get rewritten anyway.
-    foreach ($itemids as $item_id) {
-      $item = ORM::factory("item", $item_id);
-      access::required("view", $item);
-      access::required("edit", $item);
-    }
-
-    $tag = ORM::factory("tag")
-      ->where("name", $new_tag)
-      ->find();
-    if ($tag->loaded) {
-      $tag->count += count($itemids);
-    } else {
-      $tag->name = $new_tag;
-      $tag->count = count($itemids);
-    }
-    $tag->save();
-
-    $db = Database::instance();
-    foreach ($itemids as $item_id) {
-      $db->query("INSERT INTO {items_tags} SET item_id = $item_id, tag_id = {$tag->id};");
-    }
-  }
-
-  private function _delete_tag($new_tag, $itemids) {
-    // Super lame security stopgap.  This code is going to get rewritten anyway.
-    foreach ($itemids as $item_id) {
-      $item = ORM::factory("item", $item_id);
-      access::required("view", $item);
-      access::required("edit", $item);
-    }
-
-    $tag = ORM::factory("tag")
-      ->where("name", $new_tag)
-      ->find();
-    $tag->count -= count($itemids);
-    if ($tag->count > 0) {
-      $tag->save();
-    } else {
-      $tag->delete();
-    }
-
-    $ids = implode(", ", $itemids);
-    Database::instance()->query(
-      "DELETE FROM {items_tags} WHERE tag_id = {$tag->id} AND item_id IN ($ids);");
-  }
-
-  private function _update_tag($new_tag, $itemids) {
-    // Super lame security stopgap.  This code is going to get rewritten anyway.
-    foreach ($itemids as $item_id) {
-      $item = ORM::factory("item", $item_id);
-      access::required("view", $item);
-      access::required("edit", $item);
-    }
-
-    $tag = ORM::factory("tag")
-      ->where("name", $new_tag)
-      ->find();
-
-    $db = Database::instance();
-    $ids = implode(", ", $itemids);
-    $result = $db->query(
-      "SELECT item_id FROM {items_tags}
-        WHERE tag_id = {$tag->id}
-          AND item_id IN ($ids)");
-
-    $add_items = array_fill_keys($itemids, 1);
-    foreach($result as $row) {
-      unset($add_items[$row->item_id]);
-    }
-    $add_items = array_keys($add_items);
-    $tag->count += count($add_items);
-    $tag->save();
-    foreach ($add_items as $item_id) {
-      $db->query("INSERT INTO {items_tags} SET item_id = $item_id, tag_id = {$tag->id};");
-    }
+    return $v->__toString();
   }
 
-  private function _getOperationDefinition($item, $operation) {
-    switch ($operation) {
-    case "move":
-      return array("description" =>
-                     t("Move albums and photos to '%name'", array("name" => $item->title)),
-                   "name" => t("Move to '%name'", array("name" => $item->title)),
-                   "type" => "move",
-                   "runningMsg" => t("Move in progress"),
-                   "pauseMsg" => t("The move operation was paused"),
-                   "resumeMsg" => t("The move operation was resumed"));
-      break;
-
-    case "rearrange":
-      return array("description" => t("Rearrange the order of albums and photos"),
-                   "name" => t("Rearrange: %name", array("name" => $item->title)),
-                   "type" => "rearrange",
-                   "runningMsg" => t("Rearrange in progress"),
-                   "pauseMsg" => t("The rearrange operation was paused"),
-                   "resumeMsg" => t("The rearrange operation was resumed"));
-      break;
 
-    case "rotateCcw":
-      return array("description" => t("Rotate the selected photos counter clockwise"),
-                   "name" => t("Rotate images in %name", array("name" => $item->title)),
-                   "type" => "rotateCcw",
-                   "runningMsg" => t("Rotate Counter Clockwise in progress"),
-                   "pauseMsg" => t("The rotate operation was paused"),
-                   "resumeMsg" => t("The rotate operation was resumed"));
-      break;
-
-    case "rotateCw":
-      return array("description" => t("Rotate the selected photos clockwise"),
-                   "name" => t("Rotate images in %name", array("name" => $item->title)),
-                   "type" => "rotateCw",
-                   "runningMsg" => t("Rotate Clockwise in progress"),
-                   "pauseMsg" => t("The rotate operation was paused"),
-                   "resumeMsg" => t("The rotate operation was resumed"));
-      break;
-
-    case "delete":
-      return array("description" => t("Delete selected photos / albums"),
-                   "name" => t("Delete images in %name", array("name" => $item->title)),
-                   "type" => "delete",
-                   "runningMsg" => t("Delete images in progress"),
-                   "pauseMsg" => t("The delete operation was paused"),
-                   "resumeMsg" => t("The delete operation was resumed"));
-      break;
-
-    case "albumCover":
-      return array("description" => t("Reset Album Cover"),
-                   "name" => t("Reset Album cover for %name", array("name" => $item->title)),
-                   "type" => "albumCover",
-                   "runningMsg" => t("Reset Album Cover in progress"),
-                   "pauseMsg" => t("Reset album cover was paused"),
-                   "resumeMsg" => t("Reset album cover was resumed"));
-      break;
-
-    default:
-      throw new Exception("Operation '$operation' is not implmented");
-    }
-  }
 }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index e58cd5a5..4568a707 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,41 +1,44 @@
-/* @todo move to theme css */
 /*******************************************************************
  * Dialog wide stylings
  */
-#gMessage {
-  margin-bottom: .4em;
+#gOrganizeDialog {
+  text-align: left;
 }
 
-#gMessage .gInfo {
-  background-color: transparent;
-  background-image: none;
-  padding-left: .4em;
+#gOrganize {
+  overflow: hidden;
 }
 
-#gOrganizeProgressDialog {
-  text-align: left;
+#gOrganize .yui-u {
+  width: 75%;
+}
+
+#gOrganize .yui-gf .first {
+  width: 25%;
 }
 
-#gDialog .yui-gf div.first {
-  width: 20%;
+#gOrganize .yui-gf #gMessage {
+  margin-bottom: .4em;
+  width: 75%;
 }
 
-#gDialog .yui-gf .yui-u {
-  width: 80%;
+#gMessage .gInfo {
+  font-weight: bold;
+  padding-left: 2em;
 }
 
+
 /*******************************************************************
  * Album Tree styling
  */
 #gOrganizeTreeContainer {
-  overflow-y: auto;
+  overflow: auto;
   margin: 0 !important;
   padding: 0 !important;
 }
 
-#gOrganizeAlbumDescription {
-  height: 2em;
-  overflow-y: auto;
+#gOrganizeTreeContainer ul ul li {
+  padding-left: 1.2em;
 }
 
 .gBranchSelected {
@@ -45,37 +48,21 @@
   padding: .3em 0;
 }
 
-.gBranchDroppable {
-  border: 1px dotted;
-}
-
-.gBranchText {
-  cursor: pointer;
-  width: auto;
-}
-
 .gBranchCollapsed {
   display: none;
 }
 
-.gBranchEmpty {
-  visibility: hidden;
+.gOrganizeBranch span {
+  cursor: pointer;
 }
 
-#gOrganizeTreeContainer ul ul li {
-  padding-left: 1.2em;
+.gBranchText {
+  cursor: pointer;
+  width: auto;
 }
-
 /*******************************************************************
  * Album Panel Styles
  */
-
-#gMicroThumbUnselectAll,
-#gMicroThumbSelectAll {
-  font-size: 1em;
-  font-weight: bold;
-}
-
 #gMicroThumbPanel {
   margin: 0 !important;
   padding: 0 !important;
@@ -83,33 +70,27 @@
   border: 1px solid #999 !important;
   border-top: none !important;
   border-left: none !important;
-  margin-left: -1em !important;
   overflow-x: hidden;
   overflow-y: auto;
 }
 
 #gMicroThumbGrid {
-  padding: .5em;
 }
 
 .gMicroThumbContainer {
-  display: block;
-  float: left;
-  font-size: .7em;
-  height: 9em;
-  margin-bottom: 1em;
-  margin-left: 1em;
-  opacity: .4;
-  padding: 0 .5em;
+//  padding: 0 .5em;
+//  opacity: .4;
 }
 
 .gMicroThumb {
-  height: 9em;
-  width: 9em;
-  background-color: #fff;
   display: block;
   float: left;
+//  font-size: .7em;
+  height: 9em;
+  margin-bottom: 1em;
+  margin-left: 1em;
   text-align: center;
+  width: 9em;
 }
 
 #gMicroThumbPanel #gMicroThumbGrid .gAlbum {
@@ -120,35 +101,12 @@
   opacity: 1;
 }
 
-.gMicroThumbContainer.ui-selected {
-  opacity: 1;
-}
-
-#gDragHelper .gMicroThumbGrid {
-  background-color: transparent;
-  padding: 0;
-  overflow: visible;
-}
-
-#gDragHelper .gMicroThumbContainer {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-
-#gDragHelper .gMicroThumb {
-  background-color: transparent;
-  height: auto;
-  width: auto;
-}
-
-
 /****************************************************************
  * Organize Edit Drawer styling
  */
 #gOrganizeEditDrawer {
   background-color: #13A;
-  width: 90%;
+  width: 100% !important;
 }
 
 #gOrganizeEditDrawerPanel {
@@ -204,79 +162,3 @@
   height: 30px;
   width: 15px;
 }
-
-#gOrganizeFormButtons {
-  bottom: 0.5em;
-}
-
-#gOrganizeFormButtons .submit {
-  display: inline;
-  float: none;
-  left: 0.5em;
-  position: relative;
-}
-
-/* yui-u gives 80% width, but then we wrap so do it ourselves */
-#gOrganizeEditForm {
-  float: right;
-  width: 79%;
-  //  height: 100px;
-}
-
-#gOrganizeFormThumbs {
-  overflow: hidden;
-}
-
-#gOrganizeFormThumbs div {
-  margin: 0;
-  text-align: center;
-  background: transparent none repeat scroll 0 0;
-}
-
-#gOrganizeFormThumbs .gMicroThumbContainer {
-  display: block;
-  float: left;
-  opacity: 1;
-  position: absolute;
-}
-
-/****************************************************************
- * Organize Edit From tabs styling
- */
-#gOrganizeEditForm.ui-tabs .ui-tabs-hide {
-  display: block !important;
-  left: -10000px;
-  position: absolute;
-}
-
-#gOrganizeEditForm.ui-widget {
-  font-size: .75em;
-}
-
-.gOrganizeEditPane {
-  height: 135px;
-  overflow-y: auto;
-}
-
-.textbox,
-.textarea {
-  border: 1px solid #e8e8e8;
-  border-top-color: #ccc;
-  border-left-color: #ccc;
-  color: #333;
-  width: 100%;
-}
-
-.textarea {
-  height: 6em;
-}
-
-.textbox  {
-  height: 1.3em;
-  width: 50%
-}
-
-.gTagGroup {
-  float:left;
-  margin: .5em;
-}
diff --git a/modules/organize/helpers/organize_task.php b/modules/organize/helpers/organize_task.php
deleted file mode 100644
index dc474818..00000000
--- a/modules/organize/helpers/organize_task.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class organize_task_Core {
-  static function available_tasks() {
-    // Return empty array so nothing appears in the maintenance screen
-    return array();
-  }
-
-  static function run($task) {
-    $context = unserialize($task->context);
-    $taskType = $context["type"];
-
-    try {
-      $target = ORM::factory("item", $context["target"]);
-      $total = count($context["items"]);
-      $stop = min($total - $context["position"], $context["batch"]);
-      $context["post_process"] = array();
-      for ($offset = 0; $offset < $stop; $offset++) {
-        $current_id = $context["position"] + $offset;
-        $id = $context["items"][$current_id];
-        switch ($taskType) {
-        case "move":
-          $source = ORM::factory("item", $id);
-          access::required("view", $source);
-          access::required("view", $target);
-          access::required("edit", $source);
-          access::required("edit", $target);
-
-          item::move($source, $target);
-          break;
-
-        case "rearrange":
-          $item = ORM::factory("item", $id);
-          access::required("view", $item);
-          access::required("edit", $item);
-
-          Database::instance()
-            ->query("Update {items} set weight = {$context["position"]} where id=$id;");
-          break;
-
-        case "rotateCcw":
-        case "rotateCw":
-          $item = ORM::factory("item", $id);
-          access::required("view", $item);
-          access::required("edit", $item);
-
-          if ($item->is_photo()) {
-            $context["post_process"]["reload"][] =
-              self::_do_rotation($item, $taskType == "rotateCcw" ? -90 : 90);
-          }
-          break;
-
-        case "albumCover":
-          $item = ORM::factory("item", $id);
-          access::required("view", $item);
-          access::required("view", $item->parent());
-          access::required("edit", $item->parent());
-
-          item::make_album_cover($item);
-          break;
-
-        case "delete":
-          $item = ORM::factory("item", $id);
-          access::required("view", $item);
-          access::required("edit", $item);
-
-          $item->delete();
-          $context["post_process"]["remove"][] = array("id" => $id);
-          break;
-
-        default:
-          throw new Exception("Task '$taskType' is not implemented");
-        }
-      }
-      $context["position"] += $stop;
-      $task->state = "success";
-    } catch(Exception $e) {
-      $task->status = $e->getMessage();
-      $task->state = "error";
-      $task->save();
-      throw $e;
-    }
-    $task->context = serialize($context);
-    $total = count($context["items"]);
-    $task->percent_complete = $context["position"] / (float)$total * 100;
-    $task->done = $context["position"] == $total || $task->state == "error";
-  }
-
-  private static function _do_rotation($item, $degrees) {
-    // This code is copied from Quick_Controller::rotate
-    graphics::rotate($item->file_path(), $item->file_path(), array("degrees" => $degrees));
-
-    list($item->width, $item->height) = getimagesize($item->file_path());
-    $item->resize_dirty= 1;
-    $item->thumb_dirty= 1;
-    $item->save();
-
-    graphics::generate($item);
-
-    $parent = $item->parent();
-    if ($parent->album_cover_item_id == $item->id) {
-      copy($item->thumb_path(), $parent->thumb_path());
-      $parent->thumb_width = $item->thumb_width;
-      $parent->thumb_height = $item->thumb_height;
-      $parent->save();
-    }
-    list ($height, $width) = $item->scale_dimensions(90);
-    $margin_top = (90 - $height) / 20;
-
-    return array("src" => $item->thumb_url() . "?rnd=" . rand(),
-                 "id" => $item->id,
-                 "marginTop" => "{$margin_top}em", "width" => $width, "height" => $height);
-  }
-}
\ No newline at end of file
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index e4feba2b..f01ab88b 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -19,8 +19,7 @@
  */
 class organize_theme {
   static function head($theme) {
-    // @tdo remove the addition css and organize.js (just here to test)
-    $theme->script("organize_init.js");
+    //$theme->script("organize_init.js");
     $theme->script("organize.js");
     $theme->css("organize.css");
   }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 12d8a5b5..e84afd03 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,621 +1,116 @@
-/*
- * @todo Trap resize of dialog and resize the child areas (tree, grid and edit form)
- */
-var url;
-var paused = false;
-var task = null;
-var transitItems = [];
-var heightMicroThumbPanel;
-
-// **************************************************************************
-// JQuery UI Widgets
-// Draggable
-var draggable = {
-  handle: ".gMicroThumbContainer.ui-selected",
-  revert: true,
-  zindex: 2000,
-  distance: 10,
-  helper: function(event, ui) {
-    if (!$(event.currentTarget).hasClass("ui-selected")) {
-      $(event.currentTarget).addClass("ui-selected");
-      setDrawerButtonState();
-    }
-    $("#gMicroThumbPanel").append("<div id=\"gDragHelper\"><ul></ul></div>");
-    var beginTop = event.pageY;
-    var beginLeft = event.pageX;
-    var zindex = $(".gMicroThumbContainer").draggable("option", "zindex");
-    $("#gDragHelper").css('top', event.pageY - 22.5);
-    $("#gDragHelper").css('left', event.pageX + 22.5);
-    var placeHolder = $(this).clone();
-    $(placeHolder).attr("id", "gPlaceHolder");
-    $(placeHolder).css("visibility", "hidden");
-    $(placeHolder).removeClass("ui-selected");
-    $(placeHolder).removeClass("ui-draggable");
-    $(this).after(placeHolder);
-
-    $("li.ui-selected").each(function(i) {
-      var clone = $(this).clone();
-      $(clone).attr("id", "drag_clone_" + $(this).attr("ref"));
-      $("#gDragHelper ul").append(clone);
-      $(clone).css("position", "absolute");
-      $(clone).css("top", beginTop);
-      $(clone).css("left", beginLeft);
-      $(clone).css("z-index", zindex--);
-      $(this).hide();
-
-      var children = $(clone).find(".gMicroThumb .gThumbnail");
-      var width = new String(children.css("width")).replace(/[^0-9]/g,"") * .5;
-      var height = new String(children.css("height")).replace(/[^0-9]/g,"") * .5;
-      var marginTop = new String(children.css("margin-top")).replace(/[^\.0-9]/g,"") * .5;
-      children.attr("width", width);
-      children.attr("height", height);
-      children.css("margin-top", marginTop);
-      if (i < 9) {
-        beginTop -= 5;
-        beginLeft += 5;
-      }
-    });
-    return $("#gDragHelper");
-  },
-  stop: function(event, ui) {
-    $("#gDragHelper li").each(function(i) {
-      $("#thumb_" + $(this).attr("ref")).show();
-    });
-    $(".gMicroThumbContainer.ui-selected").css("z-index", null);
-    $("#gDragHelper").remove();
-    $("#gPlaceHolder").remove();
-  }
-};
-
-// Thumbnail Grid Droppable
-var thumbDroppable =  {
-  tolerance: "pointer",
-  over: function(event, ui) {
-    $("#gPlaceHolder").show();
-  },
-  out:  function(event, ui) {
-    $("#gPlaceHolder").hide();
-  },
-  drop: function(event, ui) {
-    $("#gDragHelper").hide();
-    $("#gPlaceHolder").hide();
-    var newOrder = "";
-    $("#gMicroThumbGrid .gMicroThumbContainer").each(function(i) {
-      if ($(this).attr("id") == "gPlaceHolder") {
-        $("#gDragHelper li").each(function(i) {
-          newOrder += "&item[]=" + $(this).attr("ref");
-        });
-      } else if ($(this).css("display") != "none") {
-        newOrder += "&item[]=" + $(this).attr("ref");
-      } else  {
-        // If its not displayed then its one of the ones being moved so ignore.
-      }
-    });
-    $("#gDragHelper li").each(function(i) {
-      $("#gPlaceHolder").before($("#thumb_" + $(this).attr("ref")).show());
-    });
-    $.ajax({
-      data: newOrder,
-      dataType: "json",
-      success: operationCallback,
-      type: "POST",
-      url: get_organize_url("organize/startTask/rearrange", {item_id: item_id})
-    });
-  }
-};
-
-// Album Tree Droppable
-var treeDroppable =  {
-  tolerance: "pointer",
-  greedy: true,
-  hoverClass: "gBranchDroppable",
-  drop: function(event, ui) {
-    $("#gDragHelper").hide();
-    var targetItemId = $(this).attr("ref");
-    if ($(this).hasClass("gBranchSelected")) {
-      $("#gMessage").empty().append(INVALID_DROP_TARGET);
-      ui.draggable.trigger("stop", event);
-      return false;
-    }
-    var postData = serializeItemIds("#gDragHelper li");
-    var okToMove = true;
-    $("#gDragHelper li").each(function(i) {
-      okToMove &= targetItemId != $(this).attr("ref");
-    });
-    if (!okToMove) {
-      $("#gMessage").empty().append(INVALID_DROP_TARGET);
-      ui.draggable.trigger("stop", event);
-      return false;
-    }
-    $("#gDragHelper li").each(function(i) {
-      $("#thumb_" + $(this).attr("ref")).remove();
-    });
-    $.ajax({
-      data: postData,
-      dataType: "json",
-      success: operationCallback,
-      type: "POST",
-      url: get_organize_url("organize/startTask/move", {item_id: targetItemId})
-    });
-    return true;
-  }
-};
-
-// Selectable
-var selectable = {
-  filter: ".gMicroThumbContainer",
-  selected: function(event, ui) {
-    setDrawerButtonState();
-  },
-  unselected: function(event, ui) {
-    setDrawerButtonState();
-  },
-  stop: function(event, ui) {
-    getEditForm();
-  }
-};
-
-// **************************************************************************
-// Event Handlers
-// MicroThumbContainer mouseup
-var onMicroThumbContainerMouseup = function(event) {
-  // For simplicity always remove the ui-selected class.  If it was unselected
-  // it will get added back
-  $(this).toggleClass("ui-selected");
-
-  setDrawerButtonState();
-  if ($("#gMicroThumbGrid li.ui-selected").length > 0) {
-    getEditForm();
-  }
-};
-
-// MicroThumbContainer mousemove
-var onMicroThumbContainerMousemove = function(event) {
-  if ($("#gDragHelper").length > 0 && $(this).attr("id") != "gPlaceHolder") {
-    if (event.pageX < $(this).offset().left + $(this).width() / 2) {
-      $(this).before($("#gPlaceHolder"));
-    } else {
-      $(this).after($("#gPlaceHolder"));
-    }
-    var container = $("#gMicroThumbPanel").get(0);
-    var scrollHeight = container.scrollHeight;
-    var scrollTop = container.scrollTop;
-    var height = $(container).height();
-    if (event.pageY > height + scrollTop) {
-      container.scrollTop = this.offsetTop;
-    } else if (event.pageY < scrollTop) {
-      container.scrollTop -= height;
-    }
-  }
-};
-
-// Handle click events on the buttons on the drawer handle
-function drawerHandleButtonsClick(event) {
-  event.preventDefault();
-  if (!$(this).attr("disabled")) {
-    var operation = $(this).attr("ref");
-    switch (operation) {
-    case "edit":
-    case "close":
-      $("#gOrganizeEditDrawerPanel").animate(
-        {"height": "toggle", "display": "block"},
-        {duration: "fast",
-         complete: function() {
-           setSelectedThumbs();
-           if (operation == "close") {
-             $("#gOrganizeEditHandleButtonsLeft a[ref='edit']").css("display", "inline-block");
-             $("#gOrganizeEditHandleButtonsLeft a[ref='close']").css("display", "none");
-             $("#gOrganizeEditHandleButtonsMiddle a").css("display", "none");
-           } else {
-             $("#gOrganizeEditHandleButtonsLeft a[ref='edit']").css("display", "none");
-             $("#gOrganizeEditHandleButtonsLeft a[ref='close']").css("display", "inline-block");
-             $("#gOrganizeEditHandleButtonsMiddle a").css("display", "inline-block");
-           }
-         },
-         step: function() {
-           $("#gMicroThumbPanel").height(heightMicroThumbPanel - $(this).height());
-         }
-      });
-      break;
-    case "select-all":
-      $("#gMicroThumbGrid li").addClass("ui-selected");
-      $("#gMicroThumbSelectAll").hide();
-      $("#gMicroThumbUnselectAll").show();
-      setDrawerButtonState();
-      getEditForm();
-      break;
-    case "unselect-all":
-      $("#gMicroThumbGrid li").removeClass("ui-selected");
-      $("#gMicroThumbSelectAll").show();
-      $("#gMicroThumbUnselectAll").hide();
-      setDrawerButtonState();
-      break;
-    case "done":
-      $("#gDialog").dialog("close");
-      break;
-    case "submit":
-      var currentTab = $("#gOrganizeEditForm").tabs("option", "selected");
-      var form = $("#pane-"+currentTab+" form");
-      var url = $(form).attr("action")
-        .replace("__FUNCTION__", $(form).attr("ref"));
-      $.ajax({
-        data: $(form).serialize(),
-        dataType: "json",
-        success: function (data, textStatus) {
-          $("#pane-"+currentTab).children("form").replaceWith(data.form);
-          if (data.message) {
-            $("#gMessage").empty().append("<div class='gSuccess'>" + data.message + "</div>");
-          }
-        },
-        type: "POST",
-        url: url
-      });
-      break;
-    case "reset":
-      currentTab = $("#gOrganizeEditForm").tabs("option", "selected");
-      form = $("#pane-"+currentTab+" form");
-      $.ajax({
-        data: serializeItemIds("#gMicroThumbPanel li.ui-selected"),
-        dataType: "html",
-        success: function (data, textStatus) {
-          $("#pane-"+currentTab + " form").replaceWith(data);
-        },
-        type: "GET",
-        url: $(form).attr("action").replace("__FUNCTION__", "reset_" + $(form).attr("ref"))
+(function($) {
+  $.fn.organize = function(options) {
+    var size = $.getViewportSize();
+    var height = size.height() - 100;     // Leave 50 pixels on the top and bottom of the dialog
+    var width = size.width() - 100;       // Leave 50 pixels on the left and right of the dialog
+    var opts = $.extend({}, $.fn.organize.defaults, {width: width, height: height}, options);
+    return this.each(function() {
+      $(this).click(function(event) {
+        var href = event.target.href;
+        var size = $.getViewportSize();
+
+        $("body").append('<div id="gOrganizeDialog"></div>');
+
+        $("#gOrganizeDialog").dialog(opts);
+        // Pass the approx height and width of the thumb grid to optimize thumb retrieval
+        $.get(href, _init);
+        return false;
       });
-      break;
-    case "delete":
-      if (!confirm(CONFIRM_DELETE)) {
-        break;
-      }
-    default:
-      $.ajax({
-        data: serializeItemIds("#gMicroThumbPanel li.ui-selected"),
-        dataType: "json",
-        success: operationCallback,
-        type: "POST",
-        url: get_organize_url("organize/startTask/" + operation, {item_id: item_id})
-      });
-      break;
-    }
-  }
-};
-
-// **************************************************************************
-// AJAX Callbacks
-// MicroThumbContainer click
-var getMicroThumbsCallback = function(json, textStatus) {
-  if (json.count > 0) {
-    $("#gMicroThumbGrid").append(json.data);
-    retrieveMicroThumbs();
-    $(".gMicroThumbContainer").mouseup(onMicroThumbContainerMouseup);
-    $(".gMicroThumbContainer").mousemove(onMicroThumbContainerMousemove);
-    $(".gMicroThumbContainer").draggable(draggable);
-  }
-};
-
-var operationCallback = function (data, textStatus) {
-  var done = false;
-  if (!paused) {
-    createProgressDialog(data.runningMsg);
-    task = data.task;
-    task.pauseMsg = data.pauseMsg;
-    task.resumeMsg = data.resumeMsg;
-    done = data.task.done;
-  }
-  $(".gMicroThumbContainer").draggable("disable");
-  paused = false;
-  while (!done && !paused) {
-    $.ajax({async: false,
-      success: function(data, textStatus) {
-        $(".gProgressBar").progressbar("value", data.task.percent_complete);
-        done = data.task.done;
-        if (data.task.post_process.reload) {
-          $.each(data.task.post_process.reload, function() {
-            var selector = "#gMicroThumb-" + this.id + " img";
-            $(selector).attr("height", this.height);
-            $(selector).attr("width", this.width);
-            $(selector).attr("src", this.src);
-            $(selector).css("margin-top", this.marginTop);
-          });
-        }
-        if (data.task.post_process.remove) {
-          $.each(data.task.post_process.remove, function() {
-            $("#thumb_" + this.id).remove();
-          });
-        }
-      },
-      error: function(XMLHttpRequest, textStatus, errorThrown) {
-        paused = true;
-        displayAjaxError(XMLHttpRequest.responseText);
-      },
-      dataType: "json",
-      type: "POST",
-      url: get_organize_url("organize/runTask", {task_id: task.id})
-    });
-  }
-  if (!paused) {
-    $("#gOrganizeProgressDialog").dialog("destroy").remove();
-    $.ajax({async: false,
-      success: function(data, textStatus) {
-        setDrawerButtonState();
-        task = null;
-        $("#gMessage").empty().append("<div class='gSuccess'>" + data.task.status + "</div>");
-      },
-      dataType: "json",
-      type: "POST",
-      url: get_organize_url("organize/finishTask", {task_id: task.id})
     });
-  }
-  $(".gMicroThumbContainer").draggable("enable");
-};
-
-// **************************************************************************
-
-/**
- * Dynamically initialize the organize dialog when it is displayed
- */
-function organize_dialog_init() {
-  var size = getViewportSize();
-  heightMicroThumbPanel = size.height() - 100;
-  var width = size.width() - 100;
-
-  // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
-  $(".sf-menu li.sfHover ul").css("z-index", 70);
-
-  $("#gDialog").dialog("option", "width", width);
-  $("#gDialog").dialog("option", "height", heightMicroThumbPanel);
-
-  $("#gDialog").dialog("open");
-  if ($("#gDialog h1").length) {
-    $("#gDialog").dialog('option', 'title', $("#gDialog h1:eq(0)").html());
-  } else if ($("#gDialog fieldset legend").length) {
-    $("#gDialog").dialog('option', 'title', $("#gDialog fieldset legend:eq(0)").html());
-  }
-
-  $("#gDialog").bind("organize_close", function(target) {
-    $.gallery_reload();
-  });
-
-  heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-top"));
-  heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-bottom"));
-  heightMicroThumbPanel -= $("#gMicroThumbPanel").position().top;
-  heightMicroThumbPanel -= $("#gDialog #ft").height();
-  heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").height();
-  heightMicroThumbPanel = Math.round(heightMicroThumbPanel);
-
-  $("#gMicroThumbPanel").height(heightMicroThumbPanel);
-  $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
-
-  $(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
-  $(".gBranchText").droppable(treeDroppable);
-  $(".gBranchText").click(organizeOpenFolder);
-  retrieveMicroThumbs(item_id);
-  //showLoading("#gDialog");
-
-  $("#gMicroThumbPanel").droppable(thumbDroppable);
-  $("#gMicroThumbPanel").selectable(selectable);
-  $("#gOrganizeEditDrawerHandle a").click(drawerHandleButtonsClick);
-}
-
-function retrieveMicroThumbs() {
-  var offset = $("#gMicroThumbGrid li").length;
-  if (url == null) {
-    var grid_width = $("#gMicroThumbPanel").width();
-    url = $("#gMicroThumbPanel").attr("ref");
-    url = url.replace("__WIDTH__", grid_width);
-    url = url.replace("__HEIGHT__", heightMicroThumbPanel);
-  }
-  var url_data = url.replace("__OFFSET__", offset);
-  url_data = url_data.replace("__ITEM_ID__", item_id);
-  $.getJSON(url_data, getMicroThumbsCallback);
-}
+  };
 
-function organizeToggleChildren(event) {
-  var id = $(this).attr("ref");
-  var span_children = $("#gOrganizeChildren-" + id);
-  if ($(this).hasClass("ui-icon-plus")) {
-    $(this).removeClass("ui-icon-plus");
-    $(this).addClass("ui-icon-minus");
-    $("#gOrganizeChildren-" + id).removeClass("gBranchCollapsed");
-  } else {
-    $(this).removeClass("ui-icon-minus");
-    $(this).addClass("ui-icon-plus");
-    $("#gOrganizeChildren-" + id).addClass("gBranchCollapsed");
-  }
-  event.preventDefault();
-}
+  $.fn.organize.defaults = {
+    autoOpen: false,
+    modal: true,
+    resizable: false,
+    minWidth: 600,
+    minHeight: 500,
+    position: "center",
+    close: function () {
+      $("#gOrganizeDialog").trigger("organize_close");
+      $("#gOrganizeDialog").dialog("destroy").remove();
+    },
+    zIndex: 75
+  };
 
-function organizeOpenFolder(event) {
-  var selected = $(".gBranchSelected");
-  if ($(selected).attr("id") != $(this).attr("id")) {
-    $(selected).removeClass("gBranchSelected");
-    $(this).addClass("gBranchSelected");
-    item_id = $(this).attr("ref");
-    $("#gMicroThumbGrid").empty();
-    retrieveMicroThumbs();
-  }
-  event.preventDefault();
-}
+  /**
+   * Dynamically initialize the organize dialog when it is displayed
+   */
+  function _init(data) {
 
-function get_organize_url(uri, parms) {
-  var url = rearrangeUrl;
-  url = url.replace("__URI__", uri);
-  url = url.replace("__ITEM_ID__", !parms.item_id ? "" : parms.item_id);
-  url += (parms.item_id && parms.task_id) ? "/" : "";
-  url = url.replace("__TASK_ID__", !parms.task_id ? "" : parms.task_id);
-  return url;
-}
+    // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
+    $(".sf-menu li.sfHover ul").css("z-index", 70);
 
-/**
- * Set the enabled/disabled state of the buttons.  The album cover is only enabled if
- * there is only 1 image selected
- */
-function setDrawerButtonState() {
-  $("#gOrganizeFormThumbStack").empty();
-  $("#gOrganizeEditForm").empty();
-  var selectedCount = $("#gMicroThumbGrid li.ui-selected").length;
-  if (selectedCount) {
-    $("#gOrganizeEditHandleButtonsLeft a").removeAttr("disabled");
-    $("#gOrganizeEditHandleButtonsLeft a").removeClass("ui-state-disabled");
+    $("#gOrganizeDialog").html(data);
+    $("#gOrganizeDialog").dialog("open");
 
-    if (selectedCount > 1) {
-      $("#gOrganizeEditHandleButtonsLeft a[ref='albumCover']").attr("disabled", true);
-      $("#gOrganizeEditHandleButtonsLeft a[ref='albumCover']").addClass("ui-state-disabled");
-    }
-    setSelectedThumbs();
-  } else {
-    if ($("#gOrganizeEditDrawerPanel::visible").length) {
-      $("#gOrganizeEditHandleButtonsLeft a[ref='close']").trigger("click");
-    }
-    $("#gOrganizeEditHandleButtonsLeft a").attr("disabled", true);
-    $("#gOrganizeEditHandleButtonsLeft a").addClass("ui-state-disabled");
-  }
-}
+    var heightMicroThumbPanel = $("#gOrganizeDialog").innerHeight();
+    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
+    heightMicroThumbPanel -= $("#gMessage").outerHeight();
+    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
+    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
 
-function setSelectedThumbs() {
-  if (!$("#gOrganizeEditDrawerPanel::visible").length) {
-    return;
-  }
-  var position = $("#gOrganizeFormThumbStack").position();
-  var beginLeft = position.left;
-  var beginTop = 50;
-  var zindex = 2000;
-  $("li.ui-selected").each(function(i) {
-    var clone = $(this).clone();
-    $(clone).attr("id", "edit_clone_" + $(this).attr("ref"));
-    $("#gOrganizeFormThumbStack").append(clone);
-    $(clone).removeClass("ui-draggable");
-    $(clone).removeClass("ui-selected");
-    $(clone).css("margin-top", beginTop);
-    $(clone).css("left", beginLeft);
-    $(clone).css("z-index", zindex--);
+    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
+    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
 
-    if (i < 9) {
-      beginTop -= 5;
-      beginLeft += 5;
+    if ($("#gOrganizeDialog h1").length) {
+      $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog h1:eq(0)").html());
+    } else if ($("#gOrganizeDialog fieldset legend").length) {
+      $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog fieldset legend:eq(0)").html());
     }
-  });
-}
 
-function getEditForm() {
-  if ($("#gMicroThumbGrid li.ui-selected").length > 0) {
-    var postData = serializeItemIds("li.ui-selected");
-    var url_data = get_organize_url("organize/editForm", {}) + postData;
-    $.get(url_data, function(data, textStatus) {
-      $("#gOrganizeEditForm").tabs("destroy");
-      $("#gOrganizeEditForm").html(data);
-      if ($("#gOrganizeEditForm ul li").length) {
-        $("#gOrganizeEditForm").tabs();
-        $("#gOrganizeEditHandleButtonsMiddle a").removeAttr("disabled");
-        $("#gOrganizeEditHandleButtonsMiddle a").removeClass("ui-state-disabled");
-      } else {
-        $("#gOrganizeEditHandleButtonsMiddle a").attr("disabled", true);
-        $("#gOrganizeEditHandleButtonsMiddle a").addClass("ui-state-disabled");
-      }
+    $("#gOrganizeDialog #gMicroThumbDone").click(_dialog_close);
+    $("#gOrganizeDialog").bind("organize_close", function(target) {
+      $.gallery_reload();
     });
-  } else {
-    $("#gOrganizeEditForm").tabs("destroy");
-    $("#gOrganizeEditForm").empty();
-  }
-}
-
-function serializeItemIds(selector) {
-  var postData = "";
-  $(selector).each(function(i) {
-    postData += "&item[]=" + $(this).attr("ref");
-  });
-
-  return postData;
-}
 
-function submitCurrentForm(event) {
-  console.log("submitCurrentForm");
-  return false;
-}
+    //$(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
+    //$(".gBranchText").droppable(treeDroppable);
+    //$(".gBranchText").click(organizeOpenFolder);
+    //retrieveMicroThumbs(item_id);
+    //showLoading("#gOrganizeDialog");
 
-function resetCurrentForm(event) {
-  console.log("resetCurrentForm");
-  return false;
-}
+    //$("#gMicroThumbPanel").droppable(thumbDroppable);
+    //$("#gMicroThumbPanel").selectable(selectable);
+    //$("#gOrganizeEditDrawerHandle a").click(drawerHandleButtonsClick);
 
-function createProgressDialog(title) {
-  $("body").append("<div id='gOrganizeProgressDialog'>" +
-      "<div class='gProgressBar'></div>" +
-      "<button id='gOrganizeTaskPause' class='ui-state-default ui-corner-all'>" + PAUSE_BUTTON + "</button>" +
-      "<button id='gOrganizeTaskResume' class='ui-state-default ui-corner-all' style='display: none'>" + RESUME_BUTTON + "</button>" +
-      "<button id='gOrganizeTaskCancel' class='ui-state-default ui-corner-all' style='display: none'>" + CANCEL_BUTTON + "</button>" +
-    "</div>");
-  $("#gOrganizeProgressDialog").dialog({
-    autoOpen: true,
-    autoResize: false,
-    modal: true,
-    resizable: false,
-    title: title
-  });
-
-  $(".gProgressBar").progressbar();
-  $("#gOrganizeTaskPause").click(function(event) {
-    paused = true;
-    $("#gOrganizeTaskPause").hide();
-    $("#gOrganizeTaskResume").show();
-    $("#gOrganizeTaskCancel").show();
-    $("#gMessage").empty().append(task.pauseMsg);
-  });
-  $("#gOrganizeTaskResume").click(function(event) {
-    $("#gOrganizeTaskPause").show();
-    $("#gOrganizeTaskResume").hide();
-    $("#gOrganizeTaskCancel").hide();
-    $("#gMessage").empty().append(task.resumeMsg);
-    operationCallback();
-    //startRearrangeCallback();
-  });
-  $("#gOrganizeTaskCancel").click(function(event) {
-    $("#gOrganizeTaskPause").show();
-    $("#gOrganizeTaskResume").hide();
-    $("#gOrganizeTaskCancel").hide();
+    $(window).bind("resize", _size_dialog);
+  };
 
-    $.ajax({async: false,
-      success: function(data, textStatus) {
-        task = null;
-        paused = false;
-        transitItems = [];
-        $("#gMessage").empty().append("<div class='gWarning'>" + data.task.status + "</div>");
-        $("#gOrganizeProgressDialog").dialog("destroy").remove();
-      },
-      dataType: "json",
-      type: "POST",
-      url: get_organize_url("organize/cancelTask", {task_id: task.id})
-    });
-  });
-}
+  /**
+   * Dynamically initialize the organize dialog when it is displayed
+   */
+  function _size_dialog(event) {
+    var size = $.getViewportSize();
+    var h = $("#gOrganizeDialog").dialog("option", "minHeight");
+    var sh = size.height() - 100;
+    var height  = Math.max(sh, h);
+    var w = $("#gOrganizeDialog").dialog("option", "minWidth");
+    var sw = size.width() - 100;
+    var width = Math.max(w, sw);
+
+    $("#gOrganizeDialog").parent().css("height", height);
+    $("#gOrganizeDialog").parent().css("width", width);
+    $("#gOrganizeDialog").parent().css("left", "50px");
+    $("#gOrganizeDialog").parent().css("top", "50px");
+
+    var heightMicroThumbPanel = height - 50;
+    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
+    heightMicroThumbPanel -= $("#gMessage").outerHeight();
+    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
+    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
+
+    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
+    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
+  };
 
-// **************************************************************************
-// Functions that should probably be in a gallery namespace
-function getViewportSize() {
-  return {
-      width : function() {
-        return window.innerWidth
-          || document.documentElement && document.documentElement.clientWidth
-          || document.body.clientWidth;
-      },
-      height : function() {
-        return window.innerHeight
-          || document.documentElement && document.documentElement.clientHeight
-          || document.body.clientHeight;
-      }
+  function _dialog_close(event) {
+    event.preventDefault();
+    $("#gOrganizeDialog").dialog("close");
   };
-}
 
-function displayAjaxError(error) {
-  $("body").append("<div id=\"gAjaxError\" title=\"" + FATAL_ERROR + "\">" + error + "</div>");
+})(jQuery);
 
-  $("#gAjaxError").dialog({
-    autoOpen: true,
-    autoResize: false,
-    modal: true,
-    resizable: true,
-    width: 610,
-    height: $("#gDialog").height()
-  });
-}
+$("document").ready(function() {
+  $("#gOrganizeLink").organize();
+});
diff --git a/modules/organize/js/organize_init.js b/modules/organize/js/organize_init.js
deleted file mode 100644
index ed036fdb..00000000
--- a/modules/organize/js/organize_init.js
+++ /dev/null
@@ -1,29 +0,0 @@
-$("document").ready(function() {
-  $("#gOrganizeLink").click(function(event) {
-    event.preventDefault();
-    var href = event.target.href;
-
-    $("body").append('<div id="gDialog"></div>');
-
-    $("#gDialog").dialog({
-      autoOpen: false,
-      autoResize: false,
-      modal: true,
-      resizable: false,
-      close: function () {
-        $("#gDialog").trigger("organize_close");
-        $("#gDialog").dialog("destroy").remove();
-      },
-      zIndex: 75
-    });
-
-    //showLoading("#gDialog");
-
-    $.get(href, function(data) {
-      $("#gDialog").html(data);
-    });
-    return false;
-  });
-});
-
-
diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
deleted file mode 100644
index 1686d255..00000000
--- a/modules/organize/views/organize.html.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!-- ?= html::script("modules/organize/js/organize.js") ? -->
-<script>
-  var FATAL_ERROR = "<?= t("Fatal Error") ?>";
-  var PAUSE_BUTTON = "<?= t("Pause") ?>";
-  var RESUME_BUTTON = "<?= t("Resume") ?>";
-  var CANCEL_BUTTON = "<?= t("Cancel") ?>";
-  var INVALID_DROP_TARGET = "<div class=\"gError\"><?= t("Drop cancelled as it would result in a recursive move") ?></div>";
-var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums and/or photos") ?>"
-  var item_id = <?= $item->id ?>;
-
-  var csrf = "<?= $csrf ?>";
-  var rearrangeUrl = "<?= url::site("__URI__/__ITEM_ID____TASK_ID__?csrf=$csrf") ?>";
-  $("#doc3").ready(function() {
-    organize_dialog_init();
-  });
-</script>
-<fieldset style="display: none">
-  <legend><?= t("Organize %name", array("name" => p::purify($item->title))) ?></legend>
-</fieldset>
-<div id="doc3" class="yui-t7">
-  <div id="bd">
-    <div class="yui-gf">
-      <div class="yui-u first">
-        <h3><?= t("Albums") ?></h3>
-      </div>
-      <div id="gMessage" class="yui-u">
-        <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
-      </div>
-    </div>
-    <div class="yui-gf">
-      <div id="gOrganizeTreeContainer" class="yui-u first">
-        <?= $album_tree ?>
-      </div>
-      <div id="gMicroThumbPanel" class="yui-u"
-           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&amp;height=__HEIGHT__&amp;offset=__OFFSET__") ?>">
-        <ul id="gMicroThumbGrid"></ul>
-      </div>
-      <div id="gOrganizeEditDrawer" class="yui-u">
-        <div id="gOrganizeEditDrawerPanel" class="yui-gf">
-          <div id="gOrganizeFormThumbs" class="yui-u first">
-            <ul id="gOrganizeFormThumbStack" />
-          </div>
-          <div id="gOrganizeEditForm">
-          </div>
-        </div>
-        <div id="gOrganizeEditDrawerHandle">
-          <?= $button_pane ?>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/modules/organize/views/organize_album.html.php b/modules/organize/views/organize_album.html.php
deleted file mode 100644
index ae2d5d51..00000000
--- a/modules/organize/views/organize_album.html.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul>
-  <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
-    <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-          class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
-    </span>
-
-    <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
-          class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
-      <?= p::clean($album->title) ?>
-    </div>
-    <div id="gOrganizeChildren-<?= $album->id ?>"
-          class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-      <?= $children ?>
-    <div>
-  </li>
-</ul>
diff --git a/modules/organize/views/organize_button_pane.html.php b/modules/organize/views/organize_button_pane.html.php
index c5839a44..8eced107 100644
--- a/modules/organize/views/organize_button_pane.html.php
+++ b/modules/organize/views/organize_button_pane.html.php
@@ -1,50 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gOrganizeEditHandleButtonsLeft">
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="edit"
-     disabled="1" title="<?= t("Open Drawer") ?>">
-    <span class="ui-icon ui-icon-arrowthickstop-1-n"><?= t("Open Drawer") ?></span>
-  </a>
-
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="close"
-     disabled="1" title="<?= t("Close Drawer") ?>" style="display: none">
-    <span class="ui-icon ui-icon-arrowthickstop-1-s"><?= t("Close Drawer") ?></span>
-  </a>
-
-  <? if (graphics::can("rotate")): ?>
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="rotateCcw"
-     disabled="1" title="<?= t("Rotate 90 degrees counter clockwise") ?>">
-    <span class="ui-icon ui-icon-rotate-ccw"><?= t("Rotate 90 degrees counter clockwise") ?></span>
-  </a>
-
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="rotateCw"
-     disabled="1" title="<?= t("Rotate 90 degrees clockwise") ?>">
-    <span class="ui-icon ui-icon-rotate-cw"> <?= t("Rotate 90 degrees clockwise") ?></span>
-  </a>
-  <? endif ?>
-
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="albumCover"
-     disabled="1" title="<?= t("Choose this photo as the album cover") ?>">
-    <span class="ui-icon ui-icon-star"><?= t("Choose this photo as the album cover") ?></span>
-  </a>
-
-  <a class="gButtonLink ui-corner-all ui-state-default ui-state-disabled" href="#" ref="delete"
-     disabled="1" title="<?= t("Delete selection") ?>">
-    <span class="ui-icon ui-icon-trash"><?= t("Delete selection") ?></span>
-  </a>
-</div>
-<div id="gOrganizeEditHandleButtonsMiddle">
-  <a class="gButtonLink ui-corner-all ui-state-default" href="#" ref="submit"
-     title="<?= t("Apply Changes") ?>" style="display: none" >
-    <span class="ui-icon ui-icon-check"><?= t("Apply Changes") ?></span>
-  </a>
-
-  <a class="gButtonLink ui-corner-all ui-state-default" href="#" ref="reset"
-     title="<?= t("Reset Form") ?>" style="display: none" >
-    <span class="ui-icon ui-icon-closethick"><?= t("Reset Form") ?></span>
-  </a>
-</div>
 <div id="gOrganizeEditHandleButtonsRight">
-  <a id="gMicroThumbSelectAll" href="#" ref="select-all" class="gButtonLink ui-corner-all ui-state-default"><?= t("Select all") ?></a>
-  <a id="gMicroThumbUnselectAll" href="#" ref="unselect-all" style="display: none" class="gButtonLink ui-corner-all ui-state-default"><?= t("Deselect all") ?></a>
-  <a id="gMicroThumbDone" href="#" ref="done" class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
+  <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
new file mode 100644
index 00000000..cf3fd478
--- /dev/null
+++ b/modules/organize/views/organize_dialog.html.php
@@ -0,0 +1,37 @@
+<?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>
+  <div id="bd">
+    <div class="yui-gf">
+      <div class="yui-u first">
+        <h3><?= t("Albums") ?></h3>
+      </div>
+      <div id="gMessage" class="yui-u">
+        <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
+      </div>
+    </div>
+    <div class="yui-gf">
+      <div id="gOrganizeTreeContainer" class="yui-u first">
+        <ul id="gOrganizeAlbumTree">
+          <?= $album_tree ?>
+        </ul>
+      </div>
+      <div id="gOrganizeDetail" class="yui-u">
+        <div id="gMicroThumbPanel"
+           ref="<?= url::site("organize/content/__ITEM_ID__/__OFFSET__") ?>">
+          <ul id="gMicroThumbGrid">
+            <?= $micro_thumb_grid ?>
+          </ul>
+        </div>
+        <div id="gOrganizeEditDrawer" class="yui-u">
+          <div id="gOrganizeEditDrawerPanel" class="yui-gf">
+          </div>
+          <div id="gOrganizeEditDrawerHandle">
+            <?= $button_pane ?>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/modules/organize/views/organize_edit.html.php b/modules/organize/views/organize_edit.html.php
deleted file mode 100644
index 1adf290f..00000000
--- a/modules/organize/views/organize_edit.html.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul>
-<? foreach ($panes as $idx => $pane): ?>
-  <li><a href="#pane-<?= $idx ?>"><?= $pane["label"] ?></a></li>
-<? endforeach?>
-</ul>
-
-<? if (count($panes) > 0): ?>
-  <? foreach ($panes as $idx => $pane): ?>
-    <div id="pane-<?= $idx ?>" class="gOrganizeEditPane ui-tabs-hide"><?= $pane["content"] ?></div>
-  <? endforeach?>
-<? else: ?>
-<div class="gWarning"><?= t("No Edit pages apply to the selected items") ?></div>
-<? endif ?>
\ No newline at end of file
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index c80696ad..e6b7aec0 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,12 +1,19 @@
 <?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 ?>">
+  <? $item_class = "gPhoto"; ?>
+  <? if ($child->is_album()): ?>
+    <? $item_class = "gAlbum"; ?>
+  <? endif ?>
+  <li id="gMicroThumb_<?= $child->id ?>" class="gMicroThumb  <?= $item_class ?>" ref="<?= $child->id ?>">
     <?= $child->thumb_img(array("class" => "gThumbnail"), $thumbsize, true) ?>
-  </div>
-</li>
+  </li>
 <? endforeach ?>
+<? if (count($children) >= 25): ?>
+<script>
+   $.get("<?= url::site("organize/content/{$item_id}/$offset") ?>",
+     function(data) {
+       $("#gMicroThumbGrid").append(data);
+     }
+   );
+</script>
+<? endif ?>
\ No newline at end of file
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index d2cdd957..28b45be0 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,4 +1,20 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($children as $i => $child): ?>
-<? endforeach ?>
+<li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
+  <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
+        class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
+  </span>
+
+  <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
+       class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
+    <?= 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" : "" ?>">
+      <?= $children ?>
+    </ul>
+  <? endif ?>
+</li>
 
-- 
cgit v1.2.3


From 63f3efef37839ffba8cd75b9098d56cd03b06376 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 10:26:49 -0700
Subject: Revert "Revert "Enable the expand/collapse of branches by clicking on
 the plus/minus""

This reverts commit e37526f94df74a52a9cf36f0a5a5e641958ebbb3.
---
 modules/organize/controllers/organize.php       | 59 ++++++++++++++++---------
 modules/organize/css/organize.css               |  8 ++++
 modules/organize/js/organize.js                 | 28 +++++++++++-
 modules/organize/views/organize_dialog.html.php |  2 +-
 modules/organize/views/organize_tree.html.php   | 10 +++--
 5 files changed, 80 insertions(+), 27 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index d7854c53..e10e33b5 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -50,6 +50,27 @@ class Organize_Controller extends Controller {
     print $v->__toString();
   }
 
+  function children($item_id) {
+    $item = ORM::factory("item", $item_id);
+    access::required("view", $item);
+    access::required("edit", $item);
+
+    $albums = $item->children(null, 0, "album", array("title" => "ASC"));
+
+    $children = "";
+    foreach ($albums as $album) {
+      $v = new View("organize_tree.html");
+      $v->album = $album;
+      $v->selected = false;
+      $v->children = array();
+      $v->album_icon = $album->children_count("album") ? "ui-icon-plus" : "gBranchEmpty";
+
+      $children .= $v->__toString();
+    }
+
+    print $children;
+  }
+
   private function _get_micro_thumb_grid($item, $offset=0) {
     $v = new View("organize_thumb_grid.html");
     $v->item_id = $item->id;
@@ -60,34 +81,30 @@ class Organize_Controller extends Controller {
     return $v;
   }
 
-  private function _tree($item, $parent, $selected=false) {
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $albums = ORM::factory("item")
-      ->where(array("parent_id" => $parent->id, "type" => "album"))
-      ->orderby(array("title" => "ASC"))
-      ->find_all();
+  private function _tree($item, $parent, $depth=0) {
+    $albums = $parent->children(null, 0, "album", array("title" => "ASC"));
 
     $v = new View("organize_tree.html");
     $v->album = $parent;
 
-    $v->selected = false;
-    $v->children = "";
-    $v->album_icon = "ui-icon-plus";
-    if (!$selected) {
-      $v->selected = $parent->id == $item->id;
+    if ($parent->id == $item->id) {
+      $v->selected = true;
+      $depth = 1;
+    } else {
+      $v->selected = false;
+    }
+    $v->children = array();
+    $v->album_icon = "gBranchEmpty";
+    if ($albums->count()) {
+      $v->album_icon = "ui-icon-plus";
 
-      if ($albums->count() && ($parent->id == 1 || $v->selected) ) {
+      if ($depth <= 1) {
         $v->album_icon = "ui-icon-minus";
-      }
-
-      foreach ($albums as $album) {
-        $v->children .= $this->_tree($item, $album, $v->selected);
+        foreach ($albums as $album) {
+          $v->children[] = $this->_tree($item, $album, ++$depth);
+        }
       }
     }
-    return $v->__toString();
+    return $v;
   }
-
-
 }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4568a707..7c2d9c5b 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -41,6 +41,14 @@
   padding-left: 1.2em;
 }
 
+.gBranchText:hover {
+  border: 1px dashed #999;
+}
+
+.gBranchEmpty {
+  visibility: hidden;
+}
+
 .gBranchSelected {
   background-color: #cfdeff !important;
   border-bottom: 1px solid #999 !important;
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index e84afd03..74b02569 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -37,7 +37,6 @@
    * Dynamically initialize the organize dialog when it is displayed
    */
   function _init(data) {
-
     // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
     $(".sf-menu li.sfHover ul").css("z-index", 70);
 
@@ -64,6 +63,8 @@
       $.gallery_reload();
     });
 
+    $(".gBranchText span").click(_collapse_or_expanded_tree);
+
     //$(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
     //$(".gBranchText").droppable(treeDroppable);
     //$(".gBranchText").click(organizeOpenFolder);
@@ -109,6 +110,31 @@
     $("#gOrganizeDialog").dialog("close");
   };
 
+  /**
+   * Open or close a branch. If the children is a div placeholder, replace with <ul>
+   */
+  function _collapse_or_expanded_tree(event) {
+    var id = $(event.currentTarget).attr("ref");
+    if ($(event.currentTarget).hasClass("ui-icon-minus")) {
+      $(event.currentTarget).removeClass("ui-icon-minus");
+      $(event.currentTarget).addClass("ui-icon-plus");
+      $("#gOrganizeChildren-" + id).hide();
+    } else {
+      if ($("#gOrganizeChildren-" + id).is("div")) {
+        $("#gOrganizeChildren-" + id).remove();
+        $("#gOrganizeBranch-" + id).after("<ul id=\"gOrganizeChildren-" + id + "></ul>");
+        var url = $("#gOrganizeAlbumTree").attr("ref").replace("__ITEM_ID__", id);
+        $.get(url, function(data) {
+          $("#gOrganizeChildren-" + id).html(data);
+          $(".gBranchText span").click(_collapse_or_expanded_tree);
+        });;
+      }
+      $("#gOrganizeChildren-" + id).show();
+      $(event.currentTarget).removeClass("ui-icon-plus");
+      $(event.currentTarget).addClass("ui-icon-minus");
+    }
+  }
+
 })(jQuery);
 
 $("document").ready(function() {
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index cf3fd478..1e6646e4 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -12,7 +12,7 @@
     </div>
     <div class="yui-gf">
       <div id="gOrganizeTreeContainer" class="yui-u first">
-        <ul id="gOrganizeAlbumTree">
+        <ul id="gOrganizeAlbumTree" ref="<?= url::site("organize/children/__ITEM_ID__") ?>">
           <?= $album_tree ?>
         </ul>
       </div>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 28b45be0..d64410d8 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
-  <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-        class="ui-icon <?= $album_icon ?> <?= $album_icon ? "" : "gBranchEmpty" ?>">
-  </span>
 
   <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
        class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
+    <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
+          class="ui-icon <?= $album_icon ?>">
+    </span>
     <?= p::clean($album->title) ?>
   </div>
   <? if (empty($children)): ?>
@@ -13,7 +13,9 @@
   <? else: ?>
     <ul id="gOrganizeChildren-<?= $album->id ?>"
        class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-      <?= $children ?>
+      <? foreach ($children as $child): ?>
+        <?= $child ?>
+      <? endforeach ?>
     </ul>
   <? endif ?>
 </li>
-- 
cgit v1.2.3


From 8131e6fa380d52faa7c1dc9a59c2e83a4adb9134 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 6 Aug 2009 06:33:17 -0700
Subject: Tighten up the code by loading all the albums in the tree at once,
 removing the events to populate the button bar.

---
 modules/organize/controllers/organize.php          | 67 +++++----------
 modules/organize/helpers/organize.php              | 94 ----------------------
 modules/organize/js/organize.js                    | 47 +----------
 .../organize/views/organize_button_pane.html.php   |  5 --
 modules/organize/views/organize_dialog.html.php    |  9 ++-
 modules/organize/views/organize_tree.html.php      | 17 ++--
 6 files changed, 35 insertions(+), 204 deletions(-)
 delete mode 100644 modules/organize/helpers/organize.php
 delete mode 100644 modules/organize/views/organize_button_pane.html.php

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index cbaaca6e..95d71e9c 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -23,21 +23,20 @@ class Organize_Controller extends Controller {
 
   function index($item_id) {
     $item = ORM::factory("item", $item_id);
-    $root = ($item->id == 1) ? $item : ORM::factory("item", 1);
+    $root = $item->id == 1 ? $item : ORM::factory("item", 1);
     access::required("view", $item);
     access::required("edit", $item);
 
     $v = new View("organize_dialog.html");
-    $v->root = $root;
-    $v->item = $item;
-    $v->album_tree = $this->_tree($item, $root);
-    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item);
-    $v->button_pane = new View("organize_button_pane.html");
-    $buttons = (object)array("left" => array(), "middle" =>array(), "right" => array(),
-                             "item" => $item);
-    module::event("organize_format_button_pane", $buttons);
+    $v->title = $item->title;
+    $parents = array();
+    foreach ($item->parents() as $parent) {
+      $parents[$parent->id] = 1;
+    }
+    $parents[$item->id] = 1;
 
-    $v->button_pane->buttons = $buttons;
+    $v->album_tree = $this->_tree($root, $parents);
+    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item);
     print $v;
   }
 
@@ -50,28 +49,6 @@ class Organize_Controller extends Controller {
     print $v->__toString();
   }
 
-  function children($item_id) {
-    $item = ORM::factory("item", $item_id);
-    access::required("view", $item);
-    access::required("edit", $item);
-
-    $albums = $item->children(null, 0, array("type" => "album"), array("title" => "ASC"));
-
-    $children = "";
-    foreach ($albums as $album) {
-      $v = new View("organize_tree.html");
-      $v->album = $album;
-      $v->selected = false;
-      $v->children = array();
-      $v->album_icon =
-        $album->children_count(array("type" => "album")) ? "ui-icon-plus" : "gBranchEmpty";
-
-      $children .= $v->__toString();
-    }
-
-    print $children;
-  }
-
   private function _get_micro_thumb_grid($item, $offset=0) {
     $v = new View("organize_thumb_grid.html");
     $v->item_id = $item->id;
@@ -82,28 +59,20 @@ class Organize_Controller extends Controller {
     return $v;
   }
 
-  private function _tree($item, $parent, $depth=0) {
-    $albums = $parent->children(null, 0, array("type" => "album"), array("title" => "ASC"));
-
+  private function _tree($item, $parents) {
     $v = new View("organize_tree.html");
-    $v->album = $parent;
-
-    if ($parent->id == $item->id) {
-      $v->selected = true;
-      $depth = 1;
-    } else {
-      $v->selected = false;
-    }
+    $v->album = $item;
+    $keys = array_keys($parents);
+    $v->selected = end($keys) == $item->id;
     $v->children = array();
     $v->album_icon = "gBranchEmpty";
+
+    $albums = $item->children(null, 0, array("type" => "album"), array("title" => "ASC"));
     if ($albums->count()) {
-      $v->album_icon = "ui-icon-plus";
+      $v->album_icon = empty($parents[$item->id]) ? "ui-icon-plus" : "ui-icon-minus";
 
-      if ($depth <= 1) {
-        $v->album_icon = "ui-icon-minus";
-        foreach ($albums as $album) {
-          $v->children[] = $this->_tree($item, $album, ++$depth);
-        }
+      foreach ($albums as $album) {
+        $v->children[] = $this->_tree($album, $parents);
       }
     }
     return $v;
diff --git a/modules/organize/helpers/organize.php b/modules/organize/helpers/organize.php
deleted file mode 100644
index 25284771..00000000
--- a/modules/organize/helpers/organize.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class organize_Core {
-  static function get_general_edit_form($item) {
-    $generalPane = new Forge("organize/__FUNCTION__", "", "post",
-                             array("id" => "gEditGeneral", "ref" => "general"));
-    // In this case we know there is only 1 item, but in general we should loop
-    // and create multiple hidden items.
-    $generalPane->hidden("item[]")->value($item->id);
-    $generalPane->input("title")->label(t("Title"))->value($item->title);
-    $generalPane->textarea("description")->label(t("Description"))->value($item->description);
-    $generalPane->input("dirname")->label(t("Path Name"))->value($item->name)
-      ->callback("item::validate_no_slashes")
-      ->error_messages("no_slashes", t("The directory name can't contain a \"/\""))
-      ->callback("item::validate_no_trailing_period")
-      ->error_messages("no_trailing_period", t("The directory name can't end in \".\""))
-      ->callback("item::validate_no_name_conflict")
-      ->error_messages("conflict", t("The path name is not unique"));
-
-    return $generalPane;
-  }
-
-  static function get_sort_edit_form($item) {
-    $sortPane = new Forge("organize/__FUNCTION__", "", "post",
-                          array("id" => "gEditSort", "ref" => "sort"));
-    $sortPane->hidden("item[]")->value($item->id);
-    $sortPane->dropdown("column", array("id" => "gAlbumSortColumn"))
-      ->label(t("Sort by"))
-      ->options(array("weight" => t("Order Added"),
-                      "captured" => t("Capture Date"),
-                      "created" => t("Creation Date"),
-                      "title" => t("Title"),
-                      "updated" => t("Updated Date"),
-                      "view_count" => t("Number of views"),
-                      "rand_key" => t("Random")))
-      ->selected($item->sort_column);
-    $sortPane->dropdown("direction", array("id" => "gAlbumSortDirection"))
-      ->label(t("Order"))
-      ->options(array("ASC" => t("Ascending"),
-                      "DESC" => t("Descending")))
-      ->selected($item->sort_order);
-
-    return $sortPane;
-  }
-
-  static function get_tag_form($itemids) {
-    $tagPane = new Forge("organize/__FUNCTION__", "", "post",
-                             array("id" => "gEditTags", "ref" => "edit_tags"));
-    $tagPane->hidden("item")->value(implode("|", $itemids));
-    $item_count = count($itemids);
-    $ids = implode(", ", $itemids);
-
-    // Lame stopgap security check.  This code is going to get rewritten anyway.
-    foreach ($itemids as $id) {
-      $item = ORM::factory("item", $id);
-      access::required("view", $item);
-      access::required("edit", $item);
-    }
-
-    $tags = Database::instance()->query(
-      "SELECT t.name, COUNT(it.item_id) as count
-         FROM {items_tags} it, {tags} t
-        WHERE it.tag_id = t.id
-          AND it.item_id in($ids)
-       GROUP BY it.tag_id
-       ORDER BY t.name ASC");
-    $taglist = array();
-    foreach ($tags as $tag) {
-      $taglist[] = $tag->name . ($item_count > $tag->count ? "*" : "");
-    }
-    $taglist = implode("; ", $taglist);
-    $tagPane->textarea("tags")->label(t("Tags"))->value($taglist);
-
-    return $tagPane;
-  }
-
-}
\ No newline at end of file
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 12712ff1..0a7576b0 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -12,7 +12,6 @@
         $("body").append('<div id="gOrganizeDialog"></div>');
 
         $("#gOrganizeDialog").dialog(opts);
-        // Pass the approx height and width of the thumb grid to optimize thumb retrieval
         $.get(href, _init);
         return false;
       });
@@ -45,8 +44,7 @@
 
     var heightMicroThumbPanel = $("#gOrganizeDialog").innerHeight();
     heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
-    heightMicroThumbPanel -= $("#gMessage").outerHeight();
-    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel);
+    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel - 10 - $("#gMessage").outerHeight());
     $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
 
     heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
@@ -65,15 +63,6 @@
 
     $(".gBranchText span").click(_collapse_or_expanded_tree);
     $(".gBranchText").click(_setContents);
-    $(".gAlbum img.gThumbnail").live("dblclick", _openAlbum);
-
-    //$(".gOrganizeBranch .ui-icon").click(organizeToggleChildren);
-    //$(".gBranchText").droppable(treeDroppable);
-
-    //$("#gMicroThumbPanel").droppable(thumbDroppable);
-    //$("#gMicroThumbPanel").selectable(selectable);
-    //$("#gOrganizeEditDrawerHandle a").click(drawerHandleButtonsClick);
-
   };
 
   function _dialog_close(event) {
@@ -86,26 +75,12 @@
    */
   function _collapse_or_expanded_tree(event) {
     event.stopPropagation();
-    var id = $(event.currentTarget).attr("ref");
     if ($(event.currentTarget).hasClass("ui-icon-minus")) {
-      $(event.currentTarget).removeClass("ui-icon-minus");
-      $(event.currentTarget).addClass("ui-icon-plus");
-      $("#gOrganizeChildren-" + id).hide();
+      $(event.currentTarget).removeClass("ui-icon-minus").addClass("ui-icon-plus");
     } else {
-      if ($("#gOrganizeChildren-" + id).is("div")) {
-        $("#gOrganizeChildren-" + id).remove();
-        $("#gOrganizeBranch-" + id).after("<ul id=\"gOrganizeChildren-" + id + "></ul>");
-        var url = $("#gOrganizeAlbumTree").attr("ref").replace("__ITEM_ID__", id);
-        $.get(url, function(data) {
-          $("#gOrganizeChildren-" + id).html(data);
-          $(".gBranchText span").click(_collapse_or_expanded_tree);
-          $(".gBranchText").click(_setContents);
-        });
-      }
-      $("#gOrganizeChildren-" + id).show();
-      $(event.currentTarget).removeClass("ui-icon-plus");
-      $(event.currentTarget).addClass("ui-icon-minus");
+      $(event.currentTarget).removeClass("ui-icon-plus").addClass("ui-icon-minus");
     }
+    $("#gOrganizeChildren-" + $(event.currentTarget).attr("ref")).toggle();
   }
 
   /**
@@ -118,26 +93,12 @@
     }
     var id = $(event.currentTarget).attr("ref");
     $(".gBranchSelected").removeClass("gBranchSelected");
-    $(event.currentTarget).addClass("gBranchSelected");
-    var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
-    $.get(url, function(data) {
-      $("#gMicroThumbGrid").html(data);
-    });
-  }
-
-  function _openAlbum(event) {
-    event.preventDefault();
-    var id = $(event.target).parent().attr("ref");
-    $(".gBranchSelected").removeClass("gBranchSelected");
     $("#gOrganizeBranch-" + id).addClass("gBranchSelected");
     var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
-    // @todo load the branch elements if required.
     $.get(url, function(data) {
       $("#gMicroThumbGrid").html(data);
-    //  $(".gAlbum img.gThumbnail").dblclick(_openAlbum);
     });
   }
-
 })(jQuery);
 
 $("document").ready(function() {
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>
 
-- 
cgit v1.2.3


From 794a7a5abf38ed828329cb0023df938479e90901 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 6 Aug 2009 14:55:03 -0700
Subject: Leverage the gallery.dialog/js functionality in order to reduce
 duplicate code

---
 modules/organize/helpers/organize_event.php     |   2 +-
 modules/organize/helpers/organize_theme.php     |   7 +-
 modules/organize/js/organize.js                 | 131 +++++++++---------------
 modules/organize/views/organize_dialog.html.php |  10 ++
 4 files changed, 61 insertions(+), 89 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 99a28673..887d9c2d 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -23,7 +23,7 @@ class organize_event_Core {
 
     if ($item && access::can("edit", $item) && $item->is_album()) {
       $menu->get("options_menu")
-        ->append(Menu::factory("link")
+        ->append(Menu::factory("dialog")
         ->id("organize")
         ->label(t("Organize Album"))
         ->css_id("gOrganizeLink")
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index f01ab88b..0fd117c3 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -19,8 +19,9 @@
  */
 class organize_theme {
   static function head($theme) {
-    //$theme->script("organize_init.js");
-    $theme->script("organize.js");
-    $theme->css("organize.css");
+    if (access::can("view", $theme->item()) && access::can("edit", $theme->item())) {
+      $theme->script("organize.js");
+      $theme->css("organize.css");
+    }
   }
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 3e58f3f3..e4d4a9a2 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,91 +1,52 @@
 (function($) {
-  $.fn.organize = function() {
-    var size = $.getViewportSize();
-    var height = size.height() - 100;     // Leave 50 pixels on the top and bottom of the dialog
-    var width = size.width() - 100;       // Leave 50 pixels on the left and right of the dialog
-    return this.each(function() {
-      $(this).click(function(event) {
-        var href = event.target.href;
-
-        $("body").append('<div id="gOrganizeDialog"></div>');
-
-        $("#gOrganizeDialog").dialog({
-          autoOpen: false,
-          modal: true,
-          resizable: false,
-          width: width,
-          height: height,
-          position: "center",
-          close: function () {
-            $("#gOrganizeDialog").dialog("destroy").remove();
-            document.location.reload();
-         },
-          zIndex: 75
-        });
-        $.get(href, _init);
-        return false;
+  $.organize = {
+    /**
+     * Dynamically initialize the organize dialog when it is displayed
+     */
+    init: function(data) {
+      // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?)
+      $(".sf-menu li.sfHover ul").css("z-index", 70);
+
+      var height = $("#gOrganizeDetail").innerHeight();
+      $("#gMicroThumbPanel").height(height - $("#gOrganizeEditDrawerHandle").outerHeight());
+
+      $("#gDialog #gMicroThumbDone").click(function(event) {
+        $("#gDialog").dialog("close");
+                                             window.location.reload();
       });
-    });
-  };
-
-  /**
-   * Dynamically initialize the organize dialog when it is displayed
-   */
-  function _init(data) {
-    // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?)
-    $(".sf-menu li.sfHover ul").css("z-index", 70);
 
-    $("#gOrganizeDialog").html(data);
-    $("#gOrganizeDialog").dialog("open");
-
-    var height = $("#gOrganizeDetail").innerHeight();
-    $("#gMicroThumbPanel").height(height - $("#gOrganizeEditDrawerHandle").outerHeight());
-
-    if ($("#gOrganizeDialog h1").length) {
-      $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog h1:eq(0)").html());
-    } else if ($("#gOrganizeDialog fieldset legend").length) {
-      $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog fieldset legend:eq(0)").html());
+      $(".gBranchText span").click($.organize.collapse_or_expand_tree);
+      $(".gBranchText").click($.organize.setContents);
+    },
+
+    /**
+     * Open or close a branch. If the children is a div placeholder, replace with <ul>
+     */
+    collapse_or_expand_tree: function (event) {
+      event.stopPropagation();
+      if ($(event.currentTarget).hasClass("ui-icon-minus")) {
+        $(event.currentTarget).removeClass("ui-icon-minus").addClass("ui-icon-plus");
+      } else {
+        $(event.currentTarget).removeClass("ui-icon-plus").addClass("ui-icon-minus");
+      }
+      $("#gOrganizeChildren-" + $(event.currentTarget).attr("ref")).toggle();
+    },
+
+    /**
+     * When the text of a selection is clicked, then show that albums contents
+     */
+    setContents: function(event) {
+      event.preventDefault();
+      if ($(event.currentTarget).hasClass("gBranchSelected")) {
+        return;
+      }
+      var id = $(event.currentTarget).attr("ref");
+      $(".gBranchSelected").removeClass("gBranchSelected");
+      $("#gOrganizeBranch-" + id).addClass("gBranchSelected");
+      var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
+      $.get(url, function(data) {
+        $("#gMicroThumbGrid").html(data);
+      });
     }
-
-    $("#gOrganizeDialog #gMicroThumbDone").click(function(event) {
-      $("#gOrganizeDialog").dialog("close");
-    });
-
-    $(".gBranchText span").click(_collapse_or_expanded_tree);
-    $(".gBranchText").click(_setContents);
   };
-
-  /**
-   * Open or close a branch. If the children is a div placeholder, replace with <ul>
-   */
-  function _collapse_or_expanded_tree(event) {
-    event.stopPropagation();
-    if ($(event.currentTarget).hasClass("ui-icon-minus")) {
-      $(event.currentTarget).removeClass("ui-icon-minus").addClass("ui-icon-plus");
-    } else {
-      $(event.currentTarget).removeClass("ui-icon-plus").addClass("ui-icon-minus");
-    }
-    $("#gOrganizeChildren-" + $(event.currentTarget).attr("ref")).toggle();
-  }
-
-  /**
-   * When the text of a selection is clicked, then show that albums contents
-   */
-  function _setContents(event) {
-    event.preventDefault();
-    if ($(event.currentTarget).hasClass("gBranchSelected")) {
-      return;
-    }
-    var id = $(event.currentTarget).attr("ref");
-    $(".gBranchSelected").removeClass("gBranchSelected");
-    $("#gOrganizeBranch-" + id).addClass("gBranchSelected");
-    var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
-    $.get(url, function(data) {
-      $("#gMicroThumbGrid").html(data);
-    });
-  }
 })(jQuery);
-
-$("document").ready(function() {
-  $("#gOrganizeLink").organize();
-});
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 4f10297e..11ce0a37 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -38,3 +38,13 @@
   </div>
 </div>
 
+<script type="text/javascript">
+  setTimeout(function() {
+    // Resize with 50 pixels padding all around
+    var size = $.getViewportSize();
+    $("#gDialog").dialog("option", "height", size.height() - 100)
+                 .dialog("option", "width", size.width() - 100)
+                 .dialog("option", "position", "center");
+    $.organize.init();
+  }, 0);
+</script>
\ No newline at end of file
-- 
cgit v1.2.3


From a245c57400398d2b4b1c2aea94f590a9c0a7d8a8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 6 Aug 2009 21:36:17 -0700
Subject: Further streamline the code.

Organize_Controller:
* Remove unnecessary constants
* Rename index() to dialog()
* Simplify _get_micro_thumb_grid

organize.js:
* Move sizing code in here from organize_dialog.html.php

organize_dialog.html.php:
* Move CSS and JS links in here so that we only load them when we need them.
* Move sizing code into organize.js

organize_thumb_grid.html.php:
* Move pagination logic in here, since it's view centric
* Collapse the css class determination code and inline it
---
 modules/organize/controllers/organize.php          | 22 +++++----------
 modules/organize/helpers/organize_event.php        |  2 +-
 modules/organize/helpers/organize_theme.php        | 27 -------------------
 modules/organize/js/organize.js                    |  6 +++++
 modules/organize/views/organize_dialog.html.php    |  9 +++----
 .../organize/views/organize_thumb_grid.html.php    | 31 +++++++++++-----------
 modules/organize/views/organize_tree.html.php      |  2 --
 7 files changed, 33 insertions(+), 66 deletions(-)
 delete mode 100644 modules/organize/helpers/organize_theme.php

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 95d71e9c..3a81ef4f 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Organize_Controller extends Controller {
-  private static $_MICRO_THUMB_SIZE = 90;
-  private static $_MICRO_THUMB_PADDING = 10;
-
-  function index($item_id) {
+  function dialog($item_id) {
     $item = ORM::factory("item", $item_id);
     $root = $item->id == 1 ? $item : ORM::factory("item", 1);
     access::required("view", $item);
@@ -36,26 +33,21 @@ class Organize_Controller extends Controller {
     $parents[$item->id] = 1;
 
     $v->album_tree = $this->_tree($root, $parents);
-    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item);
+    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item, 0);
     print $v;
   }
 
-  function content($item_id, $offset=0) {
+  function content($item_id, $offset) {
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
     access::required("edit", $item);
-
-    $v = $this->_get_micro_thumb_grid($item, $offset);
-    print $v->__toString();
+    print $this->_get_micro_thumb_grid($item, $offset);
   }
 
-  private function _get_micro_thumb_grid($item, $offset=0) {
+  private function _get_micro_thumb_grid($item, $offset) {
     $v = new View("organize_thumb_grid.html");
-    $v->item_id = $item->id;
-    $v->children = $item->children(25, $offset);
-    $v->thumbsize = self::$_MICRO_THUMB_SIZE;
-    $v->offset = $offset + 25;
-
+    $v->item = $item;
+    $v->offset = $offset;
     return $v;
   }
 
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 887d9c2d..7d6b3e24 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -27,7 +27,7 @@ class organize_event_Core {
         ->id("organize")
         ->label(t("Organize Album"))
         ->css_id("gOrganizeLink")
-        ->url(url::site("organize/index/{$item->id}")));
+        ->url(url::site("organize/dialog/{$item->id}")));
     }
   }
 }
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
deleted file mode 100644
index 0fd117c3..00000000
--- a/modules/organize/helpers/organize_theme.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class organize_theme {
-  static function head($theme) {
-    if (access::can("view", $theme->item()) && access::can("edit", $theme->item())) {
-      $theme->script("organize.js");
-      $theme->css("organize.css");
-    }
-  }
-}
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index d2006c27..6b4a5934 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -4,6 +4,12 @@
      * Dynamically initialize the organize dialog when it is displayed
      */
     init: function(data) {
+      // Resize with 50 pixels padding all around
+      var size = $.getViewportSize();
+      $("#gDialog").dialog("option", "height", size.height() - 100)
+	.dialog("option", "width", size.width() - 100)
+	.dialog("option", "position", "center");
+
       // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?)
       $(".sf-menu li.sfHover ul").css("z-index", 70);
 
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 11ce0a37..6001e038 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -1,4 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<link rel="stylesheet" type="text/css" href="<?= url::file("modules/organize/css/organize.css") ?>" />
 <div id="gOrganize">
   <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($title))) ?></h1>
   <div id="bd">
@@ -38,13 +39,9 @@
   </div>
 </div>
 
+<script type="text/javascript" src="<?= url::file("modules/organize/js/organize.js") ?>"></script>
 <script type="text/javascript">
   setTimeout(function() {
-    // Resize with 50 pixels padding all around
-    var size = $.getViewportSize();
-    $("#gDialog").dialog("option", "height", size.height() - 100)
-                 .dialog("option", "width", size.width() - 100)
-                 .dialog("option", "position", "center");
     $.organize.init();
   }, 0);
-</script>
\ No newline at end of file
+</script>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index e6b7aec0..0d54c5c8 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,19 +1,20 @@
 <?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="gMicroThumb_<?= $child->id ?>" class="gMicroThumb  <?= $item_class ?>" ref="<?= $child->id ?>">
-    <?= $child->thumb_img(array("class" => "gThumbnail"), $thumbsize, true) ?>
-  </li>
+<? foreach ($item->children(25, $offset) as $child): ?>
+<li id="gMicroThumb_<?= $child->id ?>"
+    class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>"
+    ref="<?= $child->id ?>">
+  <?= $child->thumb_img(array("class" => "gThumbnail"), 90, true) ?>
+</li>
 <? endforeach ?>
-<? if (count($children) >= 25): ?>
+
+<? if ($item->children_count() > $offset): ?>
 <script>
-   $.get("<?= url::site("organize/content/{$item_id}/$offset") ?>",
-     function(data) {
-       $("#gMicroThumbGrid").append(data);
-     }
-   );
+  setTimeout(function() {
+    $.get("<?= url::site("organize/content/$item->id/" . ($offset + 25)) ?>",
+      function(data) {
+        $("#gMicroThumbGrid").append(data);
+      }
+    );
+  }, 50);
 </script>
-<? endif ?>
\ No newline at end of file
+<? endif ?>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 280bdc5f..99b0dc1a 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,6 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
-
   <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
        class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
     <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
@@ -16,4 +15,3 @@
     <? endforeach ?>
   </ul>
 </li>
-
-- 
cgit v1.2.3


From 7b0ea229b8591c3fba5eb3cb853aa2ac3efd2d97 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 7 Aug 2009 17:07:04 -0700
Subject: Make the organize dialog open properly in IE8, Chrome and FF. For
 some reason (probably a timing thing) the height of the contents was not
 being set correctly in FF. So we just hard code an estimate of the size of
 the Draw handle, and message areas.

---
 lib/gallery.dialog.js                           |  8 ++++++--
 modules/organize/js/organize.js                 | 16 +++++++---------
 modules/organize/views/organize_dialog.html.php |  4 +---
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'modules/organize/views')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 51ebb21a..e3597eab 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -59,10 +59,14 @@
        var dialogHeight = $("#gDialog").height();
        var cssWidth = new String($("#gDialog form").css("width"));
        var childWidth = cssWidth.replace(/[^0-9]/g,"");
+       var size = $.gallery_get_viewport_size();
        if ($("#gDialog iframe").length) {
-         dialogWidth = $(window).width() - 100;
+         dialogWidth = size.width() - 100;
          // Set the iframe width and height
-         $("#gDialog iframe").width("100%").height($(window).height() - 100);
+         $("#gDialog iframe").width("100%").height(size.height() - 100);
+       } else if ($("#gDialog form").length == 0) {
+         dialogWidth = size.width() - 100;
+         $("#gDialog").dialog("option", "height", size.height() - 100);
        } else if (childWidth == "" || childWidth > 300) {
          dialogWidth = 500;
        }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 6b4a5934..853e3eef 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -4,21 +4,19 @@
      * Dynamically initialize the organize dialog when it is displayed
      */
     init: function(data) {
-      // Resize with 50 pixels padding all around
-      var size = $.getViewportSize();
-      $("#gDialog").dialog("option", "height", size.height() - 100)
-	.dialog("option", "width", size.width() - 100)
-	.dialog("option", "position", "center");
-
       // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?)
       $(".sf-menu li.sfHover ul").css("z-index", 70);
 
-      var height = $("#gOrganizeDetail").innerHeight();
-      $("#gMicroThumbPanel").height(height - $("#gOrganizeEditDrawerHandle").outerHeight());
+      $("#gDialog").bind("dialogopen", function(event, ui) {
+        $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
+      });
+
+      $("#gDialog").bind("dialogclose", function(event, ui) {
+        window.location.reload();
+      });
 
       $("#gDialog #gMicroThumbDone").click(function(event) {
         $("#gDialog").dialog("close");
-        window.location.reload();
       });
 
       $(".gBranchText span").click($.organize.collapse_or_expand_tree);
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 6001e038..0daa328d 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -41,7 +41,5 @@
 
 <script type="text/javascript" src="<?= url::file("modules/organize/js/organize.js") ?>"></script>
 <script type="text/javascript">
-  setTimeout(function() {
-    $.organize.init();
-  }, 0);
+  $("#gOrganize").ready($.organize.init);
 </script>
-- 
cgit v1.2.3


From 1c5b04a2c5d58838dbea413359c9b114f7077ca8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 8 Aug 2009 16:26:34 -0700
Subject: Fix the problem where the login page and edit permission pages were
 supersized based on ly last commit.

---
 lib/gallery.dialog.js                           | 2 +-
 modules/organize/views/organize_dialog.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/organize/views')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 6c2993fd..ace588f6 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -61,7 +61,7 @@
          dialogWidth = size.width() - 100;
          // Set the iframe width and height
          $("#gDialog iframe").width("100%").height(size.height() - 100);
-       } else if ($("#gDialog form").length == 0) {
+       } else if ($("#gDialog .gDialogPanel").length) {
          dialogWidth = size.width() - 100;
          $("#gDialog").dialog("option", "height", size.height() - 100);
        } else if (childWidth == "" || childWidth > 300) {
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 0daa328d..b946d82b 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.") ?>
 <link rel="stylesheet" type="text/css" href="<?= url::file("modules/organize/css/organize.css") ?>" />
-<div id="gOrganize">
+<div id="gOrganize" class="gDialogPanel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
-- 
cgit v1.2.3


From 3823f65dfb4114caf9bd9cfbf730638927f6c970 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 12 Aug 2009 21:55:25 -0700
Subject: Implement the first part of drag functionality.  Having trouble
 getting visual feedback of the drop position between thumbnails, so this
 commit provides a checkpoint for trying various options

---
 modules/organize/controllers/organize.php          |  9 +--
 modules/organize/css/organize.css                  |  9 ++-
 modules/organize/helpers/organize_theme.php        | 28 +++++++++
 modules/organize/js/organize.js                    | 73 +++++++++++++++++++++-
 modules/organize/views/organize_dialog.html.php    |  4 +-
 .../organize/views/organize_thumb_grid.html.php    |  2 +-
 modules/organize/views/organize_tree.html.php      |  4 +-
 7 files changed, 116 insertions(+), 13 deletions(-)
 create mode 100644 modules/organize/helpers/organize_theme.php

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 3a81ef4f..6f83f940 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -60,13 +60,14 @@ class Organize_Controller extends Controller {
     $v->album_icon = "gBranchEmpty";
 
     $albums = $item->children(null, 0, array("type" => "album"), array("title" => "ASC"));
-    if ($albums->count()) {
-      $v->album_icon = empty($parents[$item->id]) ? "ui-icon-plus" : "ui-icon-minus";
-
-      foreach ($albums as $album) {
+    foreach ($albums as $album) {
+      if (access::can("view", $album)) {
         $v->children[] = $this->_tree($album, $parents);
       }
     }
+    if (count($v->children)) {
+      $v->album_icon = empty($parents[$item->id]) ? "ui-icon-plus" : "ui-icon-minus";
+    }
     return $v;
   }
 }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index a4b5fdbd..1cc7c92c 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,3 +1,4 @@
+
 /*******************************************************************
  * Dialog wide stylings
  */
@@ -92,7 +93,7 @@
 }
 
 #gMicroThumbGrid {
-  padding: .5em;
+  padding: 1em;
 }
 
 .gMicroThumb {
@@ -107,10 +108,14 @@
   width: 9em;
 }
 
-.gMicroThumb.ui-selected {
+.gMicroThumb.ui-state-selected {
   opacity: 1;
 }
 
+.ui-selectable-lasso {
+  z-index: 2000 !important;
+  border: 1px dashed #13A;
+}
 
 .gThumbnail {
   padding: .5em;
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
new file mode 100644
index 00000000..de812261
--- /dev/null
+++ b/modules/organize/helpers/organize_theme.php
@@ -0,0 +1,28 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class organize_theme {
+  static function head($theme) {
+    $item = $theme->item();
+    if ($item && access::can("edit", $item) && $item->is_album()) {
+      $theme->script("organize.js");
+      $theme->css("organize.css");
+    }
+  }
+}
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 05693200..c9408673 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,15 +1,83 @@
 (function($) {
   $.organize = {
+    micro_thumb_draggable: {
+      distance: 10,
+      cursorAt: { left: -10, top: -10},
+      appendTo: "#gOrganizeContentPane",
+      helper: function(event, ui) {
+        var selected = $("li.ui-state-selected img"),
+            set = $('<div class="temp"></div>').css({zIndex: 2000, width: 80, height: Math.ceil(selected.length / 5) * 16 }),
+            offset = $(this).offset(),
+            click = { left: event.pageX - offset.left, top: event.pageY - offset.top };
+
+        selected.each(function(i) {
+          var row = parseInt(i / 5);
+          var j = i - (row * 5);
+
+          var o = $(this).offset();
+
+          var copy = $(this).clone()
+            .css({
+              width: $(this).width(), height: $(this).height(), display: "block",
+              margin: 0, position: 'absolute', outline: '5px solid #fff',
+              left: o.left - event.pageX, top: o.top - event.pageY
+            })
+            .appendTo(set)
+            .animate({width: 10, height: 10, outlineWidth: 1, margin: 1, left: (20 * j), top: (row * 20)}, 500);
+        });
+        return set;
+      },
+      start: function(event, ui) {
+        $("#gMicroThumbPanel").prepend("<div id=\"gPlaceHolder\"></div>");
+
+        $("#gMicroThumbPanel li.ui-state-selected").hide();
+      },
+      drag: function(event, ui) {
+        var container = $("#gMicroThumbPanel").get(0);
+        var scrollTop = container.scrollTop;
+        var height = $(container).height();
+        if (event.pageY > height + scrollTop) {
+          container.scrollTop += height;
+        } else if (event.pageY < scrollTop) {
+          container.scrollTop -= height;
+        }
+      },
+      stop: function(event, ui) {
+        $("li.ui-state-selected").show();
+      }
+    },
+
+    droppable: {
+      accept: "*",
+      tolerance: "pointer",
+      greedy: true,
+      drop: function(event, ui) {
+        // @todo do a ajax call to send the rearrange request to the zerver
+        // organize/move/target_id/
+        // post parameters
+        //  before=id|after=id
+        //  source=[id1, id2, ...]
+        //  before or after not supplied then append to end
+        // return: json {
+        //   result: success | msg,
+        //   tree: null | new tree,
+        //   content: new thumbgrid
+        // }
+      }
+    },
+
     /**
      * Dynamically initialize the organize dialog when it is displayed
      */
     init: function(data) {
+      var self = this;
       // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?)
       $(".sf-menu li.sfHover ul").css("z-index", 68);
       $("#gDialog").dialog("option", "zIndex", 70);
       $("#gDialog").bind("dialogopen", function(event, ui) {
         $("#gOrganize").height($("#gDialog").innerHeight() - 20);
         $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
+        $("#gOrganizeAlbumTree").height($("#gDialog").innerHeight() - 59);
       });
 
       $("#gDialog").bind("dialogclose", function(event, ui) {
@@ -23,7 +91,10 @@
       $(".gBranchText span").click($.organize.collapse_or_expand_tree);
       $(".gBranchText").click($.organize.show_album);
 
-      $("#gMicroThumbGrid").selectable({filter: ".gMicroThumb"});
+      $("#gMicroThumbPanel").selectable({filter: "li"});
+      $("#gMicroThumbPanel img").draggable($.organize.micro_thumb_draggable);
+      $(".gOrganizeBranch").droppable($.organize.droppable);
+      $("#gMicroThumbPanel").droppable($.organize.droppable);
     },
 
     /**
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index b946d82b..f8d6d792 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -1,5 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<link rel="stylesheet" type="text/css" href="<?= url::file("modules/organize/css/organize.css") ?>" />
 <div id="gOrganize" class="gDialogPanel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($title))) ?></h1>
   <div id="bd">
@@ -11,7 +10,7 @@
         <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
       </div>
     </div>
-    <div class="yui-gf">
+    <div id= "gOrganizeContentPane" class="yui-gf">
       <div id="gOrganizeTreeContainer" class="yui-u first">
         <ul id="gOrganizeAlbumTree">
           <?= $album_tree ?>
@@ -39,7 +38,6 @@
   </div>
 </div>
 
-<script type="text/javascript" src="<?= url::file("modules/organize/js/organize.js") ?>"></script>
 <script type="text/javascript">
   $("#gOrganize").ready($.organize.init);
 </script>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 0d54c5c8..b6e3aa11 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -3,7 +3,7 @@
 <li id="gMicroThumb_<?= $child->id ?>"
     class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>"
     ref="<?= $child->id ?>">
-  <?= $child->thumb_img(array("class" => "gThumbnail"), 90, true) ?>
+  <?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
 </li>
 <? endforeach ?>
 
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 99b0dc1a..d2ef287a 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
   <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
-       class="<?= $selected ? "gBranchSelected" : "" ?> gBranchText">
+       class="<?= $selected ? "gBranchSelected" : "" ?>">
     <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
           class="ui-icon <?= $album_icon ?>">
     </span>
-    <?= p::clean($album->title) ?>
+    <span class="gBranchText" ref="<?= $album->id ?>"><?= p::clean($album->title) ?></span>
   </div>
   <ul id="gOrganizeChildren-<?= $album->id ?>"
       class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-- 
cgit v1.2.3


From d758266fabff6c9fe4de22fce57bf00962150ee2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 13 Aug 2009 18:58:40 -0700
Subject: Add a visual indicator of the insertion point

---
 modules/organize/css/organize.css                  | 16 ++++++----
 modules/organize/js/organize.js                    | 34 ++++++++++++++++------
 .../organize/views/organize_thumb_grid.html.php    |  5 +++-
 3 files changed, 39 insertions(+), 16 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 1cc7c92c..d717bcae 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -96,19 +96,23 @@
   padding: 1em;
 }
 
+.gMicroThumbGridCell {
+  float: left;
+  font-size: 0.8em;
+  padding: .5em !important;
+  opacity: .5;
+  border-left: 1px hidden #13A;
+  border-right: 1px hidden #13A;
+}
+
 .gMicroThumb {
   display: block;
-  float: left;
-  font-size: .8em;
   height: 9em;
-  margin-bottom: 1em;
-  margin-left: 1em;
-  opacity: .5;
   text-align: center;
   width: 9em;
 }
 
-.gMicroThumb.ui-state-selected {
+.gMicroThumbGridCell.ui-state-selected {
   opacity: 1;
 }
 
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index aadc713a..a1b59676 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -3,10 +3,10 @@
     micro_thumb_draggable: {
       distance: 10,
       cursorAt: { left: -10, top: -10},
-      //appendTo: "#gOrganizeContentPane",
+      appendTo: "#gMicroThumbPanel",
       helper: function(event, ui) {
-        var selected = $("li.ui-state-selected img"),
-            set = $('<div class="temp"></div>').css({zIndex: 2000, width: 80, height: Math.ceil(selected.length / 5) * 16 }),
+        var selected = $(".ui-draggable.ui-state-selected img"),
+            set = $('<div class="gDragHelper"></div>').css({zIndex: 2000, width: 80, height: Math.ceil(selected.length / 5) * 16 }),
             offset = $(this).offset(),
             click = { left: event.pageX - offset.left, top: event.pageY - offset.top };
 
@@ -28,7 +28,7 @@
         return set;
       },
       start: function(event, ui) {
-        $("#gMicroThumbPanel li.ui-state-selected").hide();
+        $("#gMicroThumbPanel .ui-state-selected").hide();
       },
       drag: function(event, ui) {
         var top = $("#gMicroThumbPanel").offset().top;
@@ -39,9 +39,10 @@
           $("#gMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gMicroThumbPanel").get(0).scrollTop - 100);
         }
       },
+      // @todo delete this method when drop is implemented
       stop: function(event, ui) {
-        // @todo delete this method when drop is implemented
-        $("li.ui-state-selected").show();
+        $(".ui-state-selected").show();
+        $(".gMicroThumbGridCell").css("borderStyle", "none");
       }
     },
 
@@ -50,7 +51,7 @@
       tolerance: "pointer",
       greedy: true,
       drop: function(event, ui) {
-        // @todo do a ajax call to send the rearrange request to the zerver
+        // @todo do a ajax call to send the rearrange request to the server
         // organize/move/target_id/
         // post parameters
         //  before=id|after=id
@@ -90,10 +91,24 @@
       $(".gBranchText span").click($.organize.collapse_or_expand_tree);
       $(".gBranchText").click($.organize.show_album);
 
-      $("#gMicroThumbPanel").selectable({filter: "li"});
-      $("#gMicroThumbPanel li").draggable($.organize.micro_thumb_draggable);
+      $("#gMicroThumbPanel").selectable({filter: ".gMicroThumbGridCell"});
       $(".gOrganizeBranch").droppable($.organize.droppable);
       $("#gMicroThumbPanel").droppable($.organize.droppable);
+
+      $.organize.set_handlers();
+    },
+
+    set_handlers: function() {
+      $(".gMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
+      $(".gMicroThumbGridCell").mousemove(function(event) {
+        if ($(".gDragHelper").length) {
+          $(".gMicroThumbGridCell").css("borderStyle", "none");
+          console.log("pageX:" + event.pageX + ", offset.left:" + $(this).offset().left + ", width:" + $(this).width());
+          var side = event.pageX < $(this).offset().left + $(this).width() / 2 ?
+            "hidden hidden hidden solid" : "hidden solid hidden hidden";
+          $(this).css("borderStyle", side);
+        }
+      });
     },
 
     /**
@@ -119,6 +134,7 @@
       var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
       $.get(url, function(data) {
         $("#gMicroThumbGrid").html(data);
+        $.organize.set_handlers();
       });
     }
   };
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index b6e3aa11..b41c54e8 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,9 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($item->children(25, $offset) as $child): ?>
-<li id="gMicroThumb_<?= $child->id ?>"
+<li class="gMicroThumbGridCell">
+<div id="gMicroThumb_<?= $child->id ?>"
     class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>"
     ref="<?= $child->id ?>">
   <?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
+</div>
 </li>
 <? endforeach ?>
 
@@ -13,6 +15,7 @@
     $.get("<?= url::site("organize/content/$item->id/" . ($offset + 25)) ?>",
       function(data) {
         $("#gMicroThumbGrid").append(data);
+        $.organize.set_handlers();
       }
     );
   }, 50);
-- 
cgit v1.2.3


From eeae2dc56c822a2fa32278bfe0f52bc43f665ec2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 13 Aug 2009 21:31:20 -0700
Subject: Added javascript portion of the drop functionality.  At this point
 you can drag selected images and drop them on the micro thumb grid in a
 different position or onto a branch in the gallery tree.  No ajax call is
 made, it just writes the generated url and post data to the console, so it
 only works in ff right now.

---
 modules/organize/js/organize.js                    | 90 +++++++++++++++-------
 modules/organize/views/organize_dialog.html.php    |  3 +
 .../organize/views/organize_thumb_grid.html.php    |  5 +-
 3 files changed, 68 insertions(+), 30 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index a1b59676..07c07286 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -46,23 +46,68 @@
       }
     },
 
-    droppable: {
+    content_droppable: {
       accept: "*",
       tolerance: "pointer",
       greedy: true,
       drop: function(event, ui) {
-        // @todo do a ajax call to send the rearrange request to the server
-        // organize/move/target_id/
-        // post parameters
-        //  before=id|after=id
-        //  source=[id1, id2, ...]
-        //  before or after not supplied then append to end
-        // return: json {
-        //   result: success | msg,
-        //   tree: null | new tree,
-        //   content: new thumbgrid
-        // }
-        // do forget to reset all the stuff in init when updating the content
+        $.organize.do_drop({
+          parent_id: $(".gBranchSelected").attr("ref"),
+          target_id: $(".currentDropTarget").attr("ref"),
+          position: $(".currentDropTarget").css("borderLeftStyle") == "solid" ? "before" : "after",
+          source: $(ui.helper).children("img")
+        });
+      }
+    },
+
+    branch_droppable: {
+      accept: "*",
+      tolerance: "pointer",
+      greedy: true,
+      drop: function(event, ui) {
+        $.organize.do_drop({
+          parent_id: $(event.target).attr("ref"),
+          target_id: -1,
+          position: "after",
+          source: $(ui.helper).children("img")
+        });
+      }
+    },
+
+    do_drop:function(drop_parms) {
+      var source_ids = "";
+      $(drop_parms.source).each(function(i) {
+        source_ids += (source_ids.length ? "&" : "") + "source_id[" + i + "]=" + $(this).attr("ref");
+      });
+      var url = drop_url.replace("__PARENT_ID__", drop_parms.parent_id)
+        .replace("__POSITION__", drop_parms.position)
+        .replace("__TARGET_ID__", drop_parms.target_id);
+
+      console.group("do_drop");
+      console.log("Generated url: " + url);
+      console.log("Post data(ids to move): " + source_ids);
+      console.groupEnd();
+      // @todo do a ajax call to send the rearrange request to the server
+      // organize/move/parent_id/before|after/-1|target_id
+      // post parameters
+      //  source=[id1, id2, ...]
+      //  before or after not supplied then append to end
+      // return: json {
+      //   result: success | msg,
+      //   tree: null | new tree,
+      //   content: new thumbgrid
+      // }
+      // do forget to reset all the stuff in init when updating the content
+    },
+
+    mouse_move_handler: function(event) {
+      if ($(".gDragHelper").length) {
+        $(".gMicroThumbGridCell").css("borderStyle", "hidden");
+        $(".currentDropTarget").removeClass("currentDropTarget");
+        var borderStyle = event.pageX < $(this).offset().left + $(this).width() / 2 ?
+          "borderLeftStyle" : "borderRightStyle";
+        $(this).css(borderStyle, "solid");
+        $(this).addClass("currentDropTarget");
       }
     },
 
@@ -88,27 +133,18 @@
         $("#gDialog").dialog("close");
       });
 
-      $(".gBranchText span").click($.organize.collapse_or_expand_tree);
-      $(".gBranchText").click($.organize.show_album);
-
       $("#gMicroThumbPanel").selectable({filter: ".gMicroThumbGridCell"});
-      $(".gOrganizeBranch").droppable($.organize.droppable);
-      $("#gMicroThumbPanel").droppable($.organize.droppable);
+      $("#gMicroThumbPanel").droppable($.organize.content_droppable);
 
       $.organize.set_handlers();
     },
 
     set_handlers: function() {
       $(".gMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
-      $(".gMicroThumbGridCell").mousemove(function(event) {
-        if ($(".gDragHelper").length) {
-          $(".gMicroThumbGridCell").css("borderStyle", "none");
-          console.log("pageX:" + event.pageX + ", offset.left:" + $(this).offset().left + ", width:" + $(this).width());
-          var side = event.pageX < $(this).offset().left + $(this).width() / 2 ?
-            "hidden hidden hidden solid" : "hidden solid hidden hidden";
-          $(this).css("borderStyle", side);
-        }
-      });
+      $(".gMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
+      $(".gOrganizeBranch").droppable($.organize.branch_droppable);
+      $(".gBranchText span").click($.organize.collapse_or_expand_tree);
+      $(".gBranchText").click($.organize.show_album);
     },
 
     /**
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index f8d6d792..982eba9e 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -1,4 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+  var drop_url = "<?= url::site("organize/drop/__PARENT_ID__/__POSITION__/__TARGET_ID__?csrf=$csrf") ?>";
+</script>
 <div id="gOrganize" class="gDialogPanel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($title))) ?></h1>
   <div id="bd">
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index b41c54e8..671e0ce4 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,9 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($item->children(25, $offset) as $child): ?>
-<li class="gMicroThumbGridCell">
+<li class="gMicroThumbGridCell" ref="<?= $child->id ?>">
 <div id="gMicroThumb_<?= $child->id ?>"
-    class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>"
-    ref="<?= $child->id ?>">
+    class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
   <?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
 </div>
 </li>
-- 
cgit v1.2.3


From 76f320ab3d6b1f67055dd913eb5811d0d113682a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 16 Aug 2009 12:36:14 -0700
Subject: In this patch, drag now works to the album tree, but the progress bar
 is not showing. As well fixed a problem where selectable single clink no
 longer worked when the album was reloaded.

---
 modules/gallery/controllers/combined.php        |   9 +-
 modules/organize/controllers/organize.php       | 121 +++++++++++++++++++--
 modules/organize/js/organize.js                 | 138 ++++++++++++++----------
 modules/organize/views/organize_dialog.html.php |   7 +-
 4 files changed, 208 insertions(+), 67 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index 9a790fdf..c1f42bfe 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -42,22 +42,23 @@ class Combined_Controller extends Controller {
   private function _emit($type, $key) {
     $input = Input::instance();
 
+    // We don't need to save the session for this request
+    Session::abort_save();
+
     // Our data is immutable, so if they already have a copy then it needs no updating.
     if ($input->server("HTTP_IF_MODIFIED_SINCE")) {
       header('HTTP/1.0 304 Not Modified');
       header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
       header("Cache-Control: max-age=2678400");
       header('Pragma: public');
-      return;
+      Kohana::close_buffers(false);
+      return "";
     }
 
     if (empty($key)) {
       Kohana::show_404();
     }
 
-    // We don't need to save the session for this request
-    Session::abort_save();
-
     $cache = Cache::instance();
     $use_gzip = function_exists("gzencode") &&
       stripos($input->server("HTTP_ACCEPT_ENCODING"), "gzip") !== false &&
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 6f83f940..1c4a3a69 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -32,8 +32,8 @@ class Organize_Controller extends Controller {
     }
     $parents[$item->id] = 1;
 
-    $v->album_tree = $this->_tree($root, $parents);
-    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item, 0);
+    $v->album_tree = self::_tree($root, $parents);
+    $v->micro_thumb_grid = self::_get_micro_thumb_grid($item, 0);
     print $v;
   }
 
@@ -41,17 +41,77 @@ class Organize_Controller extends Controller {
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
     access::required("edit", $item);
-    print $this->_get_micro_thumb_grid($item, $offset);
+    print self::_get_micro_thumb_grid($item, $offset);
   }
 
-  private function _get_micro_thumb_grid($item, $offset) {
+  function move($target_id) {
+    access::verify_csrf();
+
+    $task_def = Task_Definition::factory()
+      ->callback("Organize_Controller::move_task_handler")
+      ->description(t("Move images"))
+      ->name(t("Move Images"));
+    $task = task::create($task_def, array("target_id" => $target_id,
+                                          "source_ids" => $this->input->post("source_ids")));
+
+    print json_encode(
+      array("result" => "started",
+            "status" => $task->status,
+            "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
+  }
+
+  function rearrange($target_id, $before) {
+    access::verify_csrf();
+    $target = ORM::factory("item", $target_id);
+    $parent = $target->parent();
+    access::required("view", $parent);
+    access::required("edit", $parent);
+
+    $task_def = Task_Definition::factory()
+      ->callback("Organize_Controller::rearrange_task_handler")
+      ->description(t("Rearrange Image"))
+      ->name(t("Rearrange Images"));
+    $task = task::create($task_def, array("target_id" => $target_id, "before" => $before,
+                                          "current" => 0,
+                                          "source_ids" => $this->input->post("source_ids")));
+
+    print json_encode(
+      array("result" => "started",
+            "status" => $task->status,
+            "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
+  }
+
+  private static function _get_micro_thumb_grid($item, $offset) {
     $v = new View("organize_thumb_grid.html");
     $v->item = $item;
     $v->offset = $offset;
     return $v;
   }
 
-  private function _tree($item, $parents) {
+  /**
+   * Run the task
+   */
+  function run($task_id) {
+    access::verify_csrf();
+
+    $task = ORM::factory("task", $task_id);
+    if (!$task->loaded || $task->owner_id != user::active()->id) {
+      access::forbidden();
+    }
+
+    $task = task::run($task_id);
+    $results = array("done" => $task->done, "status" => $task->status,
+                     "percent_complete" => $task->percent_complete);
+    foreach (array("tree", "content") as $data) {
+      $value = $task->get($data, false);
+      if ($value !== false) {
+        $results[$data] = $value;
+      }
+    }
+    print json_encode($results);
+  }
+
+  private static function _tree($item, $parents) {
     $v = new View("organize_tree.html");
     $v->album = $item;
     $keys = array_keys($parents);
@@ -62,7 +122,7 @@ class Organize_Controller extends Controller {
     $albums = $item->children(null, 0, array("type" => "album"), array("title" => "ASC"));
     foreach ($albums as $album) {
       if (access::can("view", $album)) {
-        $v->children[] = $this->_tree($album, $parents);
+        $v->children[] = self::_tree($album, $parents);
       }
     }
     if (count($v->children)) {
@@ -70,4 +130,53 @@ class Organize_Controller extends Controller {
     }
     return $v;
   }
+
+  static function move_task_handler($task) {
+    $start = microtime(true);
+    if ($task->percent_complete == 0) {
+      batch::start();
+    }
+
+    $target = ORM::factory("item", $task->get("target_id"));
+    $source_ids = $task->get("source_ids", array());
+    $idx = $task->get("current", 0);
+    $count = 0;
+    for (; $idx < count($source_ids) && microtime(true) - $start < 0.5; $idx++) {
+      item::move(ORM::factory("item", $source_ids[$idx]), $target);
+      $count++;
+    }
+    $task->set("current", $idx);
+    $task->percent_complete = ceil($idx / count($source_ids) * 100);
+    $task->status = t2("Moved one file", "Moved %count files", $count);
+    if ($task->percent_complete == 100) {
+      batch::stop();
+      $task->done = true;
+      $task->state = "success";
+      $parents = array();
+      foreach ($target->parents() as $parent) {
+        $parents[$parent->id] = 1;
+      }
+      $parents[$target->id] = 1;
+      // @TODO do we want to set a flag and then generate them in the run method so we don't
+      // potentially store large data items in the task?
+      $task->set("tree", self::_tree(ORM::factory("item", 1), $parents)->__toString());
+      $task->set("content", self::_get_micro_thumb_grid($target, 0)->__toString());
+    }
+  }
+
+  static function rearrange_task_handler($task) {
+    // @todo need to
+    // 1) reset the weights based on the current sort order
+    // 2) when they are all copied, change the sort order of the parent to "weight"
+    $task->percent_complete = 100;
+    //$start = microtime(true);
+    //$mode = $task->get("mode", "init");
+    //$start = microtime(true);
+    //    if (microtime(true) - $start > 0.5) {
+    //      break;
+    $task->done = true;
+    $task->state = "success";
+    $target = ORM::factory("item", $task->get("target_id"));
+    $task->set("content", self::_get_micro_thumb_grid($target, 0)->__toString());
+  }
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 07c07286..2d7c99fc 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,32 +1,37 @@
 (function($) {
   $.organize = {
     micro_thumb_draggable: {
+      handle: ".ui-state-selected",
       distance: 10,
       cursorAt: { left: -10, top: -10},
       appendTo: "#gMicroThumbPanel",
       helper: function(event, ui) {
-        var selected = $(".ui-draggable.ui-state-selected img"),
-            set = $('<div class="gDragHelper"></div>').css({zIndex: 2000, width: 80, height: Math.ceil(selected.length / 5) * 16 }),
-            offset = $(this).offset(),
-            click = { left: event.pageX - offset.left, top: event.pageY - offset.top };
-
-        selected.each(function(i) {
-          var row = parseInt(i / 5);
-          var j = i - (row * 5);
-
-          var o = $(this).offset();
-
-          var copy = $(this).clone()
-            .css({
-              width: $(this).width(), height: $(this).height(), display: "block",
-              margin: 0, position: 'absolute', outline: '5px solid #fff',
-              left: o.left - event.pageX, top: o.top - event.pageY
-            })
-            .appendTo(set)
-            .animate({width: 10, height: 10, outlineWidth: 1, margin: 1, left: (20 * j), top: (row * 20)}, 500);
-        });
-        return set;
+        var selected = $(".ui-draggable.ui-state-selected img");
+        if (selected.length) {
+          var set = $('<div class="gDragHelper"></div>').css({zIndex: 2000, width: 80, height: Math.ceil(selected.length / 5) * 16 }),
+              offset = $(this).offset(),
+              click = { left: event.pageX - offset.left, top: event.pageY - offset.top };
+
+          selected.each(function(i) {
+            var row = parseInt(i / 5);
+            var j = i - (row * 5);
+
+            var o = $(this).offset();
+
+            var copy = $(this).clone()
+              .css({
+                width: $(this).width(), height: $(this).height(), display: "block",
+                margin: 0, position: 'absolute', outline: '5px solid #fff',
+                left: o.left - event.pageX, top: o.top - event.pageY
+              })
+              .appendTo(set)
+              .animate({width: 10, height: 10, outlineWidth: 1, margin: 1, left: (20 * j), top: (row * 20)}, 500);
+          });
+          return set;
+        }
+        return null;
       },
+
       start: function(event, ui) {
         $("#gMicroThumbPanel .ui-state-selected").hide();
       },
@@ -52,9 +57,8 @@
       greedy: true,
       drop: function(event, ui) {
         $.organize.do_drop({
-          parent_id: $(".gBranchSelected").attr("ref"),
-          target_id: $(".currentDropTarget").attr("ref"),
-          position: $(".currentDropTarget").css("borderLeftStyle") == "solid" ? "before" : "after",
+          url: rearrange_url.replace("__TARGET_ID__", $(".currentDropTarget").attr("ref"))
+                            .replace("__BEFORE__", $(".currentDropTarget").css("borderLeftStyle") == "solid"),
           source: $(ui.helper).children("img")
         });
       }
@@ -66,40 +70,61 @@
       greedy: true,
       drop: function(event, ui) {
         $.organize.do_drop({
-          parent_id: $(event.target).attr("ref"),
-          target_id: -1,
-          position: "after",
+          url: move_url.replace("__TARGET_ID__", $(event.target).attr("ref")),
           source: $(ui.helper).children("img")
         });
       }
     },
 
-    do_drop:function(drop_parms) {
-      var source_ids = "";
-      $(drop_parms.source).each(function(i) {
-        source_ids += (source_ids.length ? "&" : "") + "source_id[" + i + "]=" + $(this).attr("ref");
+    do_drop:function(options) {
+      var source_ids = [];
+      $(options.source).each(function(i) {
+        source_ids.push($(this).attr("ref"));
       });
-      var url = drop_url.replace("__PARENT_ID__", drop_parms.parent_id)
-        .replace("__POSITION__", drop_parms.position)
-        .replace("__TARGET_ID__", drop_parms.target_id);
-
-      console.group("do_drop");
-      console.log("Generated url: " + url);
-      console.log("Post data(ids to move): " + source_ids);
-      console.groupEnd();
-      // @todo do a ajax call to send the rearrange request to the server
-      // organize/move/parent_id/before|after/-1|target_id
-      // post parameters
-      //  source=[id1, id2, ...]
-      //  before or after not supplied then append to end
-      // return: json {
-      //   result: success | msg,
-      //   tree: null | new tree,
-      //   content: new thumbgrid
-      // }
-      // do forget to reset all the stuff in init when updating the content
+
+      if (source_ids.length) {
+        $("#gOrganize .gProgressBar").progressbar().progressbar("value", 0);
+        $("#gOrganizeProgress").slideDown("fast", function() {
+          $.ajax({
+            url: options.url,
+            type: "POST",
+            async: false,
+            data: { "source_ids[]": source_ids },
+            dataType: "json",
+            success: function(data, textStatus) {
+              $("#gStatus").html(data.status);
+              $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
+              setTimeout(function() { $.organize._run_task(data.url); }, 0);
+            }
+          });
+        });
+      }
     },
 
+    _run_task: function(url) {
+      $.ajax({
+        url: url,
+        async: false,
+        dataType: "json",
+        success: function(data, textStatus) {
+          $("#gStatus").html(data.status);
+          $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
+          if (data.done) {
+	    $("#gProgress").slideUp();
+            // Don't forget to refresh the content pane and tree
+            if (data.tree) {
+              $("#gOrganizeAlbumTree").html(data.tree);
+            }
+            if (data.content) {
+              $("#gMicroThumbGrid").html(data.content);
+            }
+            $.organize.set_handlers();
+          } else {
+	    setTimeout(function() {  $.organize._run_task(url); }, 0);
+          }
+        }
+      });
+    },
     mouse_move_handler: function(event) {
       if ($(".gDragHelper").length) {
         $(".gMicroThumbGridCell").css("borderStyle", "hidden");
@@ -121,8 +146,8 @@
       $("#gDialog").dialog("option", "zIndex", 70);
       $("#gDialog").bind("dialogopen", function(event, ui) {
         $("#gOrganize").height($("#gDialog").innerHeight() - 20);
-        $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
-        $("#gOrganizeAlbumTree").height($("#gDialog").innerHeight() - 59);
+        $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 120);
+        $("#gOrganizeAlbumTree").height($("#gDialog").innerHeight() - 89);
       });
 
       $("#gDialog").bind("dialogclose", function(event, ui) {
@@ -133,18 +158,18 @@
         $("#gDialog").dialog("close");
       });
 
-      $("#gMicroThumbPanel").selectable({filter: ".gMicroThumbGridCell"});
-      $("#gMicroThumbPanel").droppable($.organize.content_droppable);
-
       $.organize.set_handlers();
     },
 
     set_handlers: function() {
+      $("#gMicroThumbPanel").selectable({filter: ".gMicroThumbGridCell"});
+      $("#gMicroThumbPanel").droppable($.organize.content_droppable);
+
       $(".gMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
       $(".gMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
       $(".gOrganizeBranch").droppable($.organize.branch_droppable);
-      $(".gBranchText span").click($.organize.collapse_or_expand_tree);
       $(".gBranchText").click($.organize.show_album);
+      $(".gOrganizeBranch .ui-icon").click($.organize.collapse_or_expand_tree);
     },
 
     /**
@@ -164,6 +189,7 @@
       if ($(event.currentTarget).hasClass("gBranchSelected")) {
         return;
       }
+      $("#gMicroThumbPanel").selectable("destroy");
       var id = $(event.currentTarget).attr("ref");
       $(".gBranchSelected").removeClass("gBranchSelected");
       $("#gOrganizeBranch-" + id).addClass("gBranchSelected");
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 982eba9e..46f9ad9b 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -1,6 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
-  var drop_url = "<?= url::site("organize/drop/__PARENT_ID__/__POSITION__/__TARGET_ID__?csrf=$csrf") ?>";
+  var move_url = "<?= url::site("organize/move/__TARGET_ID__?csrf=$csrf") ?>";
+  var rearrange_url = "<?= url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf") ?>";
 </script>
 <div id="gOrganize" class="gDialogPanel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($title))) ?></h1>
@@ -39,6 +40,10 @@
       </div>
     </div>
   </div>
+  <div id="gOrganizeProgress" style="display: none">
+    <div class="gProgressBar"></div>
+    <div id="gStatus"></div>
+  </div>
 </div>
 
 <script type="text/javascript">
-- 
cgit v1.2.3


From 5f546050d1128bf6aaf3a55b58a89c14bdb46cfd Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 16 Aug 2009 16:20:43 -0700
Subject: The progress bar appears during a move. Still having an issue with
 unable to do a single select after a drop operation.  I think its related to
 needing to destroy the existing selectable before creating the new one.  The
 error I get is "this._selection[i].data("selectabe-item") is undefined."

---
 modules/organize/js/organize.js                 | 45 +++++++++++++++----------
 modules/organize/views/organize_dialog.html.php |  8 ++---
 2 files changed, 32 insertions(+), 21 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 2d7c99fc..035c79c7 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -77,6 +77,7 @@
     },
 
     do_drop:function(options) {
+      $("#gMicroThumbPanel").selectable("destroy");
       var source_ids = [];
       $(options.source).each(function(i) {
         source_ids.push($(this).attr("ref"));
@@ -84,19 +85,26 @@
 
       if (source_ids.length) {
         $("#gOrganize .gProgressBar").progressbar().progressbar("value", 0);
-        $("#gOrganizeProgress").slideDown("fast", function() {
-          $.ajax({
-            url: options.url,
-            type: "POST",
-            async: false,
-            data: { "source_ids[]": source_ids },
-            dataType: "json",
-            success: function(data, textStatus) {
-              $("#gStatus").html(data.status);
-              $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
-              setTimeout(function() { $.organize._run_task(data.url); }, 0);
-            }
-          });
+        $("#gOrganizeProgress").animate(
+          {height: "toggle", display: "toggle"},
+          {duration: "fast",
+           step: function() {
+           },
+           complete: function() {
+             $("#gMicroThumbPanel").height($("#gMicroThumbPanel").height() - $(this).height());
+             $.ajax({
+               url: options.url,
+               type: "POST",
+               async: false,
+               data: { "source_ids[]": source_ids },
+               dataType: "json",
+               success: function(data, textStatus) {
+                 $("#gStatus").html(data.status);
+                 $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
+                 setTimeout(function() { $.organize._run_task(data.url); }, 0);
+               }
+             });
+           }
         });
       }
     },
@@ -110,8 +118,10 @@
           $("#gStatus").html(data.status);
           $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
           if (data.done) {
-	    $("#gProgress").slideUp();
-            // Don't forget to refresh the content pane and tree
+            var height = $("#gOrganizeProgress").height();
+            $("#gOrganizeProgress").toggle();
+            $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
+            //$("#gMicroThumbPanel").height($("#gMicroThumbPanel").height() + height);
             if (data.tree) {
               $("#gOrganizeAlbumTree").html(data.tree);
             }
@@ -125,6 +135,7 @@
         }
       });
     },
+
     mouse_move_handler: function(event) {
       if ($(".gDragHelper").length) {
         $(".gMicroThumbGridCell").css("borderStyle", "hidden");
@@ -146,8 +157,8 @@
       $("#gDialog").dialog("option", "zIndex", 70);
       $("#gDialog").bind("dialogopen", function(event, ui) {
         $("#gOrganize").height($("#gDialog").innerHeight() - 20);
-        $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 120);
-        $("#gOrganizeAlbumTree").height($("#gDialog").innerHeight() - 89);
+        $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
+        $("#gOrganizeAlbumTree").height($("#gDialog").innerHeight() - 59);
       });
 
       $("#gDialog").bind("dialogclose", function(event, ui) {
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 46f9ad9b..cd987819 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -37,13 +37,13 @@
             </div>
           </div>
         </div>
+        <div id="gOrganizeProgress" style="display: none">
+          <div class="gProgressBar"></div>
+          <div id="gStatus"></div>
+        </div>
       </div>
     </div>
   </div>
-  <div id="gOrganizeProgress" style="display: none">
-    <div class="gProgressBar"></div>
-    <div id="gStatus"></div>
-  </div>
 </div>
 
 <script type="text/javascript">
-- 
cgit v1.2.3


From 82edd2a37bde6f42f5ff69c1363c5dbeb3cec599 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 17 Aug 2009 19:52:40 -0700
Subject: This patch adds some security to the organize dialog. 1) If images
 are dragged from the content pane and dropped on a branch in the    tree that
 the user only has view priviledges, then the drop is cancelled    and the
 images are reverted. 2) The user cannot click on a branch, to which they only
 have view priviledges,    the content pane does not change to the new album

---
 modules/organize/controllers/organize.php     |  1 +
 modules/organize/js/organize.js               | 22 +++++++++++++---------
 modules/organize/views/organize_tree.html.php |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 7d6b651e..76a22b73 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -118,6 +118,7 @@ class Organize_Controller extends Controller {
     $v->album = $item;
     $keys = array_keys($parents);
     $v->selected = end($keys) == $item->id;
+    $v->can_edit= access::can("edit", $item);
     $v->children = array();
     $v->album_icon = "gBranchEmpty";
 
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 7a70ea5e..0f8f7fa1 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -43,11 +43,6 @@
         } else if (ui.offset.top < top + 20) {
           $("#gMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gMicroThumbPanel").get(0).scrollTop - 100);
         }
-      },
-      // @todo delete this method when drop is implemented
-      stop: function(event, ui) {
-        $(".ui-state-selected").show();
-        $(".gMicroThumbGridCell").css("borderStyle", "none");
       }
     },
 
@@ -69,10 +64,15 @@
       tolerance: "pointer",
       greedy: true,
       drop: function(event, ui) {
-        $.organize.do_drop({
-          url: move_url.replace("__TARGET_ID__", $(event.target).attr("ref")),
-          source: $(ui.helper).children("img")
-        });
+        if ($(event.target).hasClass("gViewOnly")) {
+          $(".ui-state-selected").show();
+          $(".gMicroThumbGridCell").css("borderStyle", "none");
+        } else {
+          $.organize.do_drop({
+            url: move_url.replace("__TARGET_ID__", $(event.target).attr("ref")),
+            source: $(ui.helper).children("img")
+          });
+        }
       }
     },
 
@@ -200,6 +200,10 @@
       if ($(event.currentTarget).hasClass("gBranchSelected")) {
         return;
       }
+      var parent = $(event.currentTarget).parents(".gOrganizeBranch");
+      if ($(parent).hasClass("gViewOnly")) {
+        return;
+      }
       $("#gMicroThumbPanel").selectable("destroy");
       var id = $(event.currentTarget).attr("ref");
       $(".gBranchSelected").removeClass("gBranchSelected");
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index d2ef287a..823301fc 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<li class="gOrganizeBranch ui-icon-left" ref="<?= $album->id ?>">
+<li class="gOrganizeBranch ui-icon-left <?= $can_edit ? "" : "gViewOnly" ?>" ref="<?= $album->id ?>">
   <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
        class="<?= $selected ? "gBranchSelected" : "" ?>">
     <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-- 
cgit v1.2.3


From 7c5275a63c5e17e519e2ccd497e4d2af97e84503 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 09:08:39 -0700
Subject: Fix indentation.

---
 modules/organize/views/organize_dialog.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index cd987819..89182347 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -22,7 +22,7 @@
       </div>
       <div id="gOrganizeDetail" class="yui-u">
         <div id="gMicroThumbPanel"
-           ref="<?= url::site("organize/content/__ITEM_ID__/__OFFSET__") ?>">
+             ref="<?= url::site("organize/content/__ITEM_ID__/__OFFSET__") ?>">
           <ul id="gMicroThumbGrid">
             <?= $micro_thumb_grid ?>
           </ul>
-- 
cgit v1.2.3


From e8a3fe97a43dc257a70431defbcc6fb330cdfee2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 09:09:33 -0700
Subject: Fix whitespace.

---
 modules/organize/views/organize_dialog.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 89182347..3acee05c 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -14,7 +14,7 @@
         <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
       </div>
     </div>
-    <div id= "gOrganizeContentPane" class="yui-gf">
+    <div id="gOrganizeContentPane" class="yui-gf">
       <div id="gOrganizeTreeContainer" class="yui-u first">
         <ul id="gOrganizeAlbumTree">
           <?= $album_tree ?>
-- 
cgit v1.2.3


From 8ca573741e49e6320124f08631979dca3562c086 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 10:48:47 -0700
Subject: Indentation fixes.

---
 modules/organize/views/organize_thumb_grid.html.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 671e0ce4..5adb487a 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,10 +1,10 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? 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>
+  <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 ?>
 
-- 
cgit v1.2.3


From 48e84243d24c52638042d3b5edc3cbd3765daac3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 11:21:19 -0700
Subject: Update help text to eliminate 'edit' since we don't do that yet, and
 change "items" to "photos".

---
 modules/organize/views/organize_dialog.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 3acee05c..7c09266f 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -11,7 +11,7 @@
         <h3><?= t("Albums") ?></h3>
       </div>
       <div id="gMessage" class="yui-u">
-        <div class="gInfo"><?= t("Select one or more items to edit; drag and drop items to re-order or move between albums") ?></div>
+        <div class="gInfo"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
       </div>
     </div>
     <div id="gOrganizeContentPane" class="yui-gf">
-- 
cgit v1.2.3


From cb2171d0825251d619b53f6f80d217326fb6bab5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 14:27:37 -0700
Subject: Display the sort order in the Organize dialog, and allow users to
 change the sort order on the fly.

---
 modules/gallery/helpers/album.php               | 21 ++++++---
 modules/organize/controllers/organize.php       | 21 ++++++++-
 modules/organize/css/organize.css               | 59 ++++---------------------
 modules/organize/js/organize.js                 | 22 +++++++--
 modules/organize/views/organize_dialog.html.php | 20 ++++-----
 5 files changed, 71 insertions(+), 72 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 1b6b875d..d46f21ac 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -116,13 +116,7 @@ class album_Core {
 
     $sort_order->dropdown("column", array("id" => "gAlbumSortColumn"))
       ->label(t("Sort by"))
-      ->options(array("weight" => t("Manual"),
-                      "captured" => t("Date captured"),
-                      "created" => t("Date uploaded"),
-                      "title" => t("Title"),
-                      "updated" => t("Date modified"),
-                      "view_count" => t("Number of views"),
-                      "rand_key" => t("Random")))
+      ->options(album::get_sort_order_options())
       ->selected($parent->sort_column);
     $sort_order->dropdown("direction", array("id" => "gAlbumSortDirection"))
       ->label(t("Order"))
@@ -137,4 +131,17 @@ class album_Core {
     $form->add_rules_from(ORM::factory("item"));
     return $form;
   }
+
+  /**
+   * Return a structured set of all the possible sort orders.
+   */
+  static function get_sort_order_options() {
+    return array("weight" => t("Manual"),
+                 "captured" => t("Date captured"),
+                 "created" => t("Date uploaded"),
+                 "title" => t("Title"),
+                 "updated" => t("Date modified"),
+                 "view_count" => t("Number of views"),
+                 "rand_key" => t("Random"));
+  }
 }
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index f56ad006..10b109f6 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -25,7 +25,7 @@ class Organize_Controller extends Controller {
     access::required("edit", $item);
 
     $v = new View("organize_dialog.html");
-    $v->title = $item->title;
+    $v->album = $item;
     $parents = array();
     foreach ($item->parents() as $parent) {
       $parents[$parent->id] = 1;
@@ -84,6 +84,25 @@ class Organize_Controller extends Controller {
             "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
   }
 
+  function resort($target_id, $col, $dir) {
+    access::verify_csrf();
+
+    $album = ORM::factory("item", $target_id);
+    access::required("view", $album);
+    access::required("edit", $album);
+
+    $options = album::get_sort_order_options();
+    if (!isset($options[$col])) {
+      return;
+    }
+
+    $album->sort_column = $col;
+    $album->sort_order = $dir;
+    $album->save();
+
+    print self::_get_micro_thumb_grid($album, 0);
+  }
+
   private static function _get_micro_thumb_grid($item, $offset) {
     $v = new View("organize_thumb_grid.html");
     $v->item = $item;
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index d717bcae..52de87fc 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -134,63 +134,20 @@
 }
 
 /****************************************************************
- * Organize Edit Drawer styling
+ * Organize Controls styling
  */
-#gOrganizeEditDrawer {
+#gOrganizeControls {
+  padding-left: 8px;
   background-color: #13A;
+  color: #ccc;
   width: 100% !important;
 }
 
-#gOrganizeEditDrawerPanel {
-  background-color: #fff;
-  border: 1px solid #13A;
-  display: none;
-  height: 195px;
-}
-
-#gOrganizeEditDrawerHandle {
-  height: 30px;
-}
-
-#gOrganizeEditHandleLeft {
-  background-color: #FFF;
-  float: left;
-  height: 30px;
-  width: 15px;
-}
-
-#gOrganizeEditHandleButtonsMiddle,
-#gOrganizeEditHandleButtonsLeft {
-  float: left;
-  height: 20px;
-  padding: 2px 10px;
-}
-
-#gOrganizeEditHandleButtonsMiddle {
-  margin-left: 20px;
-}
-
-#gOrganizeEditHandleButtonsMiddle a,
-#gOrganizeEditHandleButtonsLeft a {
-  float: left;
-  margin: 0 2.5px;
-}
-
-#gOrganizeEditHandleButtonsRight {
-  float: right;
-  height: 20px;
-  padding: 2px 10px;
-}
-
-#gOrganizeEditHandleButtonsRight a {
-  float: left;
-  margin: 0 2.5px;
+#gOrganizeControls select {
+  display: inline;
 }
 
-#gOrganizeEditHandleRight {
-  background-color: #FFF;
-  background-position: -15px 0;
+#gOrganizeClose {
   float: right;
-  height: 30px;
-  width: 15px;
+  margin-right: 12px;
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index ec6bd924..96309787 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -125,9 +125,8 @@
           $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
           if (data.done) {
             var height = $("#gOrganizeProgress").height();
-            $("#gOrganizeProgress").toggle();
+            $("#gOrganizeProgress").slideUp();
             $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
-            //$("#gMicroThumbPanel").height($("#gMicroThumbPanel").height() + height);
             if (data.tree) {
               $("#gOrganizeAlbumTree").html(data.tree);
             }
@@ -171,10 +170,14 @@
         window.location.reload();
       });
 
-      $("#gDialog #gMicroThumbDone").click(function(event) {
+      $("#gDialog #gOrganizeClose").click(function(event) {
         $("#gDialog").dialog("close");
       });
 
+      $("#gOrganizeSortColumn,#gOrganizeSortDir").change(function(event) {
+	$.organize.resort($("#gOrganizeSortColumn").attr("value"), $("#gOrganizeSortDir").attr("value"));
+      });
+
       $.organize.set_handlers();
     },
 
@@ -219,6 +222,19 @@
         $("#gMicroThumbGrid").html(data);
         $.organize.set_handlers();
       });
+    },
+
+    /**
+     * Change the sort order.
+     */
+    resort: function(column, dir) {
+      var url = sort_order_url
+        .replace("__COL__", column)
+        .replace("__DIR__", dir);
+      $.get(url, function(data) {
+	$("#gMicroThumbGrid").html(data);
+	$.organize.set_handlers();
+      });
     }
   };
 })(jQuery);
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 7c09266f..a3aae05b 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -2,9 +2,10 @@
 <script type="text/javascript">
   var move_url = "<?= url::site("organize/move/__TARGET_ID__?csrf=$csrf") ?>";
   var rearrange_url = "<?= url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf") ?>";
+  var sort_order_url = "<?= url::site("organize/resort/$album->id/__COL__/__DIR__?csrf=$csrf") ?>";
 </script>
 <div id="gOrganize" class="gDialogPanel">
-  <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($title))) ?></h1>
+  <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($album->title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
       <div class="yui-u first">
@@ -27,15 +28,14 @@
             <?= $micro_thumb_grid ?>
           </ul>
         </div>
-        <div id="gOrganizeEditDrawer" class="yui-u">
-          <div id="gOrganizeEditDrawerPanel" class="yui-gf">
-          </div>
-          <div id="gOrganizeEditDrawerHandle">
-            <div id="gOrganizeEditHandleButtonsRight">
-              <a id="gMicroThumbDone" href="#" ref="done"
-                 class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
-            </div>
-          </div>
+        <div id="gOrganizeControls">
+          <a id="gOrganizeClose" href="#" ref="done"
+             class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
+          <form>
+            <?= t("Sort order") ?>
+            <?= form::dropdown(array("id" => "gOrganizeSortColumn"), album::get_sort_order_options(), $album->sort_column) ?>
+            <?= form::dropdown(array("id" => "gOrganizeSortDir"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
+          </form>
         </div>
         <div id="gOrganizeProgress" style="display: none">
           <div class="gProgressBar"></div>
-- 
cgit v1.2.3


From f257cd3d69a771ce245c432e37c9f9e7e53ad03d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 29 Aug 2009 10:00:47 -0700
Subject: Major refactor of organize: * Clean up naming conventions for
 variables in the controller   so that we specifically refer to albums with
 $album_id, etc.

* Move complexity for drawing tree out of the controller and into
  the view.

* Simplify task definitions to get rid of extraneous text

* Change __PLACEHOLDERS__ to clearly define which is the album
  and which is the item that we're moving before/after

* Remove as many CSS ids as we can from the tree view to keep
  things simple
---
 modules/organize/controllers/organize.php          | 127 +++++++++------------
 modules/organize/css/organize.css                  |  17 +--
 modules/organize/js/organize.js                    |  60 +++++-----
 modules/organize/views/organize_dialog.html.php    |   9 +-
 .../organize/views/organize_thumb_grid.html.php    |   6 +-
 modules/organize/views/organize_tree.html.php      |  56 ++++++---
 6 files changed, 140 insertions(+), 135 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 10b109f6..f25a41ca 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -18,40 +18,35 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Organize_Controller extends Controller {
-  function dialog($item_id) {
-    $item = ORM::factory("item", $item_id);
-    $root = $item->id == 1 ? $item : ORM::factory("item", 1);
-    access::required("view", $item);
-    access::required("edit", $item);
+  function dialog($album_id) {
+    $album = ORM::factory("item", $album_id);
+    access::required("view", $album);
+    access::required("edit", $album);
 
     $v = new View("organize_dialog.html");
-    $v->album = $item;
-    $parents = array();
-    foreach ($item->parents() as $parent) {
-      $parents[$parent->id] = 1;
-    }
-    $parents[$item->id] = 1;
-
-    $v->album_tree = self::_tree($root, $parents);
-    $v->micro_thumb_grid = self::_get_micro_thumb_grid($item, 0);
+    $v->album = $album;
+    $v->album_tree = self::_tree($album);
+    $v->micro_thumb_grid = self::_get_micro_thumb_grid($album, 0);
     print $v;
   }
 
-  function content($item_id, $offset) {
-    $item = ORM::factory("item", $item_id);
-    access::required("view", $item);
-    access::required("edit", $item);
-    print self::_get_micro_thumb_grid($item, $offset);
+  function album($album_id, $offset) {
+    $album = ORM::factory("item", $album_id);
+    access::required("view", $album);
+    access::required("edit", $album);
+
+    print json_encode(
+      array("grid" => self::_get_micro_thumb_grid($album, $offset)->__toString(),
+            "sort_column" => $album->sort_column,
+            "sort_order" => $album->sort_order));
   }
 
-  function move($target_id) {
+  function move_to($album_id) {
     access::verify_csrf();
 
     $task_def = Task_Definition::factory()
-      ->callback("Organize_Controller::move_task_handler")
-      ->description(t("Move images"))
-      ->name(t("Move Images"));
-    $task = task::create($task_def, array("target_id" => $target_id,
+      ->callback("Organize_Controller::move_task_handler");
+    $task = task::create($task_def, array("album_id" => $album_id,
                                           "source_ids" => $this->input->post("source_ids")));
 
     print json_encode(
@@ -62,20 +57,19 @@ class Organize_Controller extends Controller {
 
   function rearrange($target_id, $before_or_after) {
     access::verify_csrf();
+
     $target = ORM::factory("item", $target_id);
     $parent = $target->parent();
     access::required("view", $parent);
     access::required("edit", $parent);
 
     $task_def = Task_Definition::factory()
-      ->callback("Organize_Controller::rearrange_task_handler")
-      ->description(t("Rearrange Image"))
-      ->name(t("Rearrange Images"));
+      ->callback("Organize_Controller::rearrange_task_handler");
     $task = task::create(
       $task_def,
       array("target_id" => $target_id,
+            "album_id" => $parent->id,
             "before_or_after" => $before_or_after,
-            "parent_id" => $parent->id,
             "source_ids" => $this->input->post("source_ids")));
 
     print json_encode(
@@ -84,10 +78,10 @@ class Organize_Controller extends Controller {
             "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
   }
 
-  function resort($target_id, $col, $dir) {
+  function sort_order($album_id, $col, $dir) {
     access::verify_csrf();
 
-    $album = ORM::factory("item", $target_id);
+    $album = ORM::factory("item", $album_id);
     access::required("view", $album);
     access::required("edit", $album);
 
@@ -100,12 +94,15 @@ class Organize_Controller extends Controller {
     $album->sort_order = $dir;
     $album->save();
 
-    print self::_get_micro_thumb_grid($album, 0);
+    print json_encode(
+      array("grid" => self::_get_micro_thumb_grid($album, 0)->__toString(),
+            "sort_column" => $album->sort_column,
+            "sort_order" => $album->sort_order));
   }
 
-  private static function _get_micro_thumb_grid($item, $offset) {
+  private static function _get_micro_thumb_grid($album, $offset) {
     $v = new View("organize_thumb_grid.html");
-    $v->item = $item;
+    $v->album = $album;
     $v->offset = $offset;
     return $v;
   }
@@ -124,33 +121,23 @@ class Organize_Controller extends Controller {
     $task = task::run($task_id);
     $results = array("done" => $task->done, "status" => $task->status,
                      "percent_complete" => $task->percent_complete);
-    foreach (array("tree", "content") as $data) {
-      $value = $task->get($data, false);
-      if ($value !== false) {
-        $results[$data] = $value;
-      }
+
+    $album = ORM::factory("item", $task->get("album_id"));
+    $result = array(
+      "done" => $task->done,
+      "status" => $task->status,
+      "percent_complete" => $task->percent_complete);
+    if ($task->done) {
+      $result["tree"] = self::_tree($album)->__toString();
+      $result["grid"] = self::_get_micro_thumb_grid($album, 0)->__toString();
     }
-    print json_encode($results);
+    print json_encode($result);
   }
 
-  private static function _tree($item, $parents) {
+  private static function _tree($album) {
     $v = new View("organize_tree.html");
-    $v->album = $item;
-    $keys = array_keys($parents);
-    $v->selected = end($keys) == $item->id;
-    $v->can_edit= access::can("edit", $item);
-    $v->children = array();
-    $v->album_icon = "gBranchEmpty";
-
-    $albums = $item->children(null, 0, array("type" => "album"), array("title" => "ASC"));
-    foreach ($albums as $album) {
-      if (access::can("view", $album)) {
-        $v->children[] = self::_tree($album, $parents);
-      }
-    }
-    if (count($v->children)) {
-      $v->album_icon = empty($parents[$item->id]) ? "ui-icon-plus" : "ui-icon-minus";
-    }
+    $v->parents = $album->parents();
+    $v->album = $album;
     return $v;
   }
 
@@ -160,30 +147,25 @@ class Organize_Controller extends Controller {
       batch::start();
     }
 
-    $target = ORM::factory("item", $task->get("target_id"));
+    $target_album = ORM::factory("item", $task->get("album_id"));
     $source_ids = $task->get("source_ids", array());
     $idx = $task->get("current", 0);
     $count = 0;
     for (; $idx < count($source_ids) && microtime(true) - $start < 0.5; $idx++) {
-      item::move(ORM::factory("item", $source_ids[$idx]), $target);
+      item::move(ORM::factory("item", $source_ids[$idx]), $target_album);
       $count++;
     }
     $task->set("current", $idx);
     $task->percent_complete = (int)($idx / count($source_ids) * 100);
-    $task->status = t2("Moved one file", "Moved %count files", $count);
     if ($task->percent_complete == 100) {
       batch::stop();
       $task->done = true;
       $task->state = "success";
       $parents = array();
-      foreach ($target->parents() as $parent) {
+      foreach ($target_album->parents() as $parent) {
         $parents[$parent->id] = 1;
       }
-      $parents[$target->id] = 1;
-      // @TODO do we want to set a flag and then generate them in the run method so we don't
-      // potentially store large data items in the task?
-      $task->set("tree", self::_tree(ORM::factory("item", 1), $parents)->__toString());
-      $task->set("content", self::_get_micro_thumb_grid($target, 0)->__toString());
+      $parents[$target_album->id] = 1;
     }
   }
 
@@ -197,7 +179,7 @@ class Organize_Controller extends Controller {
     while (microtime(true) - $start < 1.5) {
       switch ($mode) {
       case "init":
-        $album = ORM::factory("item", $task->get("parent_id"));
+        $album = ORM::factory("item", $task->get("album_id"));
         if ($album->sort_column != "weight") {
           $mode = "convert-to-weight-order";
         } else {
@@ -207,7 +189,7 @@ class Organize_Controller extends Controller {
 
       case "convert-to-weight-order":
         $i = 0;
-        $album = ORM::factory("item", $task->get("parent_id"));
+        $album = ORM::factory("item", $task->get("album_id"));
         foreach ($album->children() as $child) {
           // Do this directly in the database to avoid sending notifications
           Database::Instance()->update("items", array("weight" => ++$i), array("id" => $child->id));
@@ -220,8 +202,8 @@ class Organize_Controller extends Controller {
         break;
 
       case "find-insertion-point":
-        $target = ORM::factory("item", $task->get("target_id"));
-        $target_weight = $target->weight;
+        $album = ORM::factory("item", $task->get("album_id"));
+        $target_weight = $album->weight;
 
         if ($task->get("before_or_after") == "after") {
           $target_weight++;
@@ -235,11 +217,11 @@ class Organize_Controller extends Controller {
         $target_weight = $task->get("target_weight");
         $source_ids = $task->get("source_ids");
         $count = count($source_ids);
-        $parent_id = $task->get("parent_id");
+        $album_id = $task->get("album_id");
         Database::Instance()->query(
           "UPDATE {items} " .
           "SET `weight` = `weight` + $count " .
-          "WHERE `weight` >= $target_weight AND `parent_id` = {$parent_id}");
+          "WHERE `weight` >= $target_weight AND `parent_id` = {$album_id}");
 
         $mode = "insert-source-items";
         $task->percent_complete = 80;
@@ -255,13 +237,12 @@ class Organize_Controller extends Controller {
         break;
 
       case "done":
-        $album = ORM::factory("item", $task->get("parent_id"));
+        $album = ORM::factory("item", $task->get("album_id"));
         module::event("album_rearrange", $album);
         batch::stop();
         $task->done = true;
         $task->state = "success";
         $task->percent_complete = 100;
-        $task->set("content", self::_get_micro_thumb_grid($album, 0)->__toString());
         break;
       }
     }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 52de87fc..85168810 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -51,30 +51,23 @@
   padding-left: 1.2em;
 }
 
-.gBranchText:hover {
+.gAlbumText:hover {
   border: 1px dashed #999;
+  padding: 1px;
 }
 
-.gBranchEmpty {
-  visibility: hidden;
-}
-
-.gBranchSelected {
+#gOrganizeAlbumTree .selected {
   background-color: #cfdeff !important;
   border-bottom: 1px solid #999 !important;
   display: block;
   padding: .3em 0;
 }
 
-.gBranchCollapsed {
-  display: none;
-}
-
-.gOrganizeBranch span {
+.gOrganizeAlbum span {
   cursor: pointer;
 }
 
-.gBranchText {
+.gAlbumText {
   cursor: pointer;
   width: auto;
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 96309787..5e7bd47c 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -28,7 +28,8 @@
                 left: o.left - event.pageX, top: o.top - event.pageY
               })
               .appendTo(set)
-              .animate({ width: 10, height: 10, outlineWidth: 1, margin: 1, left: (20 * j), top: (row * 20) }, 500);
+              .animate({ width: 10, height: 10, outlineWidth: 1, margin: 1,
+			 left: (20 * j), top: (row * 20) }, 500);
           });
           return set;
         }
@@ -58,6 +59,7 @@
         $.organize.do_drop({
           url: rearrange_url
 	    .replace("__TARGET_ID__", $(".currentDropTarget").attr("ref"))
+	    .replace("__ALBUM_ID__", $(".currentDropTarget").attr("ref"))
             .replace("__BEFORE__", $(".currentDropTarget").css("borderLeftStyle") == "solid" ? "before" : "after"),
           source: $(ui.helper).children("img")
         });
@@ -74,14 +76,14 @@
           $(".gMicroThumbGridCell").css("borderStyle", "none");
         } else {
           $.organize.do_drop({
-            url: move_url.replace("__TARGET_ID__", $(event.target).attr("ref")),
+            url: move_url.replace("__ALBUM_ID__", $(event.target).attr("ref")),
             source: $(ui.helper).children("img")
           });
         }
       }
     },
 
-    do_drop:function(options) {
+    do_drop: function(options) {
       $("#gMicroThumbPanel").selectable("destroy");
       var source_ids = [];
       $(options.source).each(function(i) {
@@ -105,7 +107,6 @@
                data: { "source_ids[]": source_ids },
                dataType: "json",
                success: function(data, textStatus) {
-                 $("#gStatus").html(data.status);
                  $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
                  setTimeout(function() { $.organize._run_task(data.url); }, 0);
                }
@@ -121,7 +122,6 @@
         async: false,
         dataType: "json",
         success: function(data, textStatus) {
-          $("#gStatus").html(data.status);
           $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
           if (data.done) {
             var height = $("#gOrganizeProgress").height();
@@ -130,8 +130,10 @@
             if (data.tree) {
               $("#gOrganizeAlbumTree").html(data.tree);
             }
-            if (data.content) {
-              $("#gMicroThumbGrid").html(data.content);
+            if (data.grid) {
+              $("#gMicroThumbGrid").html(data.grid);
+              $("#gOrganizeSortColumn").attr("value", data.sort_column);
+              $("#gOrganizeSortOrder").attr("value", data.sort_order);
             }
             $.organize.set_handlers();
           } else {
@@ -174,8 +176,8 @@
         $("#gDialog").dialog("close");
       });
 
-      $("#gOrganizeSortColumn,#gOrganizeSortDir").change(function(event) {
-	$.organize.resort($("#gOrganizeSortColumn").attr("value"), $("#gOrganizeSortDir").attr("value"));
+      $("#gOrganizeSortColumn,#gOrganizeSortOrder").change(function(event) {
+	$.organize.resort($("#gOrganizeSortColumn").attr("value"), $("#gOrganizeSortOrder").attr("value"));
       });
 
       $.organize.set_handlers();
@@ -187,26 +189,17 @@
 
       $(".gMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
       $(".gMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
-      $(".gOrganizeBranch").droppable($.organize.branch_droppable);
-      $(".gBranchText").click($.organize.show_album);
-      $(".gOrganizeBranch .ui-icon").click($.organize.collapse_or_expand_tree);
+      $(".gOrganizeAlbum").droppable($.organize.branch_droppable);
+      $(".gAlbumText").click($.organize.show_album);
     },
 
-    /**
-     * Open or close a branch.
-     */
-    collapse_or_expand_tree: function(event) {
-      event.stopPropagation();
-      $(event.currentTarget).toggleClass("ui-icon-minus").toggleClass("ui-icon-plus");
-      $("#gOrganizeChildren-" + $(event.currentTarget).attr("ref")).toggle();
-    },
 
     /**
      * When the text of a selection is clicked, then show that albums contents
      */
     show_album: function(event) {
       event.preventDefault();
-      if ($(event.currentTarget).hasClass("gBranchSelected")) {
+      if ($(event.currentTarget).hasClass("selected")) {
         return;
       }
       var parent = $(event.currentTarget).parents(".gOrganizeBranch");
@@ -215,13 +208,17 @@
       }
       $("#gMicroThumbPanel").selectable("destroy");
       var id = $(event.currentTarget).attr("ref");
-      $(".gBranchSelected").removeClass("gBranchSelected");
-      $("#gOrganizeBranch-" + id).addClass("gBranchSelected");
+      $("#gOrganizeAlbumTree .selected").removeClass("selected");
+      $(".gAlbumText[ref=" + id + "]").addClass("selected");
       var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
       $.get(url, function(data) {
-        $("#gMicroThumbGrid").html(data);
-        $.organize.set_handlers();
-      });
+	      $("#gMicroThumbGrid").html(data.grid);
+	      $("#gOrganizeSortColumn").attr("value", data.sort_column);
+              $("#gOrganizeSortOrder").attr("value", data.sort_order);
+              $.organize.set_handlers();
+	    },
+	    function() { },
+	    "json");
     },
 
     /**
@@ -229,12 +226,17 @@
      */
     resort: function(column, dir) {
       var url = sort_order_url
+        .replace("__ALBUM_ID__", $("#gOrganizeAlbumTree .selected").attr("ref"))
         .replace("__COL__", column)
         .replace("__DIR__", dir);
       $.get(url, function(data) {
-	$("#gMicroThumbGrid").html(data);
-	$.organize.set_handlers();
-      });
+	      $("#gMicroThumbGrid").html(data.grid);
+              $("#gOrganizeSortColumn").attr("value", data.sort_column);
+              $("#gOrganizeSortOrder").attr("value", data.sort_order);
+	      $.organize.set_handlers();
+	    },
+	    function() { },
+	    "json");
     }
   };
 })(jQuery);
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index a3aae05b..7ade91a2 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -1,8 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
-  var move_url = "<?= url::site("organize/move/__TARGET_ID__?csrf=$csrf") ?>";
+  var move_url = "<?= url::site("organize/move_to/__ALBUM_ID__?csrf=$csrf") ?>";
   var rearrange_url = "<?= url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf") ?>";
-  var sort_order_url = "<?= url::site("organize/resort/$album->id/__COL__/__DIR__?csrf=$csrf") ?>";
+  var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
 </script>
 <div id="gOrganize" class="gDialogPanel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($album->title))) ?></h1>
@@ -23,7 +23,7 @@
       </div>
       <div id="gOrganizeDetail" class="yui-u">
         <div id="gMicroThumbPanel"
-             ref="<?= url::site("organize/content/__ITEM_ID__/__OFFSET__") ?>">
+             ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
           <ul id="gMicroThumbGrid">
             <?= $micro_thumb_grid ?>
           </ul>
@@ -34,12 +34,11 @@
           <form>
             <?= t("Sort order") ?>
             <?= form::dropdown(array("id" => "gOrganizeSortColumn"), album::get_sort_order_options(), $album->sort_column) ?>
-            <?= form::dropdown(array("id" => "gOrganizeSortDir"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
+            <?= form::dropdown(array("id" => "gOrganizeSortOrder"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
           </form>
         </div>
         <div id="gOrganizeProgress" style="display: none">
           <div class="gProgressBar"></div>
-          <div id="gStatus"></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 5adb487a..31dc9af5 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($item->children(25, $offset) as $child): ?>
+<? foreach ($album->children(25, $offset) as $child): ?>
 <li class="gMicroThumbGridCell" ref="<?= $child->id ?>">
   <div id="gMicroThumb_<?= $child->id ?>"
        class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
@@ -8,10 +8,10 @@
 </li>
 <? endforeach ?>
 
-<? if ($item->children_count() > $offset): ?>
+<? if ($album->children_count() > $offset): ?>
 <script>
   setTimeout(function() {
-    $.get("<?= url::site("organize/content/$item->id/" . ($offset + 25)) ?>",
+    $.get("<?= url::site("organize/content/$album->id/" . ($offset + 25)) ?>",
       function(data) {
         $("#gMicroThumbGrid").append(data);
         $.organize.set_handlers();
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 823301fc..e38976ff 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,17 +1,47 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<li class="gOrganizeBranch ui-icon-left <?= $can_edit ? "" : "gViewOnly" ?>" ref="<?= $album->id ?>">
-  <div id="gOrganizeBranch-<?= $album->id ?>" ref="<?= $album->id ?>"
-       class="<?= $selected ? "gBranchSelected" : "" ?>">
-    <span id="gOrganizeIcon-<?= $album->id ?>" ref="<?= $album->id ?>"
-          class="ui-icon <?= $album_icon ?>">
-    </span>
-    <span class="gBranchText" ref="<?= $album->id ?>"><?= p::clean($album->title) ?></span>
-  </div>
-  <ul id="gOrganizeChildren-<?= $album->id ?>"
-      class="<?= $album_icon == "ui-icon-plus" ? "gBranchCollapsed" : "" ?>">
-    <li style="display:none">&nbsp;</li>
-    <? foreach ($children as $child): ?>
-      <?= $child ?>
+<? foreach ($parents as $parent): ?>
+<li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $parent) ? "" : "gViewOnly" ?>"
+    ref="<?= $parent->id ?>">
+  <span class="ui-icon ui-icon-minus">
+  </span>
+  <span class="gAlbumText" ref="<?= $parent->id ?>">
+    <?= p::clean($parent->title) ?>
+  </span>
+  <ul class="ui-icon-plus">
     <? endforeach ?>
+
+    <? if ($parent->id == $album->parent_id): ?>
+    <? foreach ($parent->children(null, 0, array("type" => "album")) as $peer): ?>
+    <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $peer) ? "" : "gViewOnly" ?>"
+        ref="<?= $peer->id ?>">
+      <span class="ui-icon <?= $peer->id == $album->id ? "ui-icon-minus" : "ui-icon-plus" ?>">
+      </span>
+      <span class="gAlbumText <?= $peer->id == $album->id ? "selected" : "" ?>"
+            ref="<?= $peer->id ?>">
+        <?= p::clean($peer->title) ?>
+      </span>
+
+      <? if ($peer->id == $album->id): ?>
+      <ul class="ui-icon-plus">
+        <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
+        <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
+            ref="<?= $child->id ?>">
+          <span class="ui-icon ui-icon-plus">
+          </span>
+          <span class="gAlbumText"
+                ref="<?= $child->id ?>">
+            <?= p::clean($child->title) ?>
+          </span>
+        </li>
+        <? endforeach ?>
+      </ul>
+      <? endif ?>
+
+    </li>
+    <? endforeach ?>
+    <? endif ?>
+
+    <? foreach ($parents as $parent): ?>
   </ul>
 </li>
+<? endforeach ?>
-- 
cgit v1.2.3


From b833cb607323000b987428c94995e18a9d07df65 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 29 Aug 2009 10:48:23 -0700
Subject: Get rid of the task infrastructure.  The multiple requests greatly
 slow down simple operations.  We may run into problems with more complex
 operations, but let's only add tasks into the mix when it's clear that we
 need them.

---
 modules/organize/controllers/organize.php       | 205 ++++++------------------
 modules/organize/js/organize.js                 |  72 +++------
 modules/organize/views/organize_dialog.html.php |   3 -
 3 files changed, 67 insertions(+), 213 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index f25a41ca..de53c4ed 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -44,38 +44,63 @@ class Organize_Controller extends Controller {
   function move_to($album_id) {
     access::verify_csrf();
 
-    $task_def = Task_Definition::factory()
-      ->callback("Organize_Controller::move_task_handler");
-    $task = task::create($task_def, array("album_id" => $album_id,
-                                          "source_ids" => $this->input->post("source_ids")));
+    $album = ORM::factory("item", $album_id);
+    foreach ($this->input->post("source_ids") as $source_id) {
+      item::move(ORM::factory("item", $source_id), $album);
+    }
 
     print json_encode(
-      array("result" => "started",
-            "status" => $task->status,
-            "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
+      array("tree" => self::_tree($album)->__toString(),
+            "grid" => self::_get_micro_thumb_grid($album, 0)->__toString()));
   }
 
   function rearrange($target_id, $before_or_after) {
     access::verify_csrf();
 
     $target = ORM::factory("item", $target_id);
-    $parent = $target->parent();
-    access::required("view", $parent);
-    access::required("edit", $parent);
-
-    $task_def = Task_Definition::factory()
-      ->callback("Organize_Controller::rearrange_task_handler");
-    $task = task::create(
-      $task_def,
-      array("target_id" => $target_id,
-            "album_id" => $parent->id,
-            "before_or_after" => $before_or_after,
-            "source_ids" => $this->input->post("source_ids")));
+    $album = $target->parent();
+    access::required("view", $album);
+    access::required("edit", $album);
+
+    $source_ids = $this->input->post("source_ids", array());
+
+    if ($album->sort_column != "weight") {
+      $i = 0;
+      foreach ($album->children() as $child) {
+        // Do this directly in the database to avoid sending notifications
+        Database::Instance()->update("items", array("weight" => ++$i), array("id" => $child->id));
+      }
+      $album->sort_column = "weight";
+      $album->sort_order = "ASC";
+      $album->save();
+      $target->reload();
+    }
+
+    // Find the insertion point
+    $target_weight = $target->weight;
+    if ($before_or_after == "after") {
+      $target_weight++;
+    }
+
+    // Make a hole
+    $count = count($source_ids);
+    Database::Instance()->query(
+      "UPDATE {items} " .
+      "SET `weight` = `weight` + $count " .
+      "WHERE `weight` >= $target_weight AND `parent_id` = {$album->id}");
+
+    // Insert source items into the hole
+    foreach ($source_ids as $source_id) {
+      Database::Instance()->update(
+        "items", array("weight" => $target_weight++), array("id" => $source_id));
+    }
+
+    module::event("album_rearrange", $album);
 
     print json_encode(
-      array("result" => "started",
-            "status" => $task->status,
-            "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
+      array("grid" => self::_get_micro_thumb_grid($album, 0)->__toString(),
+            "sort_column" => $album->sort_column,
+            "sort_order" => $album->sort_order));
   }
 
   function sort_order($album_id, $col, $dir) {
@@ -107,146 +132,10 @@ class Organize_Controller extends Controller {
     return $v;
   }
 
-  /**
-   * Run the task
-   */
-  function run($task_id) {
-    access::verify_csrf();
-
-    $task = ORM::factory("task", $task_id);
-    if (!$task->loaded || $task->owner_id != user::active()->id) {
-      access::forbidden();
-    }
-
-    $task = task::run($task_id);
-    $results = array("done" => $task->done, "status" => $task->status,
-                     "percent_complete" => $task->percent_complete);
-
-    $album = ORM::factory("item", $task->get("album_id"));
-    $result = array(
-      "done" => $task->done,
-      "status" => $task->status,
-      "percent_complete" => $task->percent_complete);
-    if ($task->done) {
-      $result["tree"] = self::_tree($album)->__toString();
-      $result["grid"] = self::_get_micro_thumb_grid($album, 0)->__toString();
-    }
-    print json_encode($result);
-  }
-
   private static function _tree($album) {
     $v = new View("organize_tree.html");
     $v->parents = $album->parents();
     $v->album = $album;
     return $v;
   }
-
-  static function move_task_handler($task) {
-    $start = microtime(true);
-    if ($task->percent_complete == 0) {
-      batch::start();
-    }
-
-    $target_album = ORM::factory("item", $task->get("album_id"));
-    $source_ids = $task->get("source_ids", array());
-    $idx = $task->get("current", 0);
-    $count = 0;
-    for (; $idx < count($source_ids) && microtime(true) - $start < 0.5; $idx++) {
-      item::move(ORM::factory("item", $source_ids[$idx]), $target_album);
-      $count++;
-    }
-    $task->set("current", $idx);
-    $task->percent_complete = (int)($idx / count($source_ids) * 100);
-    if ($task->percent_complete == 100) {
-      batch::stop();
-      $task->done = true;
-      $task->state = "success";
-      $parents = array();
-      foreach ($target_album->parents() as $parent) {
-        $parents[$parent->id] = 1;
-      }
-      $parents[$target_album->id] = 1;
-    }
-  }
-
-  static function rearrange_task_handler($task) {
-    $start = microtime(true);
-    $mode = $task->get("mode", "init");
-
-    if ($task->percent_complete == 0) {
-      batch::start();
-    }
-    while (microtime(true) - $start < 1.5) {
-      switch ($mode) {
-      case "init":
-        $album = ORM::factory("item", $task->get("album_id"));
-        if ($album->sort_column != "weight") {
-          $mode = "convert-to-weight-order";
-        } else {
-          $mode = "find-insertion-point";
-        }
-        break;
-
-      case "convert-to-weight-order":
-        $i = 0;
-        $album = ORM::factory("item", $task->get("album_id"));
-        foreach ($album->children() as $child) {
-          // Do this directly in the database to avoid sending notifications
-          Database::Instance()->update("items", array("weight" => ++$i), array("id" => $child->id));
-        }
-        $album->sort_column = "weight";
-        $album->sort_order = "ASC";
-        $album->save();
-        $mode = "find-insertion-point";
-        $task->percent_complete = 25;
-        break;
-
-      case "find-insertion-point":
-        $album = ORM::factory("item", $task->get("album_id"));
-        $target_weight = $album->weight;
-
-        if ($task->get("before_or_after") == "after") {
-          $target_weight++;
-        }
-        $task->set("target_weight", $target_weight);
-        $task->percent_complete = 40;
-        $mode = "make-a-hole";
-        break;
-
-      case "make-a-hole":
-        $target_weight = $task->get("target_weight");
-        $source_ids = $task->get("source_ids");
-        $count = count($source_ids);
-        $album_id = $task->get("album_id");
-        Database::Instance()->query(
-          "UPDATE {items} " .
-          "SET `weight` = `weight` + $count " .
-          "WHERE `weight` >= $target_weight AND `parent_id` = {$album_id}");
-
-        $mode = "insert-source-items";
-        $task->percent_complete = 80;
-        break;
-
-      case "insert-source-items":
-        $target_weight = $task->get("target_weight");
-        foreach ($source_ids as $source_id) {
-          Database::Instance()->update(
-            "items", array("weight" => $target_weight++), array("id" => $source_id));
-        }
-        $mode = "done";
-        break;
-
-      case "done":
-        $album = ORM::factory("item", $task->get("album_id"));
-        module::event("album_rearrange", $album);
-        batch::stop();
-        $task->done = true;
-        $task->state = "success";
-        $task->percent_complete = 100;
-        break;
-      }
-    }
-
-    $task->set("mode", $mode);
-  }
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 5e7bd47c..04e14a2f 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -56,11 +56,12 @@
       tolerance: "pointer",
       greedy: true,
       drop: function(event, ui) {
+	var before_or_after = $(".currentDropTarget").css("borderLeftStyle") == "solid" ? "before" : "after";
         $.organize.do_drop({
           url: rearrange_url
 	    .replace("__TARGET_ID__", $(".currentDropTarget").attr("ref"))
 	    .replace("__ALBUM_ID__", $(".currentDropTarget").attr("ref"))
-            .replace("__BEFORE__", $(".currentDropTarget").css("borderLeftStyle") == "solid" ? "before" : "after"),
+	    .replace("__BEFORE__", before_or_after),
           source: $(ui.helper).children("img")
         });
       }
@@ -91,56 +92,23 @@
       });
 
       if (source_ids.length) {
-        $("#gOrganize .gProgressBar").progressbar().progressbar("value", 0);
-        $("#gOrganizeProgress").animate(
-          { height: "toggle", display: "toggle" },
-          {
-	   duration: "fast",
-           step: function() {
-           },
-           complete: function() {
-             $("#gMicroThumbPanel").height($("#gMicroThumbPanel").height() - $(this).height());
-             $.ajax({
-               url: options.url,
-               type: "POST",
-               async: false,
-               data: { "source_ids[]": source_ids },
-               dataType: "json",
-               success: function(data, textStatus) {
-                 $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
-                 setTimeout(function() { $.organize._run_task(data.url); }, 0);
-               }
-             });
-           }
-        });
+	$.post(options.url,
+	       { "source_ids[]": source_ids },
+	       function(data) { $.organize._refresh(data); },
+	      "json");
       }
     },
 
-    _run_task: function(url) {
-      $.ajax({
-        url: url,
-        async: false,
-        dataType: "json",
-        success: function(data, textStatus) {
-          $("#gOrganize .gProgressBar").progressbar("value", data.percent_complete);
-          if (data.done) {
-            var height = $("#gOrganizeProgress").height();
-            $("#gOrganizeProgress").slideUp();
-            $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
-            if (data.tree) {
-              $("#gOrganizeAlbumTree").html(data.tree);
-            }
-            if (data.grid) {
-              $("#gMicroThumbGrid").html(data.grid);
-              $("#gOrganizeSortColumn").attr("value", data.sort_column);
-              $("#gOrganizeSortOrder").attr("value", data.sort_order);
-            }
-            $.organize.set_handlers();
-          } else {
-	    setTimeout(function() {  $.organize._run_task(url); }, 0);
-          }
-        }
-      });
+    _refresh: function(data) {
+      if (data.tree) {
+        $("#gOrganizeAlbumTree").html(data.tree);
+      }
+      if (data.grid) {
+        $("#gMicroThumbGrid").html(data.grid);
+        $("#gOrganizeSortColumn").attr("value", data.sort_column);
+        $("#gOrganizeSortOrder").attr("value", data.sort_order);
+      }
+      $.organize.set_handlers();
     },
 
     mouse_move_handler: function(event) {
@@ -211,13 +179,13 @@
       $("#gOrganizeAlbumTree .selected").removeClass("selected");
       $(".gAlbumText[ref=" + id + "]").addClass("selected");
       var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
-      $.get(url, function(data) {
+      $.get(url, {},
+	    function(data) {
 	      $("#gMicroThumbGrid").html(data.grid);
 	      $("#gOrganizeSortColumn").attr("value", data.sort_column);
               $("#gOrganizeSortOrder").attr("value", data.sort_order);
               $.organize.set_handlers();
 	    },
-	    function() { },
 	    "json");
     },
 
@@ -229,13 +197,13 @@
         .replace("__ALBUM_ID__", $("#gOrganizeAlbumTree .selected").attr("ref"))
         .replace("__COL__", column)
         .replace("__DIR__", dir);
-      $.get(url, function(data) {
+      $.get(url, {},
+	    function(data) {
 	      $("#gMicroThumbGrid").html(data.grid);
               $("#gOrganizeSortColumn").attr("value", data.sort_column);
               $("#gOrganizeSortOrder").attr("value", data.sort_order);
 	      $.organize.set_handlers();
 	    },
-	    function() { },
 	    "json");
     }
   };
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 7ade91a2..b03c066c 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -37,9 +37,6 @@
             <?= form::dropdown(array("id" => "gOrganizeSortOrder"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
           </form>
         </div>
-        <div id="gOrganizeProgress" style="display: none">
-          <div class="gProgressBar"></div>
-        </div>
       </div>
     </div>
   </div>
-- 
cgit v1.2.3


From 4408ed0684ad8b1a2e1623ef2103fdad8ae5d895 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 29 Aug 2009 10:56:35 -0700
Subject: Remove stray blank line.

---
 modules/organize/views/organize_tree.html.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index e38976ff..cf957fe6 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -36,7 +36,6 @@
         <? endforeach ?>
       </ul>
       <? endif ?>
-
     </li>
     <? endforeach ?>
     <? endif ?>
-- 
cgit v1.2.3


From 775987dff99b4459d6fef255d67da3bd6cdeb7c5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 29 Aug 2009 11:29:38 -0700
Subject: Fix a bug where organize doesn't properly generate the tree at the
 root album.

---
 modules/organize/controllers/organize.php     | 7 +++++++
 modules/organize/views/organize_tree.html.php | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index de53c4ed..2b966657 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -136,6 +136,13 @@ class Organize_Controller extends Controller {
     $v = new View("organize_tree.html");
     $v->parents = $album->parents();
     $v->album = $album;
+
+    if ($album->id == 1) {
+      $v->peers = array($album);
+    } else {
+      $v->peers = $album->parent()->children(null, 0, array("type" => "album"));
+    }
+
     return $v;
   }
 }
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index cf957fe6..36f900ac 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -10,8 +10,7 @@
   <ul class="ui-icon-plus">
     <? endforeach ?>
 
-    <? if ($parent->id == $album->parent_id): ?>
-    <? foreach ($parent->children(null, 0, array("type" => "album")) as $peer): ?>
+    <? foreach ($peers as $peer): ?>
     <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $peer) ? "" : "gViewOnly" ?>"
         ref="<?= $peer->id ?>">
       <span class="ui-icon <?= $peer->id == $album->id ? "ui-icon-minus" : "ui-icon-plus" ?>">
@@ -38,7 +37,6 @@
       <? endif ?>
     </li>
     <? endforeach ?>
-    <? endif ?>
 
     <? foreach ($parents as $parent): ?>
   </ul>
-- 
cgit v1.2.3


From c4d5ecde66c7bffde2259b9815c050e6a4d8f333 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 14:38:47 -0700
Subject: L10n fixes for the admin_languages page, and JS/XSS cleanup of the
 organize views.

---
 modules/gallery/views/admin_languages.html.php  | 21 +++++++++++++--------
 modules/organize/views/organize_dialog.html.php |  2 +-
 modules/organize/views/organize_tree.html.php   |  6 +++---
 3 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 4025437a..4bee9bb1 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -36,11 +36,11 @@
 			
       <? endforeach ?>
     </table>
-		<input type="submit" value="<?= t("Update languages") ?>" />
+		<input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" />
   </form>
 	
 	<script type="text/javascript">
-    var old_default_locale = "<?= $default_locale ?>";
+    var old_default_locale = "<?= SafeString::of($default_locale)->for_js() ?>";
     
     $("input[name='installed_locales[]']").change(function (event) {
       if (this.checked) {
@@ -57,7 +57,7 @@
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
-          el = $('<a href="<?= url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf") ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
+          el = $('<a href="<?= url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")->for_js() ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
           el.gallery_dialog();
           el.trigger('click');
         }
@@ -77,20 +77,25 @@
 	<div class="gBlock">
 		<a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
 		  class="gDocLink ui-state-default ui-corner-all ui-icon ui-icon-help"
-			title="<?= t("Localization documentation") ?>">
+			title="<?= t("Localization documentation")->for_html_attr() ?>">
       <?= t("Localization documentation") ?>
     </a>
 		
-		<p><strong><?= t("Step 1") ?>:</strong> <?= t("Make sure the target language is installed and updated (check above).") ?></p>
+		<p><?= t("<strong>Step 1:</strong> Make sure the target language is installed and up to date (check above).") ?></p>
 		
-		<p><strong><?= t("Step 2") ?>:</strong> <?= t("Make sure the target language is the active one (currently '").locales::display_name()."')." ?></p>
+      <p><?= t("<strong>Step 2:</strong> Make sure you have selected the right  target language (currently %default_locale).",
+               array("default_locale" => locales::display_name())) ?></p>
 		
-		<p><strong><?= t("Step 3") ?>:</strong> <?= t("Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
+		<p><?= t("<strong>Step 3:</strong> Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
 		
 		<a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
 		  class="gButtonLink ui-state-default ui-corner-all ui-icon-left">
 		  <span class="ui-icon ui-icon-power"></span>
-		  <?= t((Session::instance()->get("l10n_mode", false)) ? "Stop translation mode" : "Start translation mode") ?>
+                  <? if (Session::instance()->get("l10n_mode", false)): ?>
+                  <?= t("Stop translation mode") ?>
+                  <? else: ?>
+                  <?= t("Start translation mode") ?>
+                  <? endif ?>
 	  </a>
 	</div>
 	
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index b03c066c..27d5b508 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -5,7 +5,7 @@
   var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
 </script>
 <div id="gOrganize" class="gDialogPanel">
-  <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($album->title))) ?></h1>
+  <h1 style="display:none"><?= t("Organize %name", array("name" => SafeString::purify($album->title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
       <div class="yui-u first">
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 36f900ac..387d5977 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -5,7 +5,7 @@
   <span class="ui-icon ui-icon-minus">
   </span>
   <span class="gAlbumText" ref="<?= $parent->id ?>">
-    <?= p::clean($parent->title) ?>
+    <?= SafeString::of($parent->title) ?>
   </span>
   <ul class="ui-icon-plus">
     <? endforeach ?>
@@ -17,7 +17,7 @@
       </span>
       <span class="gAlbumText <?= $peer->id == $album->id ? "selected" : "" ?>"
             ref="<?= $peer->id ?>">
-        <?= p::clean($peer->title) ?>
+        <?= SafeString::of($peer->title) ?>
       </span>
 
       <? if ($peer->id == $album->id): ?>
@@ -29,7 +29,7 @@
           </span>
           <span class="gAlbumText"
                 ref="<?= $child->id ?>">
-            <?= p::clean($child->title) ?>
+            <?= SafeString::of($child->title) ?>
           </span>
         </li>
         <? endforeach ?>
-- 
cgit v1.2.3


From 483d8df91b443a20a614eb5864cabb2a66ac72d2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 29 Aug 2009 16:33:22 -0700
Subject: Change the organize tree to expand/collapse.  It doesn't properly
 open up to the album that you're viewing, and if you move a photo to a
 different album it'll reload the entire album tree.

---
 modules/organize/controllers/organize.php       | 18 +++++-----
 modules/organize/js/organize.js                 | 26 ++++++++++++++
 modules/organize/views/organize_dialog.html.php |  1 +
 modules/organize/views/organize_tree.html.php   | 46 +++++++------------------
 4 files changed, 47 insertions(+), 44 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 2b966657..3cbcfb28 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -25,7 +25,7 @@ class Organize_Controller extends Controller {
 
     $v = new View("organize_dialog.html");
     $v->album = $album;
-    $v->album_tree = self::_tree($album);
+    $v->album_tree = self::_tree(ORM::factory("item", 1));
     $v->micro_thumb_grid = self::_get_micro_thumb_grid($album, 0);
     print $v;
   }
@@ -50,7 +50,7 @@ class Organize_Controller extends Controller {
     }
 
     print json_encode(
-      array("tree" => self::_tree($album)->__toString(),
+      array("tree" => self::_tree(ORM::factory("item", 1))->__toString(),
             "grid" => self::_get_micro_thumb_grid($album, 0)->__toString()));
   }
 
@@ -132,17 +132,15 @@ class Organize_Controller extends Controller {
     return $v;
   }
 
+  public function tree($album_id) {
+    $album = ORM::factory("item", $album_id);
+    access::required("view", $album);
+    print self::_tree($album);
+  }
+
   private static function _tree($album) {
     $v = new View("organize_tree.html");
-    $v->parents = $album->parents();
     $v->album = $album;
-
-    if ($album->id == 1) {
-      $v->peers = array($album);
-    } else {
-      $v->peers = $album->parent()->children(null, 0, array("type" => "album"));
-    }
-
     return $v;
   }
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 04e14a2f..3dbd0c89 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -159,8 +159,34 @@
       $(".gMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
       $(".gOrganizeAlbum").droppable($.organize.branch_droppable);
       $(".gAlbumText").click($.organize.show_album);
+      $("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch);
     },
 
+    toggle_branch: function(event) {
+      event.preventDefault();
+      var target = $(event.currentTarget);
+      var branch = $(target).parent();
+      var id = $(event.currentTarget).parent().attr("ref");
+
+      if ($(target).hasClass("ui-icon-plus")) {
+	// Expanding
+	if (!branch.find("ul").length) {
+	  $.get(tree_url.replace("__ALBUM_ID__", id), { },
+	    function(data) {
+	      branch.replaceWith(data);
+	      $.organize.set_handlers();
+	    }
+	  );
+	} else {
+	  branch.find("ul:eq(0)").slideDown();
+	}
+      } else {
+	// Contracting
+	branch.find("ul:eq(0)").slideUp();
+      }
+      $(target).toggleClass("ui-icon-plus");
+      $(target).toggleClass("ui-icon-minus");
+    },
 
     /**
      * When the text of a selection is clicked, then show that albums contents
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index b03c066c..d4196460 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -3,6 +3,7 @@
   var move_url = "<?= url::site("organize/move_to/__ALBUM_ID__?csrf=$csrf") ?>";
   var rearrange_url = "<?= url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf") ?>";
   var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
+  var tree_url = "<?= url::site("organize/tree/__ALBUM_ID__") ?>";
 </script>
 <div id="gOrganize" class="gDialogPanel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($album->title))) ?></h1>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 36f900ac..4677234c 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,44 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($parents as $parent): ?>
-<li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $parent) ? "" : "gViewOnly" ?>"
-    ref="<?= $parent->id ?>">
+<li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $album) ? "" : "gViewOnly" ?>"
+    ref="<?= $album->id ?>">
   <span class="ui-icon ui-icon-minus">
   </span>
-  <span class="gAlbumText" ref="<?= $parent->id ?>">
-    <?= p::clean($parent->title) ?>
+  <span class="gAlbumText" ref="<?= $album->id ?>">
+    <?= p::clean($album->title) ?>
   </span>
-  <ul class="ui-icon-plus">
-    <? endforeach ?>
-
-    <? foreach ($peers as $peer): ?>
-    <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $peer) ? "" : "gViewOnly" ?>"
-        ref="<?= $peer->id ?>">
-      <span class="ui-icon <?= $peer->id == $album->id ? "ui-icon-minus" : "ui-icon-plus" ?>">
+  <ul>
+    <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
+    <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
+        ref="<?= $child->id ?>">
+      <span class="ui-icon ui-icon-plus">
       </span>
-      <span class="gAlbumText <?= $peer->id == $album->id ? "selected" : "" ?>"
-            ref="<?= $peer->id ?>">
-        <?= p::clean($peer->title) ?>
+      <span class="gAlbumText" ref="<?= $child->id ?>">
+        <?= p::clean($child->title) ?>
       </span>
-
-      <? if ($peer->id == $album->id): ?>
-      <ul class="ui-icon-plus">
-        <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
-        <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
-            ref="<?= $child->id ?>">
-          <span class="ui-icon ui-icon-plus">
-          </span>
-          <span class="gAlbumText"
-                ref="<?= $child->id ?>">
-            <?= p::clean($child->title) ?>
-          </span>
-        </li>
-        <? endforeach ?>
-      </ul>
-      <? endif ?>
     </li>
     <? endforeach ?>
-
-    <? foreach ($parents as $parent): ?>
   </ul>
 </li>
-<? endforeach ?>
+
-- 
cgit v1.2.3


From b9bd1681a3b1496c0f1bbe5e6254ab4fd0c9fe30 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 29 Aug 2009 22:54:20 -0700
Subject: Update all code to use helper method html::clean(), html::purify(),
 ... instead of SafeString directly.

---
 modules/comment/controllers/comments.php                   |  8 ++++----
 modules/comment/helpers/comment_rss.php                    |  8 ++++----
 modules/comment/views/admin_block_recent_comments.html.php |  6 +++---
 modules/comment/views/admin_comments.html.php              | 10 +++++-----
 modules/comment/views/comment.html.php                     |  6 +++---
 modules/comment/views/comment.mrss.php                     | 12 ++++++------
 modules/comment/views/comments.html.php                    |  6 +++---
 modules/digibug/controllers/digibug.php                    |  2 +-
 modules/exif/views/exif_dialog.html.php                    |  4 ++--
 modules/g2_import/helpers/g2_import.php                    |  2 +-
 modules/gallery/controllers/admin_advanced_settings.php    |  2 +-
 modules/gallery/controllers/quick.php                      | 10 +++++-----
 modules/gallery/helpers/MY_html.php                        |  4 ++--
 modules/gallery/helpers/gallery_rss.php                    |  4 ++--
 modules/gallery/helpers/gallery_task.php                   |  4 ++--
 modules/gallery/tests/Html_Helper_Test.php                 |  4 ++--
 modules/gallery/tests/Xss_Security_Test.php                |  4 ++--
 modules/gallery/views/admin_advanced_settings.html.php     |  6 +++---
 modules/gallery/views/admin_block_log_entries.html.php     |  2 +-
 modules/gallery/views/admin_block_photo_stream.html.php    |  4 ++--
 modules/gallery/views/admin_languages.html.php             |  4 ++--
 modules/gallery/views/admin_maintenance.html.php           |  4 ++--
 modules/gallery/views/admin_maintenance_show_log.html.php  |  2 +-
 modules/gallery/views/move_tree.html.php                   |  8 ++++----
 modules/gallery/views/permissions_browse.html.php          |  4 ++--
 modules/gallery/views/permissions_form.html.php            |  2 +-
 modules/gallery/views/simple_uploader.html.php             | 14 +++++++-------
 modules/info/views/info_block.html.php                     | 10 +++++-----
 modules/notification/views/comment_published.html.php      | 12 ++++++------
 modules/notification/views/item_added.html.php             |  8 ++++----
 modules/notification/views/item_deleted.html.php           |  6 +++---
 modules/notification/views/item_updated.html.php           | 12 ++++++------
 modules/organize/views/organize_dialog.html.php            |  2 +-
 modules/organize/views/organize_tree.html.php              |  6 +++---
 modules/rss/views/feed.mrss.php                            | 14 +++++++-------
 modules/rss/views/rss_block.html.php                       |  2 +-
 modules/search/views/search.html.php                       |  6 +++---
 modules/server_add/views/admin_server_add.html.php         |  2 +-
 modules/server_add/views/server_add_tree.html.php          |  4 ++--
 modules/server_add/views/server_add_tree_dialog.html.php   |  6 +++---
 modules/tag/controllers/admin_tags.php                     |  2 +-
 modules/tag/views/admin_tags.html.php                      |  6 +++---
 modules/tag/views/tag_cloud.html.php                       |  2 +-
 modules/user/controllers/logout.php                        |  2 +-
 modules/user/views/admin_users.html.php                    |  8 ++++----
 modules/user/views/admin_users_group.html.php              |  4 ++--
 modules/user/views/login.html.php                          |  2 +-
 themes/default/views/album.html.php                        |  6 +++---
 themes/default/views/dynamic.html.php                      |  4 ++--
 themes/default/views/header.html.php                       |  4 ++--
 themes/default/views/movie.html.php                        |  4 ++--
 themes/default/views/photo.html.php                        |  6 +++---
 52 files changed, 143 insertions(+), 143 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 87633f4c..82b12893 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -39,9 +39,9 @@ class Comments_Controller extends REST_Controller {
       foreach ($comments as $comment) {
         $data[] = array(
           "id" => $comment->id,
-          "author_name" => SafeString::of($comment->author_name()),
+          "author_name" => html::clean($comment->author_name()),
           "created" => $comment->created,
-          "text" => nl2br(SafeString::purify($comment->text)));
+          "text" => nl2br(html::purify($comment->text)));
       }
       print json_encode($data);
       break;
@@ -126,9 +126,9 @@ class Comments_Controller extends REST_Controller {
         array("result" => "success",
               "data" => array(
                 "id" => $comment->id,
-                "author_name" => SafeString::of($comment->author_name()),
+                "author_name" => html::clean($comment->author_name()),
                 "created" => $comment->created,
-                "text" => nl2br(SafeString::purify($comment->text)))));
+                "text" => nl2br(html::purify($comment->text)))));
     } else {
       $view = new Theme_View("comment.html", "fragment");
       $view->comment = $comment;
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 4151dcd0..b539887b 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -23,7 +23,7 @@ class comment_rss_Core {
     $feeds["comment/newest"] = t("All new comments");
     if ($item) {
       $feeds["comment/item/$item->id"] =
-        t("Comments on %title", array("title" => SafeString::purify($item->title)));
+        t("Comments on %title", array("title" => html::purify($item->title)));
     }
     return $feeds;
   }
@@ -49,13 +49,13 @@ class comment_rss_Core {
       $item = $comment->item();
       $feed->children[] = new ArrayObject(
         array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
-              "text" => nl2br(SafeString::purify($comment->text)),
+              "text" => nl2br(html::purify($comment->text)),
               "thumb_url" => $item->thumb_url(),
               "thumb_height" => $item->thumb_height,
               "thumb_width" => $item->thumb_width,
               "item_uri" => url::abs_site("{$item->type}s/$item->id"),
-              "title" => SafeString::purify($item->title),
-              "author" => SafeString::of($comment->author_name())),
+              "title" => html::purify($item->title),
+              "author" => html::clean($comment->author_name())),
         ArrayObject::ARRAY_AS_PROPS);
     }
 
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index 2c7a5cf1..dc3975e0 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -4,13 +4,13 @@
   <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
     <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
-         alt="<?= SafeString::of($comment->author_name()) ?>"
+         alt="<?= html::clean($comment->author_name()) ?>"
          width="32"
          height="32" />
     <?= gallery::date_time($comment->created) ?>
     <?= t('<a href="#">%author_name</a> said <em>%comment_text</em>',
-          array("author_name" => SafeString::of($comment->author_name()),
-                "comment_text" => text::limit_words(nl2br(SafeString::purify($comment->text)), 50))); ?>
+          array("author_name" => html::clean($comment->author_name()),
+                "comment_text" => text::limit_words(nl2br(html::purify($comment->text)), 50))); ?>
   </li>
   <? endforeach ?>
 </ul>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 8b0b4c29..801ce2b3 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -108,12 +108,12 @@
         <a href="#">
           <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
                class="gAvatar"
-               alt="<?= SafeString::of($comment->author_name()) ?>"
+               alt="<?= html::clean($comment->author_name()) ?>"
                width="40"
                height="40" />
         </a>
-        <p><a href="mailto:<?= SafeString::of($comment->author_email()) ?>"
-              title="<?= SafeString::of($comment->author_email()) ?>"> <?= SafeString::of($comment->author_name()) ?> </a></p>
+        <p><a href="mailto:<?= html::clean($comment->author_email()) ?>"
+              title="<?= html::clean($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
       </td>
       <td>
         <div class="right">
@@ -122,7 +122,7 @@
             <a href="<?= $item->url() ?>">
               <? if ($item->has_thumb()): ?>
               <img src="<?= $item->thumb_url() ?>"
-                 alt="<?= SafeString::purify($item->title) ?>"
+                 alt="<?= html::purify($item->title) ?>"
                  <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
               />
               <? else: ?>
@@ -132,7 +132,7 @@
           </div>
         </div>
         <p><?= gallery::date($comment->created) ?></p>
-           <?= nl2br(SafeString::purify($comment->text)) ?>
+           <?= nl2br(html::purify($comment->text)) ?>
       </td>
       <td>
         <ul class="gButtonSetVertical">
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index 31bb7f4d..1d0786cb 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -4,15 +4,15 @@
     <a href="#">
       <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
            class="gAvatar"
-           alt="<?= SafeString::of($comment->author_name()) ?>"
+           alt="<?= html::clean($comment->author_name()) ?>"
            width="40"
            height="40" />
     </a>
     <?= t("on %date_time, %author_name said",
           array("date_time" => gallery::date_time($comment->created),
-                "author_name" => SafeString::of($comment->author_name()))) ?>
+                "author_name" => html::clean($comment->author_name()))) ?>
   </p>
   <div>
-  <?= nl2br(SafeString::purify($comment->text)) ?>
+  <?= nl2br(html::purify($comment->text)) ?>
   </div>
 </li>
diff --git a/modules/comment/views/comment.mrss.php b/modules/comment/views/comment.mrss.php
index ae7762d9..c2a4b538 100644
--- a/modules/comment/views/comment.mrss.php
+++ b/modules/comment/views/comment.mrss.php
@@ -6,9 +6,9 @@
    xmlns:fh="http://purl.org/syndication/history/1.0">
   <channel>
     <generator>Gallery 3</generator>
-    <title><?= SafeString::of($feed->title) ?></title>
+    <title><?= html::clean($feed->title) ?></title>
     <link><?= $feed->uri ?></link>
-    <description><?= SafeString::of($feed->description) ?></description>
+    <description><?= html::clean($feed->description) ?></description>
     <language>en-us</language>
     <atom:link rel="self" href="<?= $feed->uri ?>" type="application/rss+xml" />
     <fh:complete/>
@@ -22,14 +22,14 @@
     <lastBuildDate><?= $pub_date ?></lastBuildDate>
     <? foreach ($feed->children as $child): ?>
     <item>
-      <title><?= SafeString::purify($child->title) ?></title>
-      <link><?= SafeString::of($child->item_uri) ?></link>
-      <author><?= SafeString::of($child->author) ?></author>
+      <title><?= html::purify($child->title) ?></title>
+      <link><?= html::clean($child->item_uri) ?></link>
+      <author><?= html::clean($child->author) ?></author>
       <guid isPermaLink="true"><?= $child->item_uri ?></guid>
       <pubDate><?= $child->pub_date ?></pubDate>
       <content:encoded>
         <![CDATA[
-          <p><?= nl2br(SafeString::purify($child->text)) ?></p>
+          <p><?= nl2br(html::purify($child->text)) ?></p>
           <p>
             <img alt="" src="<?= $child->thumb_url ?>"
                  height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" />
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 9eac0502..1e45c946 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -18,16 +18,16 @@
       <a href="#">
         <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
              class="gAvatar"
-             alt="<?= SafeString::of($comment->author_name()) ?>"
+             alt="<?= html::clean($comment->author_name()) ?>"
              width="40"
              height="40" />
       </a>
       <?= t('on %date <a href="#">%name</a> said',
             array("date" => date("Y-M-d H:i:s", $comment->created),
-                  "name" => SafeString::of($comment->author_name()))); ?>
+                  "name" => html::clean($comment->author_name()))); ?>
     </p>
     <div>
-      <?= nl2br(SafeString::purify($comment->text)) ?>
+      <?= nl2br(html::purify($comment->text)) ?>
     </div>
   </li>
   <? endforeach ?>
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 509a8b70..0939704b 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -50,7 +50,7 @@ class Digibug_Controller extends Controller {
       "image_width_1" => $item->width,
       "thumb_height_1" => $item->thumb_height,
       "thumb_width_1" => $item->thumb_width,
-      "title_1" => SafeString::purify($item->title));
+      "title_1" => html::purify($item->title));
 
     print $v;
   }
diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php
index a981ca09..11d1e212 100644
--- a/modules/exif/views/exif_dialog.html.php
+++ b/modules/exif/views/exif_dialog.html.php
@@ -14,14 +14,14 @@
          <?= $details[$i]["caption"] ?>
          </td>
          <td class="gOdd">
-         <?= SafeString::of($details[$i]["value"]) ?>
+         <?= html::clean($details[$i]["value"]) ?>
          </td>
          <? if (!empty($details[++$i])): ?>
            <td class="gEven">
            <?= $details[$i]["caption"] ?>
            </td>
            <td class="gOdd">
-           <?= SafeString::of($details[$i]["value"]) ?>
+           <?= html::clean($details[$i]["value"]) ?>
            </td>
          <? else: ?>
            <td class="gEven"></td><td class="gOdd"></td>
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index a01ca1db..7e5c6f75 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -590,7 +590,7 @@ class g2_import_Core {
     self::map($g2_comment->getId(), $comment->id);
     return t("Imported comment '%comment' for item with id: %id",
              array("id" => $comment->item_id,
-                   "comment" => text::limit_words(nl2br(SafeString::purify($comment->text)), 50)));
+                   "comment" => text::limit_words(nl2br(html::purify($comment->text)), 50)));
   }
 
   /**
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index d727b654..43c77340 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -46,7 +46,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     module::set_var($module_name, $var_name, Input::instance()->post("value"));
     message::success(
       t("Saved value for %var (%module_name)",
-        array("var" => SafeString::of($var_name), "module_name" => $module_name)));
+        array("var" => html::clean($var_name), "module_name" => $module_name)));
 
     print json_encode(array("result" => "success"));
   }
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 8fddb563..20731f9c 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -75,7 +75,7 @@ class Quick_Controller extends Controller {
     access::required("view", $item->parent());
     access::required("edit", $item->parent());
 
-    $msg = t("Made <b>%title</b> this album's cover", array("title" => SafeString::purify($item->title)));
+    $msg = t("Made <b>%title</b> this album's cover", array("title" => html::purify($item->title)));
 
     item::make_album_cover($item);
     message::success($msg);
@@ -91,10 +91,10 @@ class Quick_Controller extends Controller {
     if ($item->is_album()) {
       print t(
         "Delete the album <b>%title</b>? All photos and movies in the album will also be deleted.",
-        array("title" => SafeString::purify($item->title)));
+        array("title" => html::purify($item->title)));
     } else {
       print t("Are you sure you want to delete <b>%title</b>?",
-              array("title" => SafeString::purify($item->title)));
+              array("title" => html::purify($item->title)));
     }
 
     $form = item::get_delete_form($item);
@@ -108,9 +108,9 @@ class Quick_Controller extends Controller {
     access::required("edit", $item);
 
     if ($item->is_album()) {
-      $msg = t("Deleted album <b>%title</b>", array("title" => SafeString::purify($item->title)));
+      $msg = t("Deleted album <b>%title</b>", array("title" => html::purify($item->title)));
     } else {
-      $msg = t("Deleted photo <b>%title</b>", array("title" => SafeString::purify($item->title)));
+      $msg = t("Deleted photo <b>%title</b>", array("title" => html::purify($item->title)));
     }
 
     $parent = $item->parent();
diff --git a/modules/gallery/helpers/MY_html.php b/modules/gallery/helpers/MY_html.php
index eb388811..75114898 100644
--- a/modules/gallery/helpers/MY_html.php
+++ b/modules/gallery/helpers/MY_html.php
@@ -65,11 +65,11 @@ class html extends html_Core {
    *
    * Example:<pre>
    *   <script type="text/javascript>"
-   *     var some_js_var = "<?= html::escape_for_js($php_var) ?>";
+   *     var some_js_var = "<?= html::clean_js($php_var) ?>";
    *   </script>
    * </pre>
    */
-  static function escape_for_js($string) {
+  static function clean_js($string) {
     return SafeString::of($string)->for_js();
   }
 
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index affb3101..dee6ae40 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -53,9 +53,9 @@ class gallery_rss_Core {
         ->descendants($limit, $offset, array("type" => "photo"));
       $feed->max_pages = ceil(
         $item->viewable()->descendants_count(array("type" => "photo")) / $limit);
-      $feed->title = SafeString::purify($item->title);
+      $feed->title = html::purify($item->title);
       $feed->link = url::abs_site("albums/{$item->id}");
-      $feed->description = nl2br(SafeString::purify($item->description));
+      $feed->description = nl2br(html::purify($item->description));
 
       return $feed;
     }
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 8c0e8aa8..c9557324 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -64,10 +64,10 @@ class gallery_task_Core {
           if (!$success) {
             $ignored[$item->id] = 1;
             $errors[] = t("Unable to rebuild images for '%title'",
-                          array("title" => SafeString::purify($item->title)));
+                          array("title" => html::purify($item->title)));
           } else {
             $errors[] = t("Successfully rebuilt images for '%title'",
-                          array("title" => SafeString::purify($item->title)));
+                          array("title" => html::purify($item->title)));
           }
         }
 
diff --git a/modules/gallery/tests/Html_Helper_Test.php b/modules/gallery/tests/Html_Helper_Test.php
index 4d934ad5..a9903256 100644
--- a/modules/gallery/tests/Html_Helper_Test.php
+++ b/modules/gallery/tests/Html_Helper_Test.php
@@ -40,8 +40,8 @@ class Html_Helper_Test extends Unit_Test_Case {
 			$safe_string_2);
   }
 
-  public function escape_for_js_test() {
-    $string = html::escape_for_js("hello's <p  >world</p>");
+  public function clean_js_test() {
+    $string = html::clean_js("hello's <p  >world</p>");
     $this->assert_equal("hello\\'s <p  >world<\\/p>",
 			$string);
   }
diff --git a/modules/gallery/tests/Xss_Security_Test.php b/modules/gallery/tests/Xss_Security_Test.php
index 8e5f8354..16e5a856 100644
--- a/modules/gallery/tests/Xss_Security_Test.php
+++ b/modules/gallery/tests/Xss_Security_Test.php
@@ -151,7 +151,7 @@ class Xss_Security_Test extends Unit_Test_Case {
 	    if (self::_token_matches(array(T_DOUBLE_COLON, "::"), $tokens, $token_number + 1) &&
 		self::_token_matches(array(T_STRING), $tokens, $token_number + 2) &&
 		in_array($tokens[$token_number + 2][1],
-			 array("clean", "purify", "escape_for_js", "clean_attribute_test")) &&
+			 array("clean", "purify", "clean_js", "clean_attribute")) &&
 		self::_token_matches("(", $tokens, $token_number + 3)) {
               // Not checking for mark_safe(). We want such calls to be marked dirty (thus reviewed).
 
@@ -161,7 +161,7 @@ class Xss_Security_Test extends Unit_Test_Case {
 	      $token_number += 3;
 	      $token = $tokens[$token_number];
 
-              if ("escape_for_js" == $method) {
+              if ("clean_js" == $method) {
                 $frame->is_safe_js(true);
               } else {
                 $frame->is_safe_html(true);
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index adc15b91..4235e8f8 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -20,13 +20,13 @@
     <? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
     <tr class="setting">
       <td> <?= $var->module_name ?> </td>
-      <td> <?= SafeString::of($var->name) ?> </td>
+      <td> <?= html::clean($var->name) ?> </td>
       <td>
-        <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . SafeString::of($var->name)) ?>"
+        <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
           class="gDialogLink"
           title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name)) ?>">
           <? if ($var->value): ?>
-          <?= SafeString::of($var->value) ?>
+          <?= html::clean($var->value) ?>
           <? else: ?>
           <i> <?= t("empty") ?> </i>
           <? endif ?>
diff --git a/modules/gallery/views/admin_block_log_entries.html.php b/modules/gallery/views/admin_block_log_entries.html.php
index b7afb22d..780ff2d0 100644
--- a/modules/gallery/views/admin_block_log_entries.html.php
+++ b/modules/gallery/views/admin_block_log_entries.html.php
@@ -2,7 +2,7 @@
 <ul>
   <? foreach ($entries as $entry): ?>
   <li class="<?= log::severity_class($entry->severity) ?>" style="direction: ltr">
-    <a href="<?= url::site("user/$entry->user_id") ?>"><?= SafeString::of($entry->user->name) ?></a>
+    <a href="<?= url::site("user/$entry->user_id") ?>"><?= html::clean($entry->user->name) ?></a>
     <?= gallery::date_time($entry->timestamp) ?>
     <?= $entry->message ?>
     <?= $entry->html ?>
diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
index 732bdc38..a50836ad 100644
--- a/modules/gallery/views/admin_block_photo_stream.html.php
+++ b/modules/gallery/views/admin_block_photo_stream.html.php
@@ -2,9 +2,9 @@
 <ul>
 <? foreach ($photos as $photo): ?>
   <li class="gItem gPhoto">
-    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= SafeString::of($photo->title) ?>">
+    <a href="<?= url::site("photos/$photo->id") ?>" title="<?= html::clean($photo->title) ?>">
       <img <?= photo::img_dimensions($photo->width, $photo->height, 72) ?>
-        src="<?= $photo->thumb_url() ?>" alt="<?= SafeString::of($photo->title) ?>" />
+        src="<?= $photo->thumb_url() ?>" alt="<?= html::clean($photo->title) ?>" />
     </a>
   </li>
 <? endforeach ?>
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 4bee9bb1..052d749b 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -40,7 +40,7 @@
   </form>
 	
 	<script type="text/javascript">
-    var old_default_locale = "<?= SafeString::of($default_locale)->for_js() ?>";
+    var old_default_locale = "<?= html::escape_for_js($default_locale) ?>";
     
     $("input[name='installed_locales[]']").change(function (event) {
       if (this.checked) {
@@ -57,7 +57,7 @@
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
-          el = $('<a href="<?= url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")->for_js() ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
+          el = $('<a href="<?= html::escape_for_js(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
           el.gallery_dialog();
           el.trigger('click');
         }
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index a1f7b126..05bc0923 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -93,7 +93,7 @@
           <?= $task->status ?>
         </td>
         <td>
-          <?= SafeString::of($task->owner()->name) ?>
+          <?= html::clean($task->owner()->name) ?>
         </td>
         <td>
           <? if ($task->state == "stalled"): ?>
@@ -164,7 +164,7 @@
           <?= $task->status ?>
         </td>
         <td>
-          <?= SafeString::of($task->owner()->name) ?>
+          <?= html::clean($task->owner()->name) ?>
         </td>
         <td>
           <? if ($task->done): ?>
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index 209aef03..8ea1beb6 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -12,7 +12,7 @@ appendTo('body').submit().remove();
 <div id="gTaskLogDialog">
   <h1> <?= $task->name ?> </h1>
   <div class="gTaskLog">
-    <pre><?= SafeString::purify($task->get_log()) ?></pre>
+    <pre><?= html::purify($task->get_log()) ?></pre>
   </div>
   <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
   <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
diff --git a/modules/gallery/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
index 7818a42a..623f80ee 100644
--- a/modules/gallery/views/move_tree.html.php
+++ b/modules/gallery/views/move_tree.html.php
@@ -1,18 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $parent->thumb_img(array(), 25); ?>
 <? if (!access::can("edit", $parent) || $source->is_descendant($parent)): ?>
-<a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= SafeString::of($parent->title) ?> <?= t("(locked)") ?> </a>
+<a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= html::clean($parent->title) ?> <?= t("(locked)") ?> </a>
 <? else: ?>
-<a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= SafeString::of($parent->title) ?></a>
+<a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= html::clean($parent->title) ?></a>
 <? endif ?>
 <ul id="tree_<?= $parent->id ?>">
   <? foreach ($children as $child): ?>
   <li id="node_<?= $child->id ?>" class="node">
     <?= $child->thumb_img(array(), 25); ?>
     <? if (!access::can("edit", $child) || $source->is_descendant($child)): ?>
-    <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= SafeString::of($child->title) ?> <?= t("(locked)") ?></a>
+    <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= html::clean($child->title) ?> <?= t("(locked)") ?></a>
     <? else: ?>
-    <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= SafeString::of($child->title) ?> </a>
+    <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= html::clean($child->title) ?> </a>
     <? endif ?>
   </li>
   <? endforeach ?>
diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 90970112..d9395b3f 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -39,13 +39,13 @@
     <? foreach ($parents as $parent): ?>
     <li id="item-<?= $parent->id ?>">
       <a href="javascript:show(<?= $parent->id ?>)">
-        <?= SafeString::purify($parent->title) ?>
+        <?= html::purify($parent->title) ?>
       </a>
     </li>
     <? endforeach ?>
     <li class="active" id="item-<?= $item->id ?>">
       <a href="javascript:show(<?= $item->id ?>)">
-    	<?= SafeString::purify($item->title) ?>
+    	<?= html::purify($item->title) ?>
       </a>
     </li>
   </ul>
diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index adc0496f..e6b217c5 100644
--- a/modules/gallery/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
@@ -6,7 +6,7 @@
     <tr>
       <th> </th>
       <? foreach ($groups as $group): ?>
-      <th> <?= SafeString::of($group->name) ?> </th>
+      <th> <?= html::clean($group->name) ?> </th>
       <? endforeach ?>
     </tr>
 
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 1f185780..b136972a 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -6,7 +6,7 @@
 <!-- hack to set the title for the dialog -->
 <form id="gAddPhotosForm" action="<?= url::site("simple_uploader/finish?csrf=$csrf") ?>">
   <fieldset>
-    <legend> <?= t("Add photos to %album_title", array("album_title" => SafeString::purify($item->title))) ?> </legend>
+    <legend> <?= t("Add photos to %album_title", array("album_title" => html::purify($item->title))) ?> </legend>
   </fieldset>
 </form>
 
@@ -26,9 +26,9 @@
   </p>
   <ul class="gBreadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
-    <li> <?= SafeString::of($parent->title) ?> </li>
+    <li> <?= html::clean($parent->title) ?> </li>
     <? endforeach ?>
-    <li class="active"> <?= SafeString::purify($item->title) ?> </li>
+    <li class="active"> <?= html::purify($item->title) ?> </li>
   </ul>
 
   <p>
@@ -82,13 +82,13 @@
 
 <script type="text/javascript">
   var swfu = new SWFUpload({
-    flash_url: "<?= url::file("lib/swfupload/swfupload.swf")->for_js() ?>",
-    upload_url: "<?= url::site("simple_uploader/add_photo/$item->id")->for_js() ?>",
+    flash_url: "<?= html::escape_for_js(url::file("lib/swfupload/swfupload.swf")) ?>",
+    upload_url: "<?= html::escape_for_js(url::site("simple_uploader/add_photo/$item->id")) ?>",
     post_params: <?= json_encode(array(
       "g3sid" => Session::instance()->id(),
       "user_agent" => Input::instance()->server("HTTP_USER_AGENT"),
       "csrf" => $csrf)) ?>,
-    file_size_limit: "<?= SafeString::of(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB")->for_js() ?>",
+    file_size_limit: "<?= html::escape_for_js(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB")) ?>",
     file_types: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
     file_types_description: "<?= t("Photos and Movies")->for_js() ?>",
     file_upload_limit: 1000,
@@ -97,7 +97,7 @@
     debug: false,
 
     // Button settings
-    button_image_url: "<?= url::file("themes/default/images/select-photos-backg.png")->for_js() ?>",
+    button_image_url: "<?= html::escape_for_js(url::file("themes/default/images/select-photos-backg.png")) ?>",
     button_width: "202",
     button_height: "45",
     button_placeholder_id: "gChooseFilesButtonPlaceholder",
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index bfaaee99..d8f36984 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -2,18 +2,18 @@
 <ul class="gMetadata">
   <li>
     <strong class="caption"><?= t("Title:") ?></strong>
-    <?= SafeString::purify($item->title) ?>
+    <?= html::purify($item->title) ?>
   </li>
   <? if ($item->description): ?>
   <li>
     <strong class="caption"><?= t("Description:") ?></strong>
-     <?= nl2br(SafeString::purify($item->description)) ?>
+     <?= nl2br(html::purify($item->description)) ?>
   </li>
   <? endif ?>
   <? if (!$item->is_album()): ?>
   <li>
     <strong class="caption"><?= t("File name:") ?></strong>
-    <?= SafeString::of($item->name) ?>
+    <?= html::clean($item->name) ?>
   </li>
   <? endif ?>
   <? if ($item->captured): ?>
@@ -26,9 +26,9 @@
   <li>
     <strong class="caption"><?= t("Owner:") ?></strong>
     <? if ($item->owner->url): ?>
-    <a href="<?= $item->owner->url ?>"><?= SafeString::of($item->owner->display_name()) ?></a>
+    <a href="<?= $item->owner->url ?>"><?= html::clean($item->owner->display_name()) ?></a>
     <? else: ?>
-    <?= SafeString::of($item->owner->display_name()) ?>
+    <?= html::clean($item->owner->display_name()) ?>
     <? endif ?>
   </li>
   <? endif ?>
diff --git a/modules/notification/views/comment_published.html.php b/modules/notification/views/comment_published.html.php
index 02daf921..e39e39c6 100644
--- a/modules/notification/views/comment_published.html.php
+++ b/modules/notification/views/comment_published.html.php
@@ -1,26 +1,26 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= SafeString::of($subject) ?> </title>
+    <title><?= html::clean($subject) ?> </title>
   </head>
   <body>
-    <h2><?= SafeString::of($subject) ?></h2>
+    <h2><?= html::clean($subject) ?></h2>
     <table>
       <tr>
         <td><?= t("Comment:") ?></td>
-  <td><?= nl2br(SafeString::purify($comment->text)) ?></td>
+  <td><?= nl2br(html::purify($comment->text)) ?></td>
       </tr>
       <tr>
         <td><?= t("Author Name:") ?></td>
-        <td><?= SafeString::of($comment->author_name()) ?></td>
+        <td><?= html::clean($comment->author_name()) ?></td>
       </tr>
       <tr>
         <td><?= t("Author Email:") ?></td>
-        <td><?= SafeString::of($comment->author_email()) ?></td>
+        <td><?= html::clean($comment->author_email()) ?></td>
       </tr>
       <tr>
         <td><?= t("Author URL:") ?></td>
-        <td><?= SafeString::of($comment->author_url()) ?></td>
+        <td><?= html::clean($comment->author_url()) ?></td>
       </tr>
       <tr>
         <td><?= t("Url:") ?></td>
diff --git a/modules/notification/views/item_added.html.php b/modules/notification/views/item_added.html.php
index 70b8fca4..f697fea6 100644
--- a/modules/notification/views/item_added.html.php
+++ b/modules/notification/views/item_added.html.php
@@ -1,14 +1,14 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= SafeString::of($subject) ?> </title>
+    <title><?= html::clean($subject) ?> </title>
   </head>
   <body>
-    <h2><?= SafeString::of($subject) ?></h2>
+    <h2><?= html::clean($subject) ?></h2>
     <table>
       <tr>
         <td><?= t("Title:") ?></td>
-        <td><?= SafeString::purify($item->title) ?></td>
+        <td><?= html::purify($item->title) ?></td>
       </tr>
       <tr>
         <td><?= t("Url:") ?></td>
@@ -21,7 +21,7 @@
       <? if ($item->description): ?>
       <tr>
         <td><?= t("Description:") ?></td>
-         <td><?= nl2br(SafeString::purify($item->description)) ?></td>
+         <td><?= nl2br(html::purify($item->description)) ?></td>
       </tr>
       <? endif ?>
     </table>
diff --git a/modules/notification/views/item_deleted.html.php b/modules/notification/views/item_deleted.html.php
index e04fc71b..a51782ff 100644
--- a/modules/notification/views/item_deleted.html.php
+++ b/modules/notification/views/item_deleted.html.php
@@ -1,15 +1,15 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= SafeString::of($subject) ?> </title>
+    <title><?= html::clean($subject) ?> </title>
   </head>
   <body>
-    <h2><?= SafeString::of($subject) ?></h2>
+    <h2><?= html::clean($subject) ?></h2>
     <table>
       <tr>
         <td colspan="2">
           <?= t("To view the changed album %title use the link below.",
-              array("title" => SafeString::purify($item->parent()->title))) ?>
+              array("title" => html::purify($item->parent()->title))) ?>
         </td>
       </tr>
       <tr>
diff --git a/modules/notification/views/item_updated.html.php b/modules/notification/views/item_updated.html.php
index c3a4f795..ba03540a 100644
--- a/modules/notification/views/item_updated.html.php
+++ b/modules/notification/views/item_updated.html.php
@@ -1,18 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= SafeString::of($subject) ?> </title>
+    <title><?= html::clean($subject) ?> </title>
   </head>
   <body>
-    <h2> <?= SafeString::of($subject) ?> </h2>
+    <h2> <?= html::clean($subject) ?> </h2>
     <table>
       <tr>
         <? if ($item->original("title") != $item->title): ?>
         <td><?= t("New Title:") ?></td>
-        <td><?= SafeString::of($item->title) ?></td>
+        <td><?= html::clean($item->title) ?></td>
         <? else: ?>
         <td><?= t("Title:") ?></td>
-        <td><?= SafeString::of($item->title) ?></td>
+        <td><?= html::clean($item->title) ?></td>
         <? endif ?>
       </tr>
       <tr>
@@ -22,12 +22,12 @@
       <? if ($item->original("description") != $item->description): ?>
       <tr>
         <td><?= t("New Description:") ?></td>
-        <td><?= SafeString::of($item->description) ?></td>
+        <td><?= html::clean($item->description) ?></td>
       </tr>
       <? elseif (!empty($item->description)): ?>
       <tr>
         <td><?= t("Description:") ?></td>
-        <td><?= SafeString::of($item->description) ?></td>
+        <td><?= html::clean($item->description) ?></td>
       </tr>
       <? endif ?>
     </table>
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 27d5b508..857499aa 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -5,7 +5,7 @@
   var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
 </script>
 <div id="gOrganize" class="gDialogPanel">
-  <h1 style="display:none"><?= t("Organize %name", array("name" => SafeString::purify($album->title))) ?></h1>
+  <h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
       <div class="yui-u first">
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 387d5977..5b676889 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -5,7 +5,7 @@
   <span class="ui-icon ui-icon-minus">
   </span>
   <span class="gAlbumText" ref="<?= $parent->id ?>">
-    <?= SafeString::of($parent->title) ?>
+    <?= html::clean($parent->title) ?>
   </span>
   <ul class="ui-icon-plus">
     <? endforeach ?>
@@ -17,7 +17,7 @@
       </span>
       <span class="gAlbumText <?= $peer->id == $album->id ? "selected" : "" ?>"
             ref="<?= $peer->id ?>">
-        <?= SafeString::of($peer->title) ?>
+        <?= html::clean($peer->title) ?>
       </span>
 
       <? if ($peer->id == $album->id): ?>
@@ -29,7 +29,7 @@
           </span>
           <span class="gAlbumText"
                 ref="<?= $child->id ?>">
-            <?= SafeString::of($child->title) ?>
+            <?= html::clean($child->title) ?>
           </span>
         </li>
         <? endforeach ?>
diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php
index 7298b7f4..731703c7 100644
--- a/modules/rss/views/feed.mrss.php
+++ b/modules/rss/views/feed.mrss.php
@@ -6,9 +6,9 @@
    xmlns:fh="http://purl.org/syndication/history/1.0">
   <channel>
     <generator>gallery3</generator>
-    <title><?= SafeString::of($feed->title) ?></title>
+    <title><?= html::clean($feed->title) ?></title>
     <link><?= $feed->uri ?></link>
-    <description><?= SafeString::of($feed->description) ?></description>
+    <description><?= html::clean($feed->description) ?></description>
     <language>en-us</language>
     <atom:link rel="self" href="<?= $feed->uri ?>" type="application/rss+xml" />
     <fh:complete/>
@@ -22,25 +22,25 @@
     <lastBuildDate><?= $pub_date ?></lastBuildDate>
     <? foreach ($feed->children as $child): ?>
     <item>
-      <title><?= SafeString::of($child->title) ?></title>
+      <title><?= html::clean($child->title) ?></title>
       <link><?= url::abs_site("{$child->type}s/{$child->id}") ?></link>
       <guid isPermaLink="true"><?= url::abs_site("{$child->type}s/{$child->id}") ?></guid>
       <pubDate><?= date("D, d M Y H:i:s T", $child->created); ?></pubDate>
       <content:encoded>
         <![CDATA[
-          <span><?= SafeString::of($child->description) ?></span>
+          <span><?= html::clean($child->description) ?></span>
           <p>
           <? if ($child->type == "photo" || $child->type == "album"): ?>
             <img alt="" src="<?= $child->resize_url(true) ?>"
-                 title="<?= SafeString::of($child->title) ?>"
+                 title="<?= html::clean($child->title) ?>"
                  height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" /><br />
           <? else: ?>
             <a href="<?= url::abs_site("{$child->type}s/{$child->id}") ?>">
             <img alt="" src="<?= $child->thumb_url(true) ?>"
-                 title="<?= SafeString::of($child->title) ?>"
+                 title="<?= html::clean($child->title) ?>"
                  height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" /></a><br />
           <? endif ?>
-            <?= SafeString::of($child->description) ?>
+            <?= html::clean($child->description) ?>
           </p>
         ]]>
       </content:encoded>
diff --git a/modules/rss/views/rss_block.html.php b/modules/rss/views/rss_block.html.php
index cd8db89d..737731b6 100644
--- a/modules/rss/views/rss_block.html.php
+++ b/modules/rss/views/rss_block.html.php
@@ -5,7 +5,7 @@
     <span class="ui-icon-left">
     <a href="<?= rss::url($url) ?>">
       <span class="ui-icon ui-icon-signal-diag"></span>
-      <?= SafeString::purify($title) ?>
+      <?= html::purify($title) ?>
     </a>
     </span>
   </li>
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index e5c7b4a6..7963948d 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -8,7 +8,7 @@
     <ul>
       <li>
         <label for="q"><?= t("Search the gallery") ?></label>
-        <input name="q" id="q" type="text" value="<?= SafeString::of($q)->for_html_attr() ?>"/>
+        <input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>"/>
       </li>
       <li>
         <input type="submit" value="<?= t("Search")->for_html_attr() ?>" />
@@ -31,10 +31,10 @@
       <a href="<?= url::site("items/$item->id") ?>">
         <?= $item->thumb_img() ?>
         <p>
-    <?= SafeString::purify($item->title) ?>
+    <?= html::purify($item->title) ?>
         </p>
         <div>
-    <?= nl2br(SafeString::purify($item->description)) ?>
+    <?= nl2br(html::purify($item->description)) ?>
         </div>
       </a>
     </li>
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index c4439bda..b48a19da 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -16,7 +16,7 @@
            class="gRemoveDir ui-icon ui-icon-trash">
           X
         </a>
-        <?= SafeString::of($path) ?>
+        <?= html::clean($path) ?>
       </li>
       <? endforeach ?>
     </ul>
diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index 2f65a590..dbae42c5 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -10,7 +10,7 @@
     <li class="ui-icon-left">
       <span class="ui-icon ui-icon-folder-open"></span>
       <span ondblclick="open_dir('<?= $dir ?>')">
-        <?= SafeString::of(basename($dir)) ?>
+        <?= html::clean(basename($dir)) ?>
       </span>
       <ul>
         <? endforeach ?>
@@ -24,7 +24,7 @@
                 <? endif ?>
                 file="<?= strtr($file, array('"' => '\\"')) ?>"
                 >
-            <?= SafeString::of(basename($file)) ?>
+            <?= html::clean(basename($file)) ?>
           </span>
         </li>
         <? endforeach ?>
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 912e69b6..8eb6e4df 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -5,17 +5,17 @@
 </script>
 
 <div id="gServerAdd">
-  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => SafeString::purify($item->title))) ?></h1>
+  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => html::purify($item->title))) ?></h1>
 
   <p id="gDescription"><?= t("Photos will be added to album:") ?></p>
   <ul class="gBreadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
     <li>
-      <?= SafeString::purify($parent->title) ?>
+      <?= html::purify($parent->title) ?>
     </li>
     <? endforeach ?>
     <li class="active">
-      <?= SafeString::purify($item->title) ?>
+      <?= html::purify($item->title) ?>
     </li>
   </ul>
 
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index f1b4ca3a..8b8dde21 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -106,7 +106,7 @@ class Admin_Tags_Controller extends Admin_Controller {
         array("result" => "success",
               "location" => url::site("admin/tags"),
               "tag_id" => $tag->id,
-              "new_tagname" => SafeString::of($tag->name)));
+              "new_tagname" => html::clean($tag->name)));
     } else {
       print json_encode(
         array("result" => "error",
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 30dd0728..3d805c5e 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -32,7 +32,7 @@
           <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?>
 
           <? if ($i == 0): /* first letter */ ?>
-            <strong><?= SafeString::of($current_letter) ?></strong>
+            <strong><?= html::clean($current_letter) ?></strong>
             <ul>
           <? elseif ($last_letter != $current_letter): /* new letter */ ?>
             <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
@@ -42,12 +42,12 @@
             <? endif ?>
 
             </ul>
-            <strong><?= SafeString::of($current_letter) ?></strong>
+            <strong><?= html::clean($current_letter) ?></strong>
             <ul>
           <? endif ?>
 
           <li>
-            <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= SafeString::of($tag->name) ?></span>
+            <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= html::clean($tag->name) ?></span>
             <span class="understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
                class="gDialogLink delete-link gButtonLink">
diff --git a/modules/tag/views/tag_cloud.html.php b/modules/tag/views/tag_cloud.html.php
index b4c6ae34..d6a0b5f8 100644
--- a/modules/tag/views/tag_cloud.html.php
+++ b/modules/tag/views/tag_cloud.html.php
@@ -3,7 +3,7 @@
   <? foreach ($tags as $tag): ?>
   <li class="size<?=(int)(($tag->count / $max_count) * 7) ?>">
     <span><?= $tag->count ?> photos are tagged with </span>
-    <a href="<?= url::site("tags/$tag->id") ?>"><?= SafeString::of($tag->name) ?></a>
+    <a href="<?= url::site("tags/$tag->id") ?>"><?= html::clean($tag->name) ?></a>
   </li>
   <? endforeach ?>
 </ul>
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 4b141a1c..fc3ced56 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -24,7 +24,7 @@ class Logout_Controller extends Controller {
     $user = user::active();
     user::logout();
     log::info("user", t("User %name logged out", array("name" => $user->name)),
-              html::anchor("user/$user->id", SafeString::of($user->name)));
+              html::anchor("user/$user->id", html::clean($user->name)));
     if ($continue_url = $this->input->get("continue")) {
       $item = url::get_item_from_uri($continue_url);
       if (access::can("view", $item)) {
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 36c4f4fd..9455f9d9 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -68,16 +68,16 @@
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member") ?>"
-               alt="<?= SafeString::of($user->name) ?>"
+               alt="<?= html::clean($user->name) ?>"
                width="20"
                height="20" />
-          <?= SafeString::of($user->name) ?>
+          <?= html::clean($user->name) ?>
         </td>
         <td>
-          <?= SafeString::of($user->full_name) ?>
+          <?= html::clean($user->full_name) ?>
         </td>
         <td>
-          <?= SafeString::of($user->email) ?>
+          <?= html::clean($user->email) ?>
         </td>
         <td>
           <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index f89a4392..8418ebc9 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <h4>
-  <?= SafeString::of($group->name) ?>
+  <?= html::clean($group->name) ?>
   <? if (!$group->special): ?>
   <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
     title="<?= t("Delete the %name group", array("name" => $group->name)) ?>"
@@ -17,7 +17,7 @@
 <ul>
   <? foreach ($group->users as $i => $user): ?>
   <li class="gUser">
-    <?= SafeString::of($user->name) ?>
+    <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
        class="gButtonLink ui-state-default ui-corner-all ui-icon-left"
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index e92513e7..85f673ce 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -12,7 +12,7 @@
       '<a href="' . url::site("form/edit/users/{$user->id}") .
       '" title="' . t("Edit Your Profile")->for_html_attr() .
       '" id="gUserProfileLink" class="gDialogLink">' .
-      SafeString::of($user->display_name()) . '</a>'))) ?>
+      html::clean($user->display_name()) . '</a>'))) ?>
   </li>
   <li>
     <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 8c690f5f..caabeee3 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -2,8 +2,8 @@
 <? // @todo Set hover on AlbumGrid list items for guest users ?>
 <div id="gInfo">
   <?= $theme->album_top() ?>
-  <h1><?= SafeString::purify($item->title) ?></h1>
-  <div class="gDescription"><?= nl2br(SafeString::purify($item->description)) ?></div>
+  <h1><?= html::purify($item->title) ?></h1>
+  <div class="gDescription"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
 <ul id="gAlbumGrid">
@@ -20,7 +20,7 @@
     </a>
     <?= $theme->thumb_bottom($child) ?>
     <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
-    <h2><span></span><a href="<?= $child->url() ?>"><?= SafeString::of($child->title) ?></a></h2>
+    <h2><span></span><a href="<?= $child->url() ?>"><?= html::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
diff --git a/themes/default/views/dynamic.html.php b/themes/default/views/dynamic.html.php
index 2d8e04a2..9ed9d69b 100644
--- a/themes/default/views/dynamic.html.php
+++ b/themes/default/views/dynamic.html.php
@@ -3,7 +3,7 @@
   <div id="gAlbumHeaderButtons">
     <?= $theme->dynamic_top() ?>
   </div>
-  <h1><?= SafeString::of($title) ?></h1>
+  <h1><?= html::clean($title) ?></h1>
 </div>
 
 <ul id="gAlbumGrid">
@@ -16,7 +16,7 @@
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
     </a>
-    <h2><?= SafeString::purify($child->title) ?></h2>
+    <h2><?= html::purify($child->title) ?></h2>
     <?= $theme->thumb_bottom($child) ?>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 9e34401d..dcfa6fd8 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -19,10 +19,10 @@
   <? foreach ($parents as $parent): ?>
   <li>
     <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
-      <?= SafeString::purify($parent->title) ?>
+      <?= html::purify($parent->title) ?>
     </a>
   </li>
   <? endforeach ?>
-  <li class="active"><?= SafeString::purify($item->title) ?></li>
+  <li class="active"><?= html::purify($item->title) ?></li>
 </ul>
 <? endif ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 237743b7..910814dd 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -28,8 +28,8 @@
   <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
 
   <div id="gInfo">
-    <h1><?= SafeString::purify($item->title) ?></h1>
-       <div><?= nl2br(SafeString::purify($item->description)) ?></div>
+    <h1><?= html::purify($item->title) ?></h1>
+       <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
 
   <?= $theme->photo_bottom() ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 5b5cb12b..c601c4cc 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      $.gallery_show_full_size("<?= $theme->item()->file_url()->for_js() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size("<?= html::escape_for_js($theme->item()->file_url()) ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });
@@ -51,8 +51,8 @@
   </div>
 
   <div id="gInfo">
-    <h1><?= SafeString::purify($item->title) ?></h1>
-    <div><?= nl2br(SafeString::purify($item->description)) ?></div>
+    <h1><?= html::purify($item->title) ?></h1>
+    <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
 
   <?= $theme->photo_bottom() ?>
-- 
cgit v1.2.3


From d1ade6620e814ecf536dfde17c95593a311d1c2c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 14:35:27 -0700
Subject: Precalculate the organize tree based on the selected album and render
 it right away while still allowing incremental tree loading.

---
 modules/organize/controllers/organize.php     | 17 ++++++++++++-----
 modules/organize/views/organize_tree.html.php |  9 ++++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 3cbcfb28..24e5bf97 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -25,7 +25,7 @@ class Organize_Controller extends Controller {
 
     $v = new View("organize_dialog.html");
     $v->album = $album;
-    $v->album_tree = self::_tree(ORM::factory("item", 1));
+    $v->album_tree = self::_expanded_tree(ORM::factory("item", 1), $album);
     $v->micro_thumb_grid = self::_get_micro_thumb_grid($album, 0);
     print $v;
   }
@@ -50,7 +50,7 @@ class Organize_Controller extends Controller {
     }
 
     print json_encode(
-      array("tree" => self::_tree(ORM::factory("item", 1))->__toString(),
+      array("tree" => self::_expanded_tree(ORM::factory("item", 1), $album)->__toString(),
             "grid" => self::_get_micro_thumb_grid($album, 0)->__toString()));
   }
 
@@ -135,12 +135,19 @@ class Organize_Controller extends Controller {
   public function tree($album_id) {
     $album = ORM::factory("item", $album_id);
     access::required("view", $album);
-    print self::_tree($album);
+
+    print self::_expanded_tree($album, $album);
   }
 
-  private static function _tree($album) {
+  /**
+   * Create an HTML representation of the tree from the root down to the selected album.  We only
+   * include albums along the descendant hierarchy that includes the selected album, and the
+   * immediate child albums.
+   */
+  private static function _expanded_tree($root, $selected_album) {
     $v = new View("organize_tree.html");
-    $v->album = $album;
+    $v->album = $root;
+    $v->selected = $selected_album;
     return $v;
   }
 }
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 4677234c..a99d2337 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -3,11 +3,17 @@
     ref="<?= $album->id ?>">
   <span class="ui-icon ui-icon-minus">
   </span>
-  <span class="gAlbumText" ref="<?= $album->id ?>">
+  <span class="gAlbumText
+               <?= $album->id == $selected->id ? "selected" : "" ?>
+               "
+        ref="<?= $album->id ?>">
     <?= p::clean($album->title) ?>
   </span>
   <ul>
     <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
+    <? if ($child->is_descendant($selected)): ?>
+    <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
+    <? else: ?>
     <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
         ref="<?= $child->id ?>">
       <span class="ui-icon ui-icon-plus">
@@ -16,6 +22,7 @@
         <?= p::clean($child->title) ?>
       </span>
     </li>
+    <? endif ?>
     <? endforeach ?>
   </ul>
 </li>
-- 
cgit v1.2.3


From c615918829fae1496a09886ef929869fce9b9f6a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 14:40:55 -0700
Subject: Manage the selection so we don't automatically select an album
 whenever we expand a tree.

---
 modules/organize/controllers/organize.php     | 4 ++--
 modules/organize/views/organize_tree.html.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 24e5bf97..22f106e9 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -136,7 +136,7 @@ class Organize_Controller extends Controller {
     $album = ORM::factory("item", $album_id);
     access::required("view", $album);
 
-    print self::_expanded_tree($album, $album);
+    print self::_expanded_tree($album);
   }
 
   /**
@@ -144,7 +144,7 @@ class Organize_Controller extends Controller {
    * include albums along the descendant hierarchy that includes the selected album, and the
    * immediate child albums.
    */
-  private static function _expanded_tree($root, $selected_album) {
+  private static function _expanded_tree($root, $selected_album=null) {
     $v = new View("organize_tree.html");
     $v->album = $root;
     $v->selected = $selected_album;
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index a99d2337..59f683ef 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -4,14 +4,14 @@
   <span class="ui-icon ui-icon-minus">
   </span>
   <span class="gAlbumText
-               <?= $album->id == $selected->id ? "selected" : "" ?>
+               <?= $selected && $album->id == $selected->id ? "selected" : "" ?>
                "
         ref="<?= $album->id ?>">
     <?= p::clean($album->title) ?>
   </span>
   <ul>
     <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
-    <? if ($child->is_descendant($selected)): ?>
+    <? if ($selected && $child->is_descendant($selected)): ?>
     <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
     <? else: ?>
     <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
-- 
cgit v1.2.3


From 5cce88cd040fe33ee0f7037e0b045792d60ed9d8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 14:50:53 -0700
Subject: Rename gAlbumText to gOrganizeAlbumText for consistency since this is
 an organize-only construct.

---
 modules/organize/css/organize.css             | 4 ++--
 modules/organize/js/organize.js               | 4 ++--
 modules/organize/views/organize_tree.html.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index cbd1e138..3a8a6412 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -47,7 +47,7 @@
   padding-left: 1.2em;
 }
 
-.gAlbumText:hover {
+.gOrganizeAlbumText:hover {
   border: 1px dashed #999;
   padding: 1px;
 }
@@ -63,7 +63,7 @@
   cursor: pointer;
 }
 
-.gAlbumText {
+.gOrganizeAlbumText {
   cursor: pointer;
   width: auto;
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 3dbd0c89..ad14a99e 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -158,7 +158,7 @@
       $(".gMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
       $(".gMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
       $(".gOrganizeAlbum").droppable($.organize.branch_droppable);
-      $(".gAlbumText").click($.organize.show_album);
+      $(".gOrganizeAlbumText").click($.organize.show_album);
       $("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch);
     },
 
@@ -203,7 +203,7 @@
       $("#gMicroThumbPanel").selectable("destroy");
       var id = $(event.currentTarget).attr("ref");
       $("#gOrganizeAlbumTree .selected").removeClass("selected");
-      $(".gAlbumText[ref=" + id + "]").addClass("selected");
+      $(".gOrganizeAlbumText[ref=" + id + "]").addClass("selected");
       var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
       $.get(url, {},
 	    function(data) {
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 59f683ef..58621c3c 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -3,7 +3,7 @@
     ref="<?= $album->id ?>">
   <span class="ui-icon ui-icon-minus">
   </span>
-  <span class="gAlbumText
+  <span class="gOrganizeAlbumText
                <?= $selected && $album->id == $selected->id ? "selected" : "" ?>
                "
         ref="<?= $album->id ?>">
@@ -18,7 +18,7 @@
         ref="<?= $child->id ?>">
       <span class="ui-icon ui-icon-plus">
       </span>
-      <span class="gAlbumText" ref="<?= $child->id ?>">
+      <span class="gOrganizeAlbumText" ref="<?= $child->id ?>">
         <?= p::clean($child->title) ?>
       </span>
     </li>
-- 
cgit v1.2.3


From 53390ba79a78eab54d2c4fe8f00b79f3b3fc5648 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 14:58:26 -0700
Subject: CSS rename: gMicroThumbXxx -> gOrganizeMicroThumbXxx to make it clear
 that this is organize only.

---
 modules/organize/css/organize.css                  | 14 ++++----
 modules/organize/js/organize.js                    | 38 +++++++++++-----------
 modules/organize/views/organize_dialog.html.php    |  4 +--
 .../organize/views/organize_thumb_grid.html.php    |  8 ++---
 4 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 3a8a6412..4a65d20e 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -70,7 +70,7 @@
 /*******************************************************************
  * Album Panel Styles
  */
-#gMicroThumbPanel {
+#gOrganizeMicroThumbPanel {
   margin: 0 !important;
   padding: 0 !important;
   background-color: #cfdeff;
@@ -81,11 +81,11 @@
   overflow-y: auto;
 }
 
-#gMicroThumbGrid {
+#gOrganizeMicroThumbGrid {
   padding: 1em;
 }
 
-.gMicroThumbGridCell {
+.gOrganizeMicroThumbGridCell {
   float: left;
   font-size: 0.8em;
   padding: .5em !important;
@@ -94,14 +94,14 @@
   border-right: 1px hidden #13A;
 }
 
-.gMicroThumb {
+.gOrganizeMicroThumb {
   display: block;
   height: 9em;
   text-align: center;
   width: 9em;
 }
 
-.gMicroThumbGridCell.ui-state-selected {
+.gOrganizeMicroThumbGridCell.ui-state-selected {
   opacity: 1;
 }
 
@@ -114,11 +114,11 @@
   padding: .5em;
 }
 
-#gMicroThumbPanel #gMicroThumbGrid .gAlbum {
+#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid .gAlbum {
   background-color: #e8e8e8;
 }
 
-#gMicroThumbPanel #gMicroThumbGrid :hover {
+#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid :hover {
   opacity: 1;
 }
 
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index ad14a99e..edafae61 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -4,7 +4,7 @@
       handle: ".ui-state-selected",
       distance: 10,
       cursorAt: { left: -10, top: -10},
-      appendTo: "#gMicroThumbPanel",
+      appendTo: "#gOrganizeMicroThumbPanel",
       helper: function(event, ui) {
         var selected = $(".ui-draggable.ui-state-selected img");
         if (selected.length) {
@@ -37,16 +37,16 @@
       },
 
       start: function(event, ui) {
-        $("#gMicroThumbPanel .ui-state-selected").hide();
+        $("#gOrganizeMicroThumbPanel .ui-state-selected").hide();
       },
 
       drag: function(event, ui) {
-        var top = $("#gMicroThumbPanel").offset().top;
-        var height = $("#gMicroThumbPanel").height();
+        var top = $("#gOrganizeMicroThumbPanel").offset().top;
+        var height = $("#gOrganizeMicroThumbPanel").height();
         if (ui.offset.top > height + top - 20) {
-          $("#gMicroThumbPanel").get(0).scrollTop += 100;
+          $("#gOrganizeMicroThumbPanel").get(0).scrollTop += 100;
         } else if (ui.offset.top < top + 20) {
-          $("#gMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gMicroThumbPanel").get(0).scrollTop - 100);
+          $("#gOrganizeMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gOrganizeMicroThumbPanel").get(0).scrollTop - 100);
         }
       }
     },
@@ -74,7 +74,7 @@
       drop: function(event, ui) {
         if ($(event.target).hasClass("gViewOnly")) {
           $(".ui-state-selected").show();
-          $(".gMicroThumbGridCell").css("borderStyle", "none");
+          $(".gOrganizeMicroThumbGridCell").css("borderStyle", "none");
         } else {
           $.organize.do_drop({
             url: move_url.replace("__ALBUM_ID__", $(event.target).attr("ref")),
@@ -85,7 +85,7 @@
     },
 
     do_drop: function(options) {
-      $("#gMicroThumbPanel").selectable("destroy");
+      $("#gOrganizeMicroThumbPanel").selectable("destroy");
       var source_ids = [];
       $(options.source).each(function(i) {
         source_ids.push($(this).attr("ref"));
@@ -104,7 +104,7 @@
         $("#gOrganizeAlbumTree").html(data.tree);
       }
       if (data.grid) {
-        $("#gMicroThumbGrid").html(data.grid);
+        $("#gOrganizeMicroThumbGrid").html(data.grid);
         $("#gOrganizeSortColumn").attr("value", data.sort_column);
         $("#gOrganizeSortOrder").attr("value", data.sort_order);
       }
@@ -113,7 +113,7 @@
 
     mouse_move_handler: function(event) {
       if ($(".gDragHelper").length) {
-        $(".gMicroThumbGridCell").css("borderStyle", "hidden");
+        $(".gOrganizeMicroThumbGridCell").css("borderStyle", "hidden");
         $(".currentDropTarget").removeClass("currentDropTarget");
         var borderStyle = event.pageX < $(this).offset().left + $(this).width() / 2 ?
           "borderLeftStyle" : "borderRightStyle";
@@ -132,7 +132,7 @@
       $("#gDialog").dialog("option", "zIndex", 70);
       $("#gDialog").bind("dialogopen", function(event, ui) {
         $("#gOrganize").height($("#gDialog").innerHeight() - 20);
-        $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
+        $("#gOrganizeMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
         $("#gOrganizeAlbumTree").height($("#gDialog").innerHeight() - 59);
       });
 
@@ -152,11 +152,11 @@
     },
 
     set_handlers: function() {
-      $("#gMicroThumbPanel").selectable({filter: ".gMicroThumbGridCell"});
-      $("#gMicroThumbPanel").droppable($.organize.content_droppable);
+      $("#gOrganizeMicroThumbPanel").selectable({filter: ".gOrganizeMicroThumbGridCell"});
+      $("#gOrganizeMicroThumbPanel").droppable($.organize.content_droppable);
 
-      $(".gMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
-      $(".gMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
+      $(".gOrganizeMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
+      $(".gOrganizeMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
       $(".gOrganizeAlbum").droppable($.organize.branch_droppable);
       $(".gOrganizeAlbumText").click($.organize.show_album);
       $("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch);
@@ -200,14 +200,14 @@
       if ($(parent).hasClass("gViewOnly")) {
         return;
       }
-      $("#gMicroThumbPanel").selectable("destroy");
+      $("#gOrganizeMicroThumbPanel").selectable("destroy");
       var id = $(event.currentTarget).attr("ref");
       $("#gOrganizeAlbumTree .selected").removeClass("selected");
       $(".gOrganizeAlbumText[ref=" + id + "]").addClass("selected");
-      var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
+      var url = $("#gOrganizeMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
       $.get(url, {},
 	    function(data) {
-	      $("#gMicroThumbGrid").html(data.grid);
+	      $("#gOrganizeMicroThumbGrid").html(data.grid);
 	      $("#gOrganizeSortColumn").attr("value", data.sort_column);
               $("#gOrganizeSortOrder").attr("value", data.sort_order);
               $.organize.set_handlers();
@@ -225,7 +225,7 @@
         .replace("__DIR__", dir);
       $.get(url, {},
 	    function(data) {
-	      $("#gMicroThumbGrid").html(data.grid);
+	      $("#gOrganizeMicroThumbGrid").html(data.grid);
               $("#gOrganizeSortColumn").attr("value", data.sort_column);
               $("#gOrganizeSortOrder").attr("value", data.sort_order);
 	      $.organize.set_handlers();
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index d4196460..54f21178 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -23,9 +23,9 @@
         </ul>
       </div>
       <div id="gOrganizeDetail" class="yui-u">
-        <div id="gMicroThumbPanel"
+        <div id="gOrganizeMicroThumbPanel"
              ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
-          <ul id="gMicroThumbGrid">
+          <ul id="gOrganizeMicroThumbGrid">
             <?= $micro_thumb_grid ?>
           </ul>
         </div>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 31dc9af5..929d9ec3 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,8 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($album->children(25, $offset) as $child): ?>
-<li class="gMicroThumbGridCell" ref="<?= $child->id ?>">
-  <div id="gMicroThumb_<?= $child->id ?>"
-       class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
+<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>
@@ -13,7 +13,7 @@
   setTimeout(function() {
     $.get("<?= url::site("organize/content/$album->id/" . ($offset + 25)) ?>",
       function(data) {
-        $("#gMicroThumbGrid").append(data);
+        $("#gOrganizeMicroThumbGrid").append(data);
         $.organize.set_handlers();
       }
     );
-- 
cgit v1.2.3


From 2cf52a4718299cb038912a97c81e13e9e614a7fb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 15:54:56 -0700
Subject: Tighten up a class attr.

---
 modules/organize/views/organize_tree.html.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 58621c3c..41f5b558 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -3,9 +3,7 @@
     ref="<?= $album->id ?>">
   <span class="ui-icon ui-icon-minus">
   </span>
-  <span class="gOrganizeAlbumText
-               <?= $selected && $album->id == $selected->id ? "selected" : "" ?>
-               "
+  <span class="gOrganizeAlbumText <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
         ref="<?= $album->id ?>">
     <?= p::clean($album->title) ?>
   </span>
-- 
cgit v1.2.3


From ab7323d17b3c3e445fb51d7b4330e89b4e16aaa9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 4 Sep 2009 21:27:23 -0700
Subject: Fix the url in the call to get subsequent entries to have the right
 url, and to be json.  Fixes #719, which I introduced in my refactor.

---
 modules/organize/views/organize_thumb_grid.html.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 929d9ec3..af7136fc 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -11,12 +11,13 @@
 <? if ($album->children_count() > $offset): ?>
 <script>
   setTimeout(function() {
-    $.get("<?= url::site("organize/content/$album->id/" . ($offset + 25)) ?>",
-      function(data) {
-        $("#gOrganizeMicroThumbGrid").append(data);
-        $.organize.set_handlers();
-      }
-    );
+    $.get("<?= url::site("organize/album/$album->id/" . ($offset + 25)) ?>",
+          {},
+          function(data) {
+            $("#gOrganizeMicroThumbGrid").append(data.grid);
+            $.organize.set_handlers();
+          },
+          "json");
   }, 50);
 </script>
 <? endif ?>
-- 
cgit v1.2.3


From 752c85711659eb7f83e6556665175266db8f24f5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 10 Sep 2009 10:28:43 -0700
Subject: Rename ORM_MPTT::is_descendant() to ORM_MPTT::contains() to make the
 API a little clearer.  Write a test for it, too.

---
 modules/gallery/libraries/ORM_MPTT.php        |  4 ++--
 modules/gallery/tests/ORM_MPTT_Test.php       | 13 +++++++++++++
 modules/gallery/views/move_tree.html.php      |  4 ++--
 modules/organize/controllers/organize.php     |  2 +-
 modules/organize/views/organize_tree.html.php |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 9b3e1f2b..83d2445c 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -110,7 +110,7 @@ class ORM_MPTT_Core extends ORM {
    * @param ORM $target
    * @return boolean
    */
-  function is_descendant($target) {
+  function contains($target) {
     return ($this->left_ptr <= $target->left_ptr && $this->right_ptr >= $target->right_ptr);
   }
 
@@ -212,7 +212,7 @@ class ORM_MPTT_Core extends ORM {
    * @return  ORM_MTPP
    */
   function move_to($target) {
-    if ($this->is_descendant($target)) {
+    if ($this->contains($target)) {
       throw new Exception("@todo INVALID_TARGET can't move item inside itself");
     }
 
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index f77f1f34..a749542b 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -97,6 +97,19 @@ class ORM_MPTT_Test extends Unit_Test_Case {
       $album1_2->children()->select_list());
   }
 
+  public function cant_move_parent_into_own_subtree_test() {
+    $album1 = album::create(item::root(), "move_to_test", "move_to_test");
+    $album2 = album::create($album1, "move_to_test", "move_to_test");
+    $album3 = album::create($album2, "move_to_test", "move_to_test");
+
+    try {
+      $album1->move_to($album3);
+      $self->assert_true(false, "We should be unable to move an item inside its own hierarchy");
+    } catch (Exception $e) {
+      // pass
+    }
+  }
+
   public function parent_test() {
     $root = ORM::factory("item", 1);
     $album = self::create_item_and_add_to_parent($root);
diff --git a/modules/gallery/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
index 623f80ee..e629e1bb 100644
--- a/modules/gallery/views/move_tree.html.php
+++ b/modules/gallery/views/move_tree.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $parent->thumb_img(array(), 25); ?>
-<? if (!access::can("edit", $parent) || $source->is_descendant($parent)): ?>
+<? if (!access::can("edit", $parent) || $source->contains($parent)): ?>
 <a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= html::clean($parent->title) ?> <?= t("(locked)") ?> </a>
 <? else: ?>
 <a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= html::clean($parent->title) ?></a>
@@ -9,7 +9,7 @@
   <? foreach ($children as $child): ?>
   <li id="node_<?= $child->id ?>" class="node">
     <?= $child->thumb_img(array(), 25); ?>
-    <? if (!access::can("edit", $child) || $source->is_descendant($child)): ?>
+    <? if (!access::can("edit", $child) || $source->contains($child)): ?>
     <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= html::clean($child->title) ?> <?= t("(locked)") ?></a>
     <? else: ?>
     <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= html::clean($child->title) ?> </a>
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 1fec6c9b..4639777c 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -47,7 +47,7 @@ class Organize_Controller extends Controller {
     $target_album = ORM::factory("item", $target_album_id);
     foreach ($this->input->post("source_ids") as $source_id) {
       $source = ORM::factory("item", $source_id);
-      if (!$source->is_descendant($target_album_)) {
+      if (!$source->contains($target_album)) {
         item::move($source, $target_album);
       }
     }
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index c0c23f94..e5d91c04 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -9,7 +9,7 @@
   </span>
   <ul>
     <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
-    <? if ($selected && $child->is_descendant($selected)): ?>
+    <? if ($selected && $child->contains($selected)): ?>
     <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
     <? else: ?>
     <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
-- 
cgit v1.2.3