1) This provides the editting functionality for albums and photos in the

organize feature.
2) Remove the tag functionality at this point
3) Added a callback to handle validating conflicting names (only used
by organize at this point.
4) Closes #231

3 files changed, 59 insertions, 51 deletions

diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 60c4a524..b1f062a1 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -36,25 +36,18 @@
            ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&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 id="gOrganizeEditDrawer" class="yui-u">
+        <div id="gOrganizeEditDrawerPanel" class="yui-gf">
+          <div id="gOrganizeFormThumbs" class="yui-u first">
+            <ul id="gOrganizeFormThumbStack" />
           </div>
-          <div id="gOrganizeEditDrawerHandle">
-            <div id="gOrganizeEditHandleButtonsLeft">
-              <?= $button_pane ?>
-            </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="close" class="gButtonLink ui-corner-all ui-state-default"><?= t("Done") ?></a>
-            </div>
+          <div id="gOrganizeEditForm">
           </div>
         </div>
+        <div id="gOrganizeEditDrawerHandle">
+          <?= $button_pane ?>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/modules/organize/views/organize_button_pane.html.php b/modules/organize/views/organize_button_pane.html.php
index 9902eafb..cd780d5e 100644
--- a/modules/organize/views/organize_button_pane.html.php
+++ b/modules/organize/views/organize_button_pane.html.php
@@ -1,39 +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="edit"
-  disabled="1" title="<?= t("Edit Selection") ?>">
-  <span class="ui-icon ui-icon-pencil">
-    <?= t("Edit Selection") ?>
-  </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>
+  <? 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="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="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>
+  <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("Done") ?></a>
+</div>
diff --git a/modules/organize/views/organize_edit.html.php b/modules/organize/views/organize_edit.html.php
index c0fc43e5..1adf290f 100644
--- a/modules/organize/views/organize_edit.html.php
+++ b/modules/organize/views/organize_edit.html.php
@@ -5,6 +5,10 @@
 <? endforeach?>
 </ul>
 
-<? foreach ($panes as $idx => $pane): ?>
-  <div id="pane-<?= $idx ?>" class="gOrganizeEditPane"><?= $pane["content"] ?></div>
-<? endforeach?>
+<? 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