10 files changed, 14 insertions, 20 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 6792573d..898be509 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -279,8 +279,6 @@ class Organize_Controller extends Controller {
       $item->rename($form->dirname->value);
       $item->save();
 
-      module::event("item_updated", $orig, $item);
-
       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)));
@@ -322,8 +320,6 @@ class Organize_Controller extends Controller {
       $item->sort_order = $form->direction->value;
       $item->save();
 
-      module::event("item_updated", $orig, $item);
-
       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));
@@ -520,7 +516,7 @@ class Organize_Controller extends Controller {
       break;
 
     case "delete":
-      return array("description" => t("Delete selected photos and albums"),
+      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"),
@@ -541,4 +537,4 @@ class Organize_Controller extends Controller {
       throw new Exception("Operation '$operation' is not implmented");
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 1e608beb..e58cd5a5 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -163,7 +163,6 @@
 }
 
 #gOrganizeEditHandleLeft {
-  background-image: url(organize_edit_drawer.png);
   background-color: #FFF;
   float: left;
   height: 30px;
@@ -200,7 +199,6 @@
 
 #gOrganizeEditHandleRight {
   background-color: #FFF;
-  background-image: url(organize_edit_drawer.png);
   background-position: -15px 0;
   float: right;
   height: 30px;
diff --git a/modules/organize/helpers/organize.php b/modules/organize/helpers/organize.php
index 9bf4e986..25284771 100644
--- a/modules/organize/helpers/organize.php
+++ b/modules/organize/helpers/organize.php
@@ -43,7 +43,7 @@ class organize_Core {
     $sortPane->hidden("item[]")->value($item->id);
     $sortPane->dropdown("column", array("id" => "gAlbumSortColumn"))
       ->label(t("Sort by"))
-      ->options(array("weight" => t("Default"),
+      ->options(array("weight" => t("Order Added"),
                       "captured" => t("Capture Date"),
                       "created" => t("Creation Date"),
                       "title" => t("Title"),
diff --git a/modules/organize/helpers/organize_menu.php b/modules/organize/helpers/organize_event.php
index 850c1eab..99a28673 100644
--- a/modules/organize/helpers/organize_menu.php
+++ b/modules/organize/helpers/organize_event.php
@@ -17,8 +17,8 @@
  * 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_menu {
-  static function site($menu, $theme) {
+class organize_event_Core {
+  static function site_menu($menu, $theme) {
     $item = $theme->item();
 
     if ($item && access::can("edit", $item) && $item->is_album()) {
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index 02f1f589..e4feba2b 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -20,8 +20,8 @@
 class organize_theme {
   static function head($theme) {
     // @tdo remove the addition css and organize.js (just here to test)
-    $theme->script("modules/organize/js/organize_init.js");
-    $theme->script("modules/organize/js/organize.js");
-    $theme->css("modules/organize/css/organize.css");
+    $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 f10cbcc9..31657d3a 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -391,7 +391,7 @@ function organize_dialog_init() {
   $(".gBranchText").droppable(treeDroppable);
   $(".gBranchText").click(organizeOpenFolder);
   retrieveMicroThumbs(item_id);
-  //showLoading("#gDialog");
+  //$.gallery_show_loading("#gDialog");
 
   $("#gMicroThumbPanel").droppable(thumbDroppable);
   $("#gMicroThumbPanel").selectable(selectable);
diff --git a/modules/organize/js/organize_init.js b/modules/organize/js/organize_init.js
index ed036fdb..30bc78dd 100644
--- a/modules/organize/js/organize_init.js
+++ b/modules/organize/js/organize_init.js
@@ -17,7 +17,7 @@ $("document").ready(function() {
       zIndex: 75
     });
 
-    //showLoading("#gDialog");
+    //$.gallery_show_loading("#gDialog");
 
     $.get(href, function(data) {
       $("#gDialog").html(data);
diff --git a/modules/organize/module.info b/modules/organize/module.info
index b3ae94a3..5c6b1de0 100644
--- a/modules/organize/module.info
+++ b/modules/organize/module.info
@@ -1,3 +1,3 @@
-name = Organize
-description = Organize your gallery by apply tags or moving images
+name = "Organize"
+description = "Organize your gallery by apply tags or moving images"
 version = 1
diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 65d67d04..1686d255 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -33,7 +33,7 @@ var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums an
         <?= $album_tree ?>
       </div>
       <div id="gMicroThumbPanel" class="yui-u"
-           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&offset=__OFFSET__") ?>">
+           ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&amp;height=__HEIGHT__&amp;offset=__OFFSET__") ?>">
         <ul id="gMicroThumbGrid"></ul>
       </div>
       <div id="gOrganizeEditDrawer" class="yui-u">
diff --git a/modules/organize/views/organize_button_pane.html.php b/modules/organize/views/organize_button_pane.html.php
index cd780d5e..c5839a44 100644
--- a/modules/organize/views/organize_button_pane.html.php
+++ b/modules/organize/views/organize_button_pane.html.php
@@ -46,5 +46,5 @@
 <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("Done") ?></a>
+  <a id="gMicroThumbDone" href="#" ref="done" class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
 </div>