Fix outstanding issues in the organize dialog. Tighten up the layout a bit so that more microthumbs will display.

5 files changed, 97 insertions, 92 deletions

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 41695cae..55267052 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,53 +1,42 @@
-
 /*******************************************************************
  * Dialog wide styles
  */
-#g-organize {
-  height: 100%;
-  overflow: hidden;
-}
-
-#g-organize #bd {
-  height: 100%;
-}
 
-#g-organize #g-organize-detail {
-  width: auto;
-}
-
-#g-organize #g-organize-tree-container {
-  height: 100%;
-  width: 25%;
-}
-
-#g-organize #g-action-status {
-  margin-bottom: .4em;
-  width: 75%;
-  white-space: nowrap;
+#g-organize {
+  height: auto;
+  margin: 0 !important;
+  padding: 0 !important;
+  position: relative;
+  width: 100%;
 }
 
-#g-organize-detail {
-  height: 100%;
+#g-organize-content-pane {
+  height: auto;
+  margin: 0 !important;
+  padding: 0 !important;
+  position: relative;
+  width: 100%;
 }
 
 /*******************************************************************
  * Album Tree styles
  */
-#g-organize-tree-container {
+
+#g-organize #g-organize-tree-container {
   height: 100%;
   overflow: auto;
-  margin: 0 !important;
-  padding: 0 !important;
+  margin: 0;
+  padding: 0;
+  width: 19%;
 }
 
 #g-organize-album-tree .g-selected {
-  background-color: #cfdeff;
+  background-color: #eee;
   border-bottom: 1px solid #999;
-  margin-right: 0;
 }
 
 #g-organize-album-tree ul li {
-  padding-left: 1.2em;
+  padding: 0 0 .2em 1.2em;
 }
 
 .g-organize-album span {
@@ -56,9 +45,9 @@
 
 .g-organize-album-text {
   cursor: pointer;
-  width: auto;
-  margin: 2px 0px 1px 2px;
   display: block;
+  margin: 2px 0px 1px 2px;
+  width: auto;
 }
 
 .g-organize-album-text:hover {
@@ -68,70 +57,90 @@
 /*******************************************************************
  * Album panel styles
  */
-#g-organize-microthumb-panel {
+
+#g-organize #g-organize-detail {
+  height: 100%;
   margin: 0 !important;
+  overflow: hidden;
   padding: 0 !important;
-  background-color: #cfdeff;
+  width: 80%;
+}
+
+#g-organize #g-organize-detail .g-message-block {
+  margin: 0;
+  padding-left: 30px !important;
+}
+
+#g-organize-microthumb-panel {
+  background-color: #eee;
   border: 1px solid #999;
-  border-top: none !important;
-  border-left: none !important;
-  overflow-x: hidden;
-  overflow-y: auto;
+  height: 100%;
+  margin: 0 !important;
+  position: relative;
+  padding: 0 !important;
+  width: 100%;
 }
 
 #g-organize-microthumb-grid {
-  padding: 1em;
+  height: 100%;
+  overflow: auto;
+  padding: .4em !important;
+  position: relative;
 }
 
 .g-organize-microthumb-grid-cell {
-  font-size: .8em;
-  padding: .5em !important;
-  border-left: 1px hidden #13A;
-  border-right: 1px hidden #13A;
-  margin: 4px;
+  margin: 6px;
+  padding: 0 !important;
+  position: relative;
 }
 
 .g-organize-microthumb {
+  background-color: #fff;
+  border: 1px solid #ccc;
   display: block;
-  height: 9em;
+  height: 100px;
+  margin: 0;
+  padding: .4em 0;
+  position: relative;
   text-align: center;
-  width: 9em;
+  width: 110px;
 }
 
 .g-organize-microthumb-grid-cell.ui-selecting,
 .g-organize-microthumb-grid-cell.ui-selected {
-  margin: 2px;
   border: 2px solid #13A;
+  margin: 4px;
 }
 
 .ui-selectable-helper {
-  z-index: 2000 !important;
+  background: #13A;
   border: 1px dashed #00F;
   opacity: 0.25;
-  background: #13A;
-}
-
-.g-thumbnail {
-  padding: .5em;
+  z-index: 2000 !important;
 }
 
-#g-organize-microthumb-grid .g-album {
-  background-color: #e8e8e8;
+.g-organize-microthumb .ui-icon {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  z-index: 4000;
 }
 
 .g-organize-microthumb-grid-cell:hover {
-  margin: 2px;
   border: 2px solid #13A;
+  margin: 4px;
 }
 
 /****************************************************************
  * Controls styles
  */
+
 #g-organize-controls {
-  padding-left: 8px;
-  background-color: #13A;
-  color: #ccc;
-  width: 100% !important;
+  background-color: #666;
+  color: #eee;
+  margin: 0 !important;
+  padding: .2em .4em;
+  width: 100%;
 }
 
 #g-organize-controls select {
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index e8e09acd..a7fe1ad2 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -122,7 +122,7 @@
 
     mouse_move_handler: function(event) {
       if ($(".g-drag-helper").length) {
-        $(".g-organize-microthumb-grid-cell").css({borderStyle: "hidden", margin: "4px"});
+        $(".g-organize-microthumb-grid-cell").css({borderStyle: "hidden", margin: "6px"});
         $(".currentDropTarget").removeClass("currentDropTarget");
         var borderStyle = event.pageX < $(this).offset().left + $(this).width() / 2 ?
           {borderLeftStyle: "solid", marginLeft: "2px"} : {borderRightStyle: "solid", marginRight: "2px"};
@@ -141,8 +141,8 @@
       $("#g-dialog").dialog("option", "zIndex", 70);
       $("#g-dialog").bind("dialogopen", function(event, ui) {
         $("#g-organize").height($("#g-dialog").innerHeight() - 20);
-        $("#g-organize-microthumb-panel").height($("#g-dialog").innerHeight() - 90);
-        $("#g-organize-tree-container").height($("#g-dialog").innerHeight() - 59);
+        $("#g-organize-microthumb-grid").height($("#g-dialog").innerHeight() - 91);
+        $("#g-organize-tree-container").height($("#g-dialog").innerHeight() - 60);
       });
 
       $("#g-dialog").bind("dialogclose", function(event, ui) {
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>