From 98e9a96ba4d2419e02717369be8c0d886bc35ef7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 27 Aug 2009 16:10:38 -0700
Subject: Don't display the slideshow icon if there are no descendants. ticket
 #660

Conflicts:

	modules/slideshow/helpers/slideshow_event.php
---
 modules/slideshow/helpers/slideshow_event.php | 34 +++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'modules')

diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index c6cd7dc7..1b881de4 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -29,4 +29,38 @@ class slideshow_event_Core {
       site_status::clear("slideshow_needs_rss");
     }
   }
+
+  static function album_menu($menu, $theme) {
+    $descendants_count = ORM::factory("item", $theme->item->id)
+      ->descendants_count(array("type" => "photo"));
+    if ($descendants_count > 1) {
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("slideshow")
+                 ->label(t("View slideshow"))
+                 ->url("javascript:PicLensLite.start(" .
+                       "{maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})")
+                 ->css_id("gSlideshowLink"));
+    }
+  }
+
+  static function photo_menu($menu, $theme) {
+    $menu
+      ->append(Menu::factory("link")
+               ->id("slideshow")
+               ->label(t("View slideshow"))
+               ->url("javascript:PicLensLite.start(" .
+                     "{maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})")
+               ->css_id("gSlideshowLink"));
+  }
+
+  static function tag_menu($menu, $theme) {
+    $menu
+      ->append(Menu::factory("link")
+               ->id("slideshow")
+               ->label(t("View slideshow"))
+               ->url("javascript:PicLensLite.start(" .
+                     "{maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})")
+               ->css_id("gSlideshowLink"));
+  }
 }
-- 
cgit v1.2.3


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

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

(limited to 'modules')

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


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

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

(limited to 'modules')

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


From 83e850bc332ce6c13f9b0b7a396f2fe8d9260eb6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 09:19:20 -0700
Subject: Minor style fixes.

