From fb2c365d8fdaa6941b61edac26df2f3550822e6e Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 15 Nov 2009 22:55:09 -0700
Subject: Fix outstanding issues in the organize dialog. Tighten up the layout
 a bit so that more microthumbs will display.

---
 modules/organize/views/organize_dialog.html.php    | 48 ++++++++++------------
 .../organize/views/organize_thumb_grid.html.php    |  3 +-
 modules/organize/views/organize_tree.html.php      |  3 +-
 3 files changed, 25 insertions(+), 29 deletions(-)

(limited to 'modules/organize/views')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 57a0bdc6..5e46a5bb 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -7,35 +7,31 @@
 </script>
 <div id="g-organize" class="g-dialog-panel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1>
-  <div id="bd">
-    <div>
-      <div class="g-first g-left">
-        <h3><?= t("Albums") ?></h3>
-      </div>
-      <div id="g-action-status" class="g-message-block g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
+  <div id="g-organize-content-pane">
+    <div id="g-organize-tree-container" class="g-left ui-helper-clearfix">
+      <h3><?= t("Albums") ?></h3>
+      <ul id="g-organize-album-tree">
+        <?= $album_tree ?>
+      </ul>
     </div>
-    <div id="g-organize-content-pane">
-      <div id="g-organize-tree-container" class="g-first g-left">
-        <h3><?= t("Albums") ?></h3><ul id="g-organize-album-tree">
-          <?= $album_tree ?>
+    <div id="g-organize-detail" class="g-left ui-helper-clearfix">
+      <div id="g-organize-microthumb-panel"
+           ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
+        <div id="g-action-status" class="g-message-block g-info">
+          <?= t("Drag and drop photos to re-order or move between albums") ?>
+        </div>
+        <ul id="g-organize-microthumb-grid">
+          <?= $micro_thumb_grid ?>
         </ul>
       </div>
-      <div id="g-organize-detail">
-        <div id="g-organize-microthumb-panel"
-             ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
-          <ul id="g-organize-microthumb-grid">
-            <?= $micro_thumb_grid ?>
-          </ul>
-        </div>
-        <div id="g-organize-controls">
-          <a id="g-organize-close" href="#" ref="done"
-             class="g-button g-right ui-corner-all ui-state-default"><?= t("Close") ?></a>
-          <form>
-            <?= t("Sort order") ?>
-            <?= form::dropdown(array("id" => "g-organize-sort-column"), album::get_sort_order_options(), $album->sort_column) ?>
-            <?= form::dropdown(array("id" => "g-organize-sort-order"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
-          </form>
-        </div>
+      <div id="g-organize-controls">
+        <a id="g-organize-close" href="#" ref="done"
+           class="g-button g-right ui-corner-all ui-state-default"><?= t("Close") ?></a>
+        <form>
+          <?= t("Sort order") ?>
+          <?= form::dropdown(array("id" => "g-organize-sort-column"), album::get_sort_order_options(), $album->sort_column) ?>
+          <?= form::dropdown(array("id" => "g-organize-sort-order"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
+        </form>
       </div>
     </div>
   </div>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index f28176de..3ac32ce0 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,9 +1,10 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($album->children(25, $offset) as $child): ?>
 <li class="g-organize-microthumb-grid-cell g-left" ref="<?= $child->id ?>">
-  <div id="g-organize-microthumb_<?= $child->id ?>"
+  <div id="g-organize-microthumb-<?= $child->id ?>"
        class="g-organize-microthumb <?= $child->is_album() ? "g-album" : "g-photo" ?>">
     <?= $child->thumb_img(array("class" => "g-thumbnail", "ref" => $child->id), 90, true) ?>
+    <span<?= $child->is_album() ? " class=\"ui-icon ui-icon-note\"" : "" ?>></span>
   </div>
 </li>
 <? endforeach ?>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 924a1bd6..740c2521 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -14,8 +14,7 @@
     <? else: ?>
     <li class="g-organize-album ui-icon-left <?= access::can("edit", $child) ? "" : "g-view-only" ?>"
         ref="<?= $child->id ?>">
-      <span class="ui-icon ui-icon-plus">
-      </span>
+      <span class="ui-icon ui-icon-plus"></span>
       <span class="g-organize-album-text" ref="<?= $child->id ?>">
         <?= html::clean($child->title) ?>
       </span>
-- 
cgit v1.2.3