From 95b26db82c3f835f66cdb32aef13aa84a6a206e5 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 3 Feb 2010 13:56:04 -0800
Subject: 1) Simplify the layout of the organize dialog content. 2) Use CSS to
 layout the thmbnail grid to the full dialog size.  Fixes ticker #848. 3)
 Separate css that can be themed into organize_theme.css.  This isolates the
 themed components into a separate file for easy of overriding by a theme.

---
 modules/organize/views/organize_dialog.html.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'modules/organize/views/organize_dialog.html.php')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 435f5ae3..3d824886 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -15,14 +15,12 @@
       </ul>
     </div>
     <div id="g-organize-detail" class="g-left ui-helper-clearfix">
-      <div id="g-organize-microthumb-panel" class="ui-widget"
+      <ul id="g-action-status" class="g-message-block">
+        <li class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></li>
+      </ul>
+      <div id="g-organize-microthumb-grid" class="ui-widget"
            ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
-        <ul id="g-action-status" class="g-message-block">
-          <li class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></li>
-        </ul>
-        <ul id="g-organize-microthumb-grid" class="ui-widget-content">
           <?= $micro_thumb_grid ?>
-        </ul>
       </div>
       <div id="g-organize-controls" class="ui-widget-header">
         <a id="g-organize-close" href="#" ref="done"
-- 
cgit v1.2.3


From 94cc061e8b51704c6cb38d637aa3082ee4adb1ca Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 5 Feb 2010 10:25:55 -0800
Subject: Correct alignment in IE7. fixes ticket #795

---
 modules/organize/css/organize.css               |  8 +++++++-
 modules/organize/views/organize_dialog.html.php |  8 +++++---
 modules/organize/views/organize_tree.html.php   | 12 ++++++------
 3 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'modules/organize/views/organize_dialog.html.php')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index a561a134..22d6e051 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -88,7 +88,7 @@
 #g-organize #g-organize-detail .g-message-block li {
   padding-bottom: .2em;
   padding-top: .2em;
-  width: inherit;
+  width: auto;
 }
 
 #g-organize-microthumb-grid {
@@ -139,7 +139,13 @@
   right: 0;
 }
 
+#g-organize-controls #g-organize-sort-order-text {
+  padding: .2em 0 0 0;
+}
+
+
 #g-organize-controls select {
+  margin-left: .42em;
   display: inline;
 }
 
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 3d824886..e36264f9 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -26,9 +26,11 @@
         <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) ?>
+          <ul>
+            <li id="g-organize-sort-order-text" class="g-left"><?= t("Sort order") ?></li>
+            <li class="g-left">
+          <?= form::dropdown(array("id" => "g-organize-sort-column"), album::get_sort_order_options(), $album->sort_column) ?></li><li class="g-left">
+          <?= form::dropdown(array("id" => "g-organize-sort-order"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?></li></ul>
         </form>
       </div>
     </div>
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 49ed01fc..3912c1f6 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,9 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<li class="g-organize-album ui-icon-left <?= access::can("edit", $album) ? "" : "g-view-only" ?>"
+<li class="g-organize-album ui-icon-left g-left <?= access::can("edit", $album) ? "" : "g-view-only" ?>"
     ref="<?= $album->id ?>">
-  <span class="ui-icon ui-icon-minus">
+  <span class="ui-icon ui-icon-minus g-left">
   </span>
-  <span class="g-organize-album-text <?= $selected && $album->id == $selected->id ? "ui-state-focus" : "" ?>"
+  <span class="g-organize-album-text g-left <?= $selected && $album->id == $selected->id ? "ui-state-focus" : "" ?>"
         ref="<?= $album->id ?>">
     <?= html::clean($album->title) ?>
   </span>
@@ -12,10 +12,10 @@
     <? if ($selected && $child->contains($selected)): ?>
     <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
     <? else: ?>
-    <li class="g-organize-album ui-icon-left <?= access::can("edit", $child) ? "" : "g-view-only" ?>"
+    <li class="g-organize-album ui-icon-left g-left <?= access::can("edit", $child) ? "" : "g-view-only" ?>"
         ref="<?= $child->id ?>">
-      <span class="ui-icon ui-icon-plus"></span>
-      <span class="g-organize-album-text <?= $selected && $child->id == $selected->id ? "ui-state-focus" : "" ?>" ref="<?= $child->id ?>">
+      <span class="ui-icon ui-icon-plus g-left"></span>
+      <span class="g-organize-album-text g-left <?= $selected && $child->id == $selected->id ? "ui-state-focus" : "" ?>" ref="<?= $child->id ?>">
         <?= html::clean($child->title) ?>
       </span>
     </li>
-- 
cgit v1.2.3


From 83f61ff5cf9c51c998dac9dad23d74ab7339ead5 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 6 Feb 2010 09:47:56 -0800
Subject: Insure that the 'Ascending'/'Descending' string are translated on the
 organize dialog.

---
 modules/organize/views/organize_dialog.html.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/organize/views/organize_dialog.html.php')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index e36264f9..7a16f56c 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -30,7 +30,9 @@
             <li id="g-organize-sort-order-text" class="g-left"><?= t("Sort order") ?></li>
             <li class="g-left">
           <?= form::dropdown(array("id" => "g-organize-sort-column"), album::get_sort_order_options(), $album->sort_column) ?></li><li class="g-left">
-          <?= form::dropdown(array("id" => "g-organize-sort-order"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?></li></ul>
+          <?= form::dropdown(array("id" => "g-organize-sort-order"),
+                             array("ASC" => t("Ascending"), "DESC" => t("Descending")),
+                             $album->sort_order) ?></li></ul>
         </form>
       </div>
     </div>
-- 
cgit v1.2.3


From 15e22076552929bf1f45888945f65de621aa2aac Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 6 Feb 2010 10:12:53 -0800
Subject: correct layout of html for readability

---
 modules/organize/views/organize_dialog.html.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'modules/organize/views/organize_dialog.html.php')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 7a16f56c..38d05b81 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -29,10 +29,14 @@
           <ul>
             <li id="g-organize-sort-order-text" class="g-left"><?= t("Sort order") ?></li>
             <li class="g-left">
-          <?= form::dropdown(array("id" => "g-organize-sort-column"), album::get_sort_order_options(), $album->sort_column) ?></li><li class="g-left">
-          <?= form::dropdown(array("id" => "g-organize-sort-order"),
-                             array("ASC" => t("Ascending"), "DESC" => t("Descending")),
-                             $album->sort_order) ?></li></ul>
+            <?= form::dropdown(array("id" => "g-organize-sort-column"),
+                               album::get_sort_order_options(), $album->sort_column) ?>
+            </li>
+            <li class="g-left">
+            <?= form::dropdown(array("id" => "g-organize-sort-order"),
+                               array("ASC" => t("Ascending"), "DESC" => t("Descending")), $album->sort_order) ?>
+            </li>
+          </ul>
         </form>
       </div>
     </div>
-- 
cgit v1.2.3