---
 modules/organize/js/organize.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 0f8f7fa1..ec6bd924 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -8,16 +8,19 @@
       helper: function(event, ui) {
         var selected = $(".ui-draggable.ui-state-selected img");
         if (selected.length) {
-          var set = $('<div class="gDragHelper"></div>').css({zIndex: 2000, width: 80, height: Math.ceil(selected.length / 5) * 16 }),
-              offset = $(this).offset(),
-              click = { left: event.pageX - offset.left, top: event.pageY - offset.top };
+          var set = $('<div class="gDragHelper"></div>')
+		      .css({
+			zIndex: 2000,
+			width: 80,
+			height: Math.ceil(selected.length / 5) * 16
+		      });
+          var offset = $(this).offset();
+          var 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",
@@ -25,7 +28,7 @@
                 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;
         }
@@ -35,6 +38,7 @@
       start: function(event, ui) {
         $("#gMicroThumbPanel .ui-state-selected").hide();
       },
+
       drag: function(event, ui) {
         var top = $("#gMicroThumbPanel").offset().top;
         var height = $("#gMicroThumbPanel").height();
@@ -52,8 +56,9 @@
       greedy: true,
       drop: function(event, ui) {
         $.organize.do_drop({
-          url: rearrange_url.replace("__TARGET_ID__", $(".currentDropTarget").attr("ref"))
-                            .replace("__BEFORE__", $(".currentDropTarget").css("borderLeftStyle") == "solid" ? "before" : "after"),
+          url: rearrange_url
+	    .replace("__TARGET_ID__", $(".currentDropTarget").attr("ref"))
+            .replace("__BEFORE__", $(".currentDropTarget").css("borderLeftStyle") == "solid" ? "before" : "after"),
           source: $(ui.helper).children("img")
         });
       }
@@ -86,8 +91,9 @@
       if (source_ids.length) {
         $("#gOrganize .gProgressBar").progressbar().progressbar("value", 0);
         $("#gOrganizeProgress").animate(
-          {height: "toggle", display: "toggle"},
-          {duration: "fast",
+          { height: "toggle", display: "toggle" },
+          {
+	   duration: "fast",
            step: function() {
            },
            complete: function() {
-- 
cgit v1.2.3


From 98361e76134fd7ed5df40f2bcde30fd7f5d51708 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 09:25:29 -0700
Subject: Add a @todo to defer loading the script/css to the organize dialog.

---
 modules/organize/helpers/organize_theme.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules')

diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index de812261..61b6fe7d 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -21,6 +21,10 @@ class organize_theme {
   static function head($theme) {
     $item = $theme->item();
     if ($item && access::can("edit", $item) && $item->is_album()) {
+      // @todo: Defer loading js/css until we're loading the organize dialog as <script> and
+      // <link> elements so that we're not forcing them to be downloaded on every page view (which
+      // is expensive in terms of browser latency).  When we do that, we'll have to figure out an
+      // approach that lets us continue to use the Kohana cascading filesystem.
       $theme->script("organize.js");
       $theme->css("organize.css");
     }
-- 
cgit v1.2.3


From 47fd2dc65ec275203af745440e0ee264a2e9d75c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 09:53:54 -0700
Subject: Clean up in preparation for some refactoring.

---
 modules/organize/controllers/organize.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 76a22b73..0a821d52 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -168,15 +168,20 @@ class Organize_Controller extends Controller {
   }
 
   static function rearrange_task_handler($task) {
-    $phase = $task->get("phase", "before_drop");
+    $mode = $task->get("mode", "before_drop");
     $source_ids = $task->get("source_ids");
     $parent = ORM::factory("item", $task->get("parent_id"));
     $weight = $task->get("weight");
     $target_id = $task->get("target_id");
     $is_before = $task->get("before") == "before";
 
+    // 1. Find the insertion point, which is the weight of the target_id item
+    // 2. Set the weight of the source_ids items to be
+
+    // Find the weight of the target insertion point
+
     // @todo at some point if we allow drag from album tree this needs to be changed
-    if ($phase == "dropping") {
+    if ($mode == "dropping") {
       $children = ORM::factory("item")
         ->where("parent_id", $parent->id)
         ->where("weight < ", $weight)
@@ -184,11 +189,12 @@ class Organize_Controller extends Controller {
         ->orderby(array($parent->sort_column => $parent->sort_order))
         ->find_all();
       if ($children->count() == 0) {
-        $phase = "after_drop";
-        $task->set("phase", $phase);
+        $mode = "after_drop";
+        $task->set("mode", $mode);
       }
     }
-    if ($phase != "dropping") {
+
+    if ($mode != "dropping") {
       $dropping = false;
       $children = ORM::factory("item")
         ->where("parent_id", $parent->id)
@@ -205,9 +211,9 @@ class Organize_Controller extends Controller {
       if (microtime(true) - $start > 0.5) {
         break;
       }
-      if ($phase == "before_drop" && $child->id == $target_id && $is_before) {
+      if ($mode == "before_drop" && $child->id == $target_id && $is_before) {
         $task->set("dropping", true);
-        $task->set("phase", "dropping");
+        $task->set("mode", "dropping");
         break;
       }
       Database::instance()->query(
@@ -215,9 +221,9 @@ class Organize_Controller extends Controller {
         " WHERE `id` = " . $child->id);
 
       $completed++;
-      if ($phase == "before_drop" && $child->id == $task->get("target_id")) {
+      if ($mode == "before_drop" && $child->id == $task->get("target_id")) {
         $task->set("dropping", true);
-        $task->set("phase", "dropping");
+        $task->set("mode", "dropping");
         break;
       }
     }
-- 
cgit v1.2.3


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

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

(limited to 'modules')

diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 671e0ce4..5adb487a 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,10 +1,10 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($item->children(25, $offset) as $child): ?>
 <li class="gMicroThumbGridCell" ref="<?= $child->id ?>">
-<div id="gMicroThumb_<?= $child->id ?>"
-    class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
-  <?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
-</div>
+  <div id="gMicroThumb_<?= $child->id ?>"
+       class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
+    <?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
+  </div>
 </li>
 <? endforeach ?>
 
-- 
cgit v1.2.3


From 76e541745f40dc684ddbbc58c6f178cd395911e2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 11:13:04 -0700
Subject: Refactor rearrange_task_handler to have a more linear flow.

---
 modules/organize/controllers/organize.php | 147 ++++++++++++++++--------------
 1 file changed, 77 insertions(+), 70 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 0a821d52..04f3c0b4 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -60,7 +60,7 @@ class Organize_Controller extends Controller {
             "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
   }
 
-  function rearrange($target_id, $before) {
+  function rearrange($target_id, $before_or_after) {
     access::verify_csrf();
     $target = ORM::factory("item", $target_id);
     $parent = $target->parent();
@@ -71,11 +71,12 @@ class Organize_Controller extends Controller {
       ->callback("Organize_Controller::rearrange_task_handler")
       ->description(t("Rearrange Image"))
       ->name(t("Rearrange Images"));
-    $task = task::create($task_def, array("target_id" => $target_id, "before" => $before,
-                                          "parent_id" => $parent->id,
-                                          "weight" => item::get_max_weight(),
-                                          "total" => $parent->children_count(),
-                                          "source_ids" => $this->input->post("source_ids")));
+    $task = task::create(
+      $task_def,
+      array("target_id" => $target_id,
+            "before_or_after" => $before_or_after,
+            "parent_id" => $parent->id,
+            "source_ids" => $this->input->post("source_ids")));
 
     print json_encode(
       array("result" => "started",
@@ -168,77 +169,83 @@ class Organize_Controller extends Controller {
   }
 
   static function rearrange_task_handler($task) {
-    $mode = $task->get("mode", "before_drop");
-    $source_ids = $task->get("source_ids");
-    $parent = ORM::factory("item", $task->get("parent_id"));
-    $weight = $task->get("weight");
-    $target_id = $task->get("target_id");
-    $is_before = $task->get("before") == "before";
-
-    // 1. Find the insertion point, which is the weight of the target_id item
-    // 2. Set the weight of the source_ids items to be
-
-    // Find the weight of the target insertion point
-
-    // @todo at some point if we allow drag from album tree this needs to be changed
-    if ($mode == "dropping") {
-      $children = ORM::factory("item")
-        ->where("parent_id", $parent->id)
-        ->where("weight < ", $weight)
-        ->in("id", $source_ids)
-        ->orderby(array($parent->sort_column => $parent->sort_order))
-        ->find_all();
-      if ($children->count() == 0) {
-        $mode = "after_drop";
-        $task->set("mode", $mode);
-      }
-    }
+    $start = microtime(true);
+    $mode = $task->get("mode", "init");
 
-    if ($mode != "dropping") {
-      $dropping = false;
-      $children = ORM::factory("item")
-        ->where("parent_id", $parent->id)
-        ->where("weight < ", $weight)
-        ->in("id", $source_ids, true)
-        ->orderby(array($parent->sort_column => $parent->sort_order))
-        ->find_all();
+    if ($task->percent_complete == 0) {
+      batch::start();
     }
-    $completed = $task->get("completed", 0);
+    while (microtime(true) - $start < 1.5) {
+      switch ($mode) {
+      case "init":
+        $album = ORM::factory("item", $task->get("parent_id"));
+        if ($album->sort_column != "weight") {
+          $mode = "convert-to-weight-order";
+        } else {
+          $mode = "find-insertion-point";
+        }
+        break;
 
-    $start = microtime(true);
-    foreach ($children as $child) {
-      $step = microtime(true);
-      if (microtime(true) - $start > 0.5) {
+      case "convert-to-weight-order":
+        $i = 0;
+        $album = ORM::factory("item", $task->get("parent_id"));
+        foreach ($album->children() as $child) {
+          // Do this directly in the database to avoid sending notifications
+          Database::Instance()->update("items", array("weight" => $i++), array("id" => $child->id));
+        }
+        $album->sort_column = "weight";
+        $album->sort_order = "ASC";
+        $album->save();
+        $mode = "find-insertion-point";
+        $task->percent_complete = 25;
         break;
-      }
-      if ($mode == "before_drop" && $child->id == $target_id && $is_before) {
-        $task->set("dropping", true);
-        $task->set("mode", "dropping");
+
+      case "find-insertion-point":
+        $target = ORM::factory("item", $task->get("target_id"));
+        $target_weight = $target->weight;
+
+        if ($task->get("before_or_after") == "after") {
+          $target_weight++;
+        }
+        $task->set("target_weight", $target_weight);
+        $task->percent_complete = 40;
+        $mode = "make-a-hole";
         break;
-      }
-      Database::instance()->query(
-        "UPDATE {items} SET `weight` =  " . item::get_max_weight() .
-        " WHERE `id` = " . $child->id);
-
-      $completed++;
-      if ($mode == "before_drop" && $child->id == $task->get("target_id")) {
-        $task->set("dropping", true);
-        $task->set("mode", "dropping");
+
+      case "make-a-hole":
+        $target_weight = $task->get("target_weight");
+        $source_ids = $task->get("source_ids");
+        $count = count($source_ids);
+        $parent_id = $task->get("parent_id");
+        Database::Instance()->query(
+          "UPDATE {items} " .
+          "SET `weight` = `weight` + $count " .
+          "WHERE `weight` > $target_weight AND `parent_id` = {$parent_id}");
+        $mode = "insert-source-items";
+        $task->percent_complete = 80;
+        break;
+
+      case "insert-source-items":
+        $target_weight = $task->get("target_weight");
+        foreach ($source_ids as $source_id) {
+          Database::Instance()->update(
+            "items", array("weight" => $target_weight++), array("id" => $source_id));
+        }
+        $mode = "done";
+        break;
+
+      case "done":
+        $album = ORM::factory("item", $task->get("parent_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;
       }
     }
-    if ($completed == $task->get("total")) {
-      Database::instance()->query(
-        "UPDATE {items} SET `sort_column` =  \"weight\"" .
-        " WHERE `id` = " . $parent->id);
-      module::event("album_rearrange", $parent);
-      $task->done = true;
-      $task->state = "success";
-      $task->set("content", self::_get_micro_thumb_grid($parent, 0)->__toString());
-      $task->percent_complete = 100;
-    } else {
-      $task->percent_complete = (int)(100 * $completed / $task->get("total"));
-    }
-    $task->set("completed", $completed);
+
+    $task->set("mode", $mode);
   }
 }
-- 
cgit v1.2.3


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

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

(limited to 'modules')

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


From b9aca313fade910254be14f8e25d9a6c41752851 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 11:41:06 -0700
Subject: Fix a couple of off-by-one errors.

---
 modules/organize/controllers/organize.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 04f3c0b4..f56ad006 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -191,7 +191,7 @@ class Organize_Controller extends Controller {
         $album = ORM::factory("item", $task->get("parent_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));
+          Database::Instance()->update("items", array("weight" => ++$i), array("id" => $child->id));
         }
         $album->sort_column = "weight";
         $album->sort_order = "ASC";
@@ -220,7 +220,8 @@ class Organize_Controller extends Controller {
         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` = {$parent_id}");
+
         $mode = "insert-source-items";
         $task->percent_complete = 80;
         break;
-- 
cgit v1.2.3