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/css/organize.css | 184 +++++++-------------------------------
 1 file changed, 33 insertions(+), 151 deletions(-)

(limited to 'modules/organize/css')

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;
-}
-- 
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/css')

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/css')

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/css')

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/css')

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/css')

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 a03f8b1003093b385e9c839c1e5e2e4f80f0cd0b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 16:45:44 -0700
Subject: Fix up formatting of items in thumbgrid

---
 modules/organize/css/organize.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 7c2d9c5b..0a23a6bf 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -83,6 +83,7 @@
 }
 
 #gMicroThumbGrid {
+  padding: .5em;
 }
 
 .gMicroThumbContainer {
@@ -93,7 +94,7 @@
 .gMicroThumb {
   display: block;
   float: left;
-//  font-size: .7em;
+  font-size: .8em;
   height: 9em;
   margin-bottom: 1em;
   margin-left: 1em;
@@ -101,6 +102,10 @@
   width: 9em;
 }
 
+.gThumbnail {
+  padding: .5em;
+}
+
 #gMicroThumbPanel #gMicroThumbGrid .gAlbum {
   background-color: #e8e8e8;
 }
-- 
cgit v1.2.3


From 93c0dffab3ba3631c9ebf4693571bd38e5613d1c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 6 Aug 2009 09:46:39 -0700
Subject: Remove the complicated calculation to determine the height of the
 micro thumb grid, by setting all the parent elements to 100% in the css and
 then subtract the height of the button bar

---
 modules/organize/css/organize.css | 11 +++++++++-
 modules/organize/js/organize.js   | 43 ++++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 0a23a6bf..56ecc309 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -7,6 +7,11 @@
 
 #gOrganize {
   overflow: hidden;
+  height: 100%;
+}
+
+#gOrganize #bd {
+  height: 100%;
 }
 
 #gOrganize .yui-u {
@@ -22,16 +27,20 @@
   width: 75%;
 }
 
+#gOrganizeDetail {
+  height: 100%;
+}
+
 #gMessage .gInfo {
   font-weight: bold;
   padding-left: 2em;
 }
 
-
 /*******************************************************************
  * Album Tree styling
  */
 #gOrganizeTreeContainer {
+  height: 100%;
   overflow: auto;
   margin: 0 !important;
   padding: 0 !important;
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 89549954..6a65bfa2 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,54 +1,45 @@
 (function($) {
-  $.fn.organize = function(options) {
+  $.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
-    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);
+        $("#gOrganizeDialog").dialog({
+          autoOpen: false,
+          modal: true,
+          resizable: false,
+          width: width,
+          height: height,
+          position: "center",
+          close: function () {
+            $("#gOrganizeDialog").trigger("organize_close");
+            $("#gOrganizeDialog").dialog("destroy").remove();
+          },
+          zIndex: 75
+        });
         $.get(href, _init);
         return false;
       });
     });
   };
 
-  $.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 _init(data) {
-    // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475
+    // 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 heightMicroThumbPanel = $("#gOrganizeDialog").innerHeight();
-    heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom"));
-    heightMicroThumbPanel = Math.floor(heightMicroThumbPanel - 10 - $("#gMessage").outerHeight());
-    $("#gOrganizeTreeContainer").height(heightMicroThumbPanel);
-
-    heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight();
-    $("#gMicroThumbPanel").height(heightMicroThumbPanel);
+    var height = $("#gOrganizeDetail").innerHeight();
+    $("#gMicroThumbPanel").height(height - $("#gOrganizeEditDrawerHandle").outerHeight());
 
     if ($("#gOrganizeDialog h1").length) {
       $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog h1:eq(0)").html());
-- 
cgit v1.2.3


From 685b1ddf88c8dd7c055c1fb2571060ad1e4f4530 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 7 Aug 2009 21:40:35 -0700
Subject: Enhance how the organize dialog degrades if the browser window is not
 optimal

---
 modules/organize/css/organize.css | 2 +-
 modules/organize/js/organize.js   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 56ecc309..d33dac0d 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -7,7 +7,6 @@
 
 #gOrganize {
   overflow: hidden;
-  height: 100%;
 }
 
 #gOrganize #bd {
@@ -25,6 +24,7 @@
 #gOrganize .yui-gf #gMessage {
   margin-bottom: .4em;
   width: 75%;
+  white-space: nowrap;
 }
 
 #gOrganizeDetail {
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 853e3eef..03d81a98 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -8,6 +8,7 @@
       $(".sf-menu li.sfHover ul").css("z-index", 70);
 
       $("#gDialog").bind("dialogopen", function(event, ui) {
+        $("#gOrganize").height($("#gDialog").innerHeight() - 20);
         $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
       });
 
-- 
cgit v1.2.3


From 39d0098038b828c3cf5d63caa06f1b6d57904f32 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 9 Aug 2009 09:00:10 -0700
Subject: Enable microthumbnail selection

---
 modules/organize/css/organize.css | 11 ++++++-----
 modules/organize/js/organize.js   |  6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index d33dac0d..a4b5fdbd 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -95,11 +95,6 @@
   padding: .5em;
 }
 
-.gMicroThumbContainer {
-//  padding: 0 .5em;
-//  opacity: .4;
-}
-
 .gMicroThumb {
   display: block;
   float: left;
@@ -107,10 +102,16 @@
   height: 9em;
   margin-bottom: 1em;
   margin-left: 1em;
+  opacity: .5;
   text-align: center;
   width: 9em;
 }
 
+.gMicroThumb.ui-selected {
+  opacity: 1;
+}
+
+
 .gThumbnail {
   padding: .5em;
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 03d81a98..05693200 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -5,8 +5,8 @@
      */
     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);
-
+      $(".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);
@@ -22,6 +22,8 @@
 
       $(".gBranchText span").click($.organize.collapse_or_expand_tree);
       $(".gBranchText").click($.organize.show_album);
+
+      $("#gMicroThumbGrid").selectable({filter: ".gMicroThumb"});
     },
 
     /**
-- 
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/css')

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/css')

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 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/css')

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/css')

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 a498d3776365b6d0d14ce07a4ccd564f41b7f7be Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 14:49:51 -0700
Subject: remove unused #gOrganizeDialog

---
 modules/organize/css/organize.css | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 85168810..cbd1e138 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -2,10 +2,6 @@
 /*******************************************************************
  * Dialog wide stylings
  */
-#gOrganizeDialog {
-  text-align: left;
-}
-
 #gOrganize {
   overflow: hidden;
 }
-- 
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/css')

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/css')

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 64d40397fe0738e961b9102652bd36cfe051fc9a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 15:34:47 -0700
Subject: Simplify over-targetted CSS.

---
 modules/organize/css/organize.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4a65d20e..d3e423fd 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -18,7 +18,7 @@
   width: 25%;
 }
 
-#gOrganize .yui-gf #gMessage {
+#gMessage {
   margin-bottom: .4em;
   width: 75%;
   white-space: nowrap;
@@ -114,11 +114,11 @@
   padding: .5em;
 }
 
-#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid .gAlbum {
+#gOrganizeMicroThumbGrid .gAlbum {
   background-color: #e8e8e8;
 }
 
-#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid :hover {
+#gOrganizeMicroThumbGrid :hover {
   opacity: 1;
 }
 
-- 
cgit v1.2.3


From a015078ccad388e9be05cd45207ebd12bfdd015c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 15:42:43 -0700
Subject: Change the higlight/selection behavior so that we don't use opacity
 to indicate selection state.  It's too difficult to tell opacity differences
 on light colored photos.  This approach models what WinXP does.

---
 modules/organize/css/organize.css | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index d3e423fd..b14870bb 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -89,9 +89,9 @@
   float: left;
   font-size: 0.8em;
   padding: .5em !important;
-  opacity: .5;
   border-left: 1px hidden #13A;
   border-right: 1px hidden #13A;
+  margin: 4px;
 }
 
 .gOrganizeMicroThumb {
@@ -102,7 +102,8 @@
 }
 
 .gOrganizeMicroThumbGridCell.ui-state-selected {
-  opacity: 1;
+  margin: 2px;
+  border: 2px solid #009;
 }
 
 .ui-selectable-lasso {
@@ -118,8 +119,9 @@
   background-color: #e8e8e8;
 }
 
-#gOrganizeMicroThumbGrid :hover {
-  opacity: 1;
+.gOrganizeMicroThumbGridCell:hover {
+  margin: 2px;
+  border: 2px solid #009;
 }
 
 /****************************************************************
-- 
cgit v1.2.3


From 6fdb5cddf89d9c4f10bd112111649abac6eae837 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 15:45:35 -0700
Subject: Make the lasso more prominent and the colors consistent.

---
 modules/organize/css/organize.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index b14870bb..4bbe4975 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -103,12 +103,14 @@
 
 .gOrganizeMicroThumbGridCell.ui-state-selected {
   margin: 2px;
-  border: 2px solid #009;
+  border: 2px solid #13A;
 }
 
 .ui-selectable-lasso {
   z-index: 2000 !important;
-  border: 1px dashed #13A;
+  border: 1px dashed #00F;
+  opacity: 0.25;
+  background: #13A;
 }
 
 .gThumbnail {
@@ -121,7 +123,7 @@
 
 .gOrganizeMicroThumbGridCell:hover {
   margin: 2px;
-  border: 2px solid #009;
+  border: 2px solid #13A;
 }
 
 /****************************************************************
-- 
cgit v1.2.3


From d47a4de029d01d1f14a1f348873c9f5614837464 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 16:11:28 -0700
Subject: Get rid of as much jitter as possible in the organize tree.

---
 modules/organize/css/organize.css | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4bbe4975..3a54248e 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -43,20 +43,14 @@
   padding: 0 !important;
 }
 
-#gOrganizeTreeContainer ul ul li {
-  padding-left: 1.2em;
-}
-
-.gOrganizeAlbumText:hover {
-  border: 1px dashed #999;
-  padding: 1px;
-}
-
 #gOrganizeAlbumTree .selected {
   background-color: #cfdeff !important;
   border-bottom: 1px solid #999 !important;
-  display: block;
-  padding: .3em 0;
+  margin-right: 0px;
+}
+
+#gOrganizeAlbumTree ul li {
+  padding-left: 1.2em;
 }
 
 .gOrganizeAlbum span {
@@ -66,7 +60,15 @@
 .gOrganizeAlbumText {
   cursor: pointer;
   width: auto;
+  margin: 2px 0px 1px 2px;
+  display: block;
+  padding: 0;
 }
+
+.gOrganizeAlbumText:hover {
+  background: #eee;
+}
+
 /*******************************************************************
  * Album Panel Styles
  */
-- 
cgit v1.2.3


From 459329753333c7de2d5bcfc4337fcedf661ff16e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 16:15:54 -0700
Subject: Remove extra padding line

---
 modules/organize/css/organize.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 3a54248e..59e46bc4 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -62,7 +62,6 @@
   width: auto;
   margin: 2px 0px 1px 2px;
   display: block;
-  padding: 0;
 }
 
 .gOrganizeAlbumText:hover {
-- 
cgit v1.2.3


From 0dba5857fa63b6e8f0c201cd480aad7416b9a631 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 16:16:39 -0700
Subject: Make comments consistent.

---
 modules/organize/css/organize.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 59e46bc4..d533a80d 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,6 +1,6 @@
 
 /*******************************************************************
- * Dialog wide stylings
+ * Dialog wide styles
  */
 #gOrganize {
   overflow: hidden;
@@ -34,7 +34,7 @@
 }
 
 /*******************************************************************
- * Album Tree styling
+ * Album Tree styles
  */
 #gOrganizeTreeContainer {
   height: 100%;
@@ -69,7 +69,7 @@
 }
 
 /*******************************************************************
- * Album Panel Styles
+ * Album panel styles
  */
 #gOrganizeMicroThumbPanel {
   margin: 0 !important;
@@ -128,7 +128,7 @@
 }
 
 /****************************************************************
- * Organize Controls styling
+ * Controls styles
  */
 #gOrganizeControls {
   padding-left: 8px;
-- 
cgit v1.2.3


From 74e204b557618520d7bc56266a25d230946f02e7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 16:17:53 -0700
Subject: Don't mark colors !important.

---
 modules/organize/css/organize.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index d533a80d..15b5538d 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -44,8 +44,8 @@
 }
 
 #gOrganizeAlbumTree .selected {
-  background-color: #cfdeff !important;
-  border-bottom: 1px solid #999 !important;
+  background-color: #cfdeff;
+  border-bottom: 1px solid #999;
   margin-right: 0px;
 }
 
@@ -75,7 +75,7 @@
   margin: 0 !important;
   padding: 0 !important;
   background-color: #cfdeff;
-  border: 1px solid #999 !important;
+  border: 1px solid #999;
   border-top: none !important;
   border-left: none !important;
   overflow-x: hidden;
-- 
cgit v1.2.3


From 1d40c77c4c05a85fbf6bbb96820fb98cbaa989eb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 12 Sep 2009 08:53:24 -0700
Subject: Update the organize module to use the release version of jquery
 Selectable.  Unfortunately this does not have the functionality to select
 additional thumbnails using the ctrl or alt-keys, it is preferable to forking
 the Selectable component.  This functionality should arrive with ui.jquery
 1.8.x

---
 modules/organize/css/organize.css | 5 +++--
 modules/organize/js/organize.js   | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'modules/organize/css')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 15b5538d..b1cef33c 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -102,12 +102,13 @@
   width: 9em;
 }
 
-.gOrganizeMicroThumbGridCell.ui-state-selected {
+.gOrganizeMicroThumbGridCell.ui-selecting,
+.gOrganizeMicroThumbGridCell.ui-selected {
   margin: 2px;
   border: 2px solid #13A;
 }
 
-.ui-selectable-lasso {
+.ui-selectable-helper {
   z-index: 2000 !important;
   border: 1px dashed #00F;
   opacity: 0.25;
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index c30f89e0..7d204708 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,12 +1,12 @@
 (function($) {
   $.organize = {
     micro_thumb_draggable: {
-      handle: ".ui-state-selected",
+      handle: ".ui-selected",
       distance: 10,
       cursorAt: { left: -10, top: -10},
       appendTo: "#gOrganizeMicroThumbPanel",
       helper: function(event, ui) {
-        var selected = $(".ui-draggable.ui-state-selected img");
+        var selected = $(".ui-draggable.ui-selected img");
         if (selected.length) {
           var set = $('<div class="gDragHelper"></div>')
 		      .css({
@@ -37,7 +37,7 @@
       },
 
       start: function(event, ui) {
-        $("#gOrganizeMicroThumbPanel .ui-state-selected").hide();
+        $("#gOrganizeMicroThumbPanel .ui-selected").hide();
       },
 
       drag: function(event, ui) {
@@ -80,7 +80,7 @@
       greedy: true,
       drop: function(event, ui) {
         if ($(event.target).hasClass("gViewOnly")) {
-          $(".ui-state-selected").show();
+          $(".ui-selected").show();
           $(".gOrganizeMicroThumbGridCell").css("borderStyle", "none");
         } else {
           $.organize.do_drop({
-- 
cgit v1.2.3