From 091fde3e0076a110590c6dfa3004bf7b49253153 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 27 Apr 2009 20:30:46 +0000
Subject: Another iteration of the organize module: Rearrange the layout as per
 discussion with thumb, start the drawer functionality. Still to do... 1) Add
 the processing behind the buttons on the drawer handle 2) Enable the drawer
 buttons when something is selected 3) Create a copy of the thumbs for the
 drawer 4) Add the bulk editting functionality to the drawer

---
 modules/organize/views/organize.html.php           | 62 +++++++++++++++-------
 .../organize/views/organize_button_pane.html.php   | 21 ++++++--
 modules/organize/views/organize_edit.html.php      | 20 ++-----
 3 files changed, 63 insertions(+), 40 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 493ad81a..c423f5a1 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -23,28 +23,50 @@
 <fieldset style="display: none">
   <legend><?= t("Organize %name", array("name" => $item->title)) ?></legend>
 </fieldset>
-<div id="doc3" class="yui-t1">
-  <div id="bd" role="main">
-    <div id="yui-main">
-      <div class="yui-b">
-        <a id="gMicroThumbSelectAll" href="#"><?= t("select all") ?></a>
-        <a id="gMicroThumbUnselectAll" href="#" style="display: none"><?= t("deselect all") ?></a>
-        <div id="gMicroThumbPanel" class="yui-u first"
-             ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&offset=__OFFSET__") ?>">
-            <ul id="gMicroThumbGrid">
-            </ul>
-        </div>
-          <!-- div id="gOrganizeEditContainer"  class="yui-u">
-            < ?= $edit_form ? >
-          </div -->
+<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="gOrganizeStatus" 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 id="gOrganizeTreeContainer" class="yui-b">
-      <h3><?= t("Albums") ?></h3>
-      <?= $album_tree ?>
+    <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__&height=__HEIGHT__&offset=__OFFSET__") ?>">
+        <div id="gOrganizeEditDrawer">
+          <div id="gOrganizeEditDrawerPanel" class="yui-gf" style="display: none">
+            <div id="gOrganizeFormThumbs" class="yui-u first">
+              <div id="gOrganizeFormNoImage">
+                <h3><?= t("No Image Selected") ?></h3>
+              </div>
+              <div id="gOrganizeFormThumb" style="display: none"></div>
+              <div id="gOrganizeFormMultipleImages" style="display:none">
+                <h3><?= t("Multiple Images Selected") ?></h3>
+              </div>
+            </div>
+            <?= $edit_form ?>
+          </div>
+          <div id="gOrganizeEditDrawerHandle">
+            <div id="gOrganizeEditHandleLeft"></div>
+            <div id="gOrganizeEditHandleButtonsLeft">
+              <?= $button_pane ?>
+            </div>
+            <div id="gOrganizeEditHandleRight"></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>
+        </div>
+        <ul id="gMicroThumbGrid"></ul>
+      </div>
     </div>
   </div>
-  <div id="ft">
-    <div id="gOrganizeStatus"></div>
-  </div>
 </div>
diff --git a/modules/organize/views/organize_button_pane.html.php b/modules/organize/views/organize_button_pane.html.php
index 82b7607d..a39c643c 100644
--- a/modules/organize/views/organize_button_pane.html.php
+++ b/modules/organize/views/organize_button_pane.html.php
@@ -1,23 +1,38 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 
+
+<a class="gButtonLink ui-corner-all ui-state-default" href="#" ref="edit"
+  disabled="1" title="<?= t("Edit Selection") ?>">
+  <span class="ui-icon ui-icon-pencil">
+    <?= t("Edit Selection") ?>
+  </span>
+</a>
+
 <? if (graphics::can("rotate")): ?>
 <a class="gButtonLink ui-corner-all ui-state-default" href="#" ref="rotate_ccw"
-  title="<?= t("Rotate 90 degrees counter clockwise") ?>">
+  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" href="#" ref="rotate_cw"
-  title="<?= t("Rotate 90 degrees clockwise") ?>">
+  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" href="#" ref="album_cover"
+   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" href="#" ref="delete"
-     title="<?= t("Delete selection") ?>">
+   disabled="1" title="<?= t("Delete selection") ?>">
   <span class="ui-icon ui-icon-trash">
     <?= t("Delete selection") ?>
   </span>
diff --git a/modules/organize/views/organize_edit.html.php b/modules/organize/views/organize_edit.html.php
index 1085a863..f3b6eb87 100644
--- a/modules/organize/views/organize_edit.html.php
+++ b/modules/organize/views/organize_edit.html.php
@@ -1,21 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gOrganizeForm">
+<div id="gOrganizeForm" class="yui-u">
   <?= form::open(url::site("organize/update/__ITEM_ID__?csrf=__CSRF__&action=__ACTION__"), array("method" => "post")) ?>
-  <div id="gOrganizeFormThumbs">
-    <div id="gOrganizeFormNoImage">
-      <h3><?= t("No Image Selected") ?></h3>
-    </div>
-    <div id="gOrganizeFormThumb" style="display: none"></div>
-    <div id="gOrganizeFormMultipleImages" style="display:none">
-      <h3><?= t("Multiple Images Selected") ?></h3>
-    </div>
-  </div>
-
-  <div id="gOrganizeButtonPane" style="display: none">
-    <?= $button_pane ?>
-  </div>
   
-  <div id="gOrganizeFormInfo" style="display:none"
+  <!-- div id="gOrganizeFormInfo" style="display:none"
        ref="<?= url::site("organize/detail/__ITEM_ID__") ?>">
     <ul>
         <li>
@@ -31,10 +18,9 @@
           Description: <span id="gOrganizeFormDescription">&nbsp;</span>
         </li>
     </ul>
-  </div>
+  </div -->
   
   <span id="gOrganizeFormButtons">
-    <?= form::submit(array("id" => "gOrganizePauseButton", "name" => "pause", "disabled" => true, "class" => "submit", "style" => "display:none"), t("Pause")) ?>
     <?= form::submit(array("id" => "gOrganizeApplyButton", "name" => "apply", "disabled" => true, "class" => "submit"), t("Apply")) ?>
   </span>
   <?= form::close() ?>
-- 
cgit v1.2.3