From 64d40397fe0738e961b9102652bd36cfe051fc9a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 15:34:47 -0700
Subject: Simplify over-targetted CSS.

---
 modules/organize/css/organize.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4a65d20e..d3e423fd 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -18,7 +18,7 @@
   width: 25%;
 }
 
-#gOrganize .yui-gf #gMessage {
+#gMessage {
   margin-bottom: .4em;
   width: 75%;
   white-space: nowrap;
@@ -114,11 +114,11 @@
   padding: .5em;
 }
 
-#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid .gAlbum {
+#gOrganizeMicroThumbGrid .gAlbum {
   background-color: #e8e8e8;
 }
 
-#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid :hover {
+#gOrganizeMicroThumbGrid :hover {
   opacity: 1;
 }
 
-- 
cgit v1.2.3


From a015078ccad388e9be05cd45207ebd12bfdd015c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 15:42:43 -0700
Subject: Change the higlight/selection behavior so that we don't use opacity
 to indicate selection state.  It's too difficult to tell opacity differences
 on light colored photos.  This approach models what WinXP does.

---
 modules/organize/css/organize.css | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index d3e423fd..b14870bb 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -89,9 +89,9 @@
   float: left;
   font-size: 0.8em;
   padding: .5em !important;
-  opacity: .5;
   border-left: 1px hidden #13A;
   border-right: 1px hidden #13A;
+  margin: 4px;
 }
 
 .gOrganizeMicroThumb {
@@ -102,7 +102,8 @@
 }
 
 .gOrganizeMicroThumbGridCell.ui-state-selected {
-  opacity: 1;
+  margin: 2px;
+  border: 2px solid #009;
 }
 
 .ui-selectable-lasso {
@@ -118,8 +119,9 @@
   background-color: #e8e8e8;
 }
 
-#gOrganizeMicroThumbGrid :hover {
-  opacity: 1;
+.gOrganizeMicroThumbGridCell:hover {
+  margin: 2px;
+  border: 2px solid #009;
 }
 
 /****************************************************************
-- 
cgit v1.2.3


From 6fdb5cddf89d9c4f10bd112111649abac6eae837 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 15:45:35 -0700
Subject: Make the lasso more prominent and the colors consistent.

---
 modules/organize/css/organize.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index b14870bb..4bbe4975 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -103,12 +103,14 @@
 
 .gOrganizeMicroThumbGridCell.ui-state-selected {
   margin: 2px;
-  border: 2px solid #009;
+  border: 2px solid #13A;
 }
 
 .ui-selectable-lasso {
   z-index: 2000 !important;
-  border: 1px dashed #13A;
+  border: 1px dashed #00F;
+  opacity: 0.25;
+  background: #13A;
 }
 
 .gThumbnail {
@@ -121,7 +123,7 @@
 
 .gOrganizeMicroThumbGridCell:hover {
   margin: 2px;
-  border: 2px solid #009;
+  border: 2px solid #13A;
 }
 
 /****************************************************************
-- 
cgit v1.2.3


From 2cf52a4718299cb038912a97c81e13e9e614a7fb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 15:54:56 -0700
Subject: Tighten up a class attr.

---
 modules/organize/views/organize_tree.html.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 58621c3c..41f5b558 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -3,9 +3,7 @@
     ref="<?= $album->id ?>">
   <span class="ui-icon ui-icon-minus">
   </span>
-  <span class="gOrganizeAlbumText
-               <?= $selected && $album->id == $selected->id ? "selected" : "" ?>
-               "
+  <span class="gOrganizeAlbumText <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
         ref="<?= $album->id ?>">
     <?= p::clean($album->title) ?>
   </span>
-- 
cgit v1.2.3


From d47a4de029d01d1f14a1f348873c9f5614837464 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 16:11:28 -0700
Subject: Get rid of as much jitter as possible in the organize tree.

---
 modules/organize/css/organize.css | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4bbe4975..3a54248e 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -43,20 +43,14 @@
   padding: 0 !important;
 }
 
-#gOrganizeTreeContainer ul ul li {
-  padding-left: 1.2em;
-}
-
-.gOrganizeAlbumText:hover {
-  border: 1px dashed #999;
-  padding: 1px;
-}
-
 #gOrganizeAlbumTree .selected {
   background-color: #cfdeff !important;
   border-bottom: 1px solid #999 !important;
-  display: block;
-  padding: .3em 0;
+  margin-right: 0px;
+}
+
+#gOrganizeAlbumTree ul li {
+  padding-left: 1.2em;
 }
 
 .gOrganizeAlbum span {
@@ -66,7 +60,15 @@
 .gOrganizeAlbumText {
   cursor: pointer;
   width: auto;
+  margin: 2px 0px 1px 2px;
+  display: block;
+  padding: 0;
 }
+
+.gOrganizeAlbumText:hover {
+  background: #eee;
+}
+
 /*******************************************************************
  * Album Panel Styles
  */
-- 
cgit v1.2.3


From 459329753333c7de2d5bcfc4337fcedf661ff16e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 16:15:54 -0700
Subject: Remove extra padding line

---
 modules/organize/css/organize.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 3a54248e..59e46bc4 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -62,7 +62,6 @@
   width: auto;
   margin: 2px 0px 1px 2px;
   display: block;
-  padding: 0;
 }
 
 .gOrganizeAlbumText:hover {
-- 
cgit v1.2.3


From 0dba5857fa63b6e8f0c201cd480aad7416b9a631 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 16:16:39 -0700
Subject: Make comments consistent.

---
 modules/organize/css/organize.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 59e46bc4..d533a80d 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,6 +1,6 @@
 
 /*******************************************************************
- * Dialog wide stylings
+ * Dialog wide styles
  */
 #gOrganize {
   overflow: hidden;
@@ -34,7 +34,7 @@
 }
 
 /*******************************************************************
- * Album Tree styling
+ * Album Tree styles
  */
 #gOrganizeTreeContainer {
   height: 100%;
@@ -69,7 +69,7 @@
 }
 
 /*******************************************************************
- * Album Panel Styles
+ * Album panel styles
  */
 #gOrganizeMicroThumbPanel {
   margin: 0 !important;
@@ -128,7 +128,7 @@
 }
 
 /****************************************************************
- * Organize Controls styling
+ * Controls styles
  */
 #gOrganizeControls {
   padding-left: 8px;
-- 
cgit v1.2.3


From 74e204b557618520d7bc56266a25d230946f02e7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 16:17:53 -0700
Subject: Don't mark colors !important.

---
 modules/organize/css/organize.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index d533a80d..15b5538d 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -44,8 +44,8 @@
 }
 
 #gOrganizeAlbumTree .selected {
-  background-color: #cfdeff !important;
-  border-bottom: 1px solid #999 !important;
+  background-color: #cfdeff;
+  border-bottom: 1px solid #999;
   margin-right: 0px;
 }
 
@@ -75,7 +75,7 @@
   margin: 0 !important;
   padding: 0 !important;
   background-color: #cfdeff;
-  border: 1px solid #999 !important;
+  border: 1px solid #999;
   border-top: none !important;
   border-left: none !important;
   overflow-x: hidden;
-- 
cgit v1.2.3


From c10b5cc69cc0e9a38fc3968abf293089add26599 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 17:00:33 -0700
Subject: Minor refactoring.

---
 modules/organize/js/organize.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index edafae61..d4449b38 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -94,7 +94,9 @@
       if (source_ids.length) {
 	$.post(options.url,
 	       { "source_ids[]": source_ids },
-	       function(data) { $.organize._refresh(data); },
+	       function(data) {
+		 $.organize._refresh(data);
+	       },
 	      "json");
       }
     },
@@ -152,11 +154,12 @@
     },
 
     set_handlers: function() {
-      $("#gOrganizeMicroThumbPanel").selectable({filter: ".gOrganizeMicroThumbGridCell"});
-      $("#gOrganizeMicroThumbPanel").droppable($.organize.content_droppable);
-
-      $(".gOrganizeMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
-      $(".gOrganizeMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
+      $("#gOrganizeMicroThumbPanel")
+	.selectable({filter: ".gOrganizeMicroThumbGridCell"})
+	.droppable($.organize.content_droppable);
+      $(".gOrganizeMicroThumbGridCell")
+	.draggable($.organize.micro_thumb_draggable)
+	.mousemove($.organize.mouse_move_handler);
       $(".gOrganizeAlbum").droppable($.organize.branch_droppable);
       $(".gOrganizeAlbumText").click($.organize.show_album);
       $("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch);
-- 
cgit v1.2.3


From 93b542ccd8a64bdd037d0e4824be06cb9fe6ad49 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 30 Aug 2009 22:32:23 -0600
Subject: Apply hover effect to buttons in progress indicator dialog.

---
 modules/gallery/views/admin_maintenance_task.html.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 509e87b5..0f33d508 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -23,6 +23,7 @@
       animation = null;
       delta = 1;
     }
+    $.fn.gallery_hover_init();
   }
 
   update = function() {
-- 
cgit v1.2.3


From 80ae2fe4bf8d5872d0aeb18559fa8b099d07282f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 30 Aug 2009 23:51:31 -0600
Subject: Finish this pass at the Admin Maintenance view. Re-introduce status
 icons, put Cancel All, Delete All buttons in the action heading cell.

---
 modules/gallery/views/admin_maintenance.html.php | 20 +++++++++-----------
 themes/admin_default/css/screen.css              |  7 +------
 themes/default/css/screen.css                    |  1 -
 3 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 05bc0923..4bca8653 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -22,7 +22,7 @@
       <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
       <tr class="<?= log::severity_class($task->severity) ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= log::severity_class($task->severity) ?>">
           <?= $task->name ?>
         </td>
         <td>
@@ -42,10 +42,6 @@
 
   <? if ($running_tasks->count()): ?>
   <div id="gRunningTasks">
-    <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-       class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-      <?= t("cancel all") ?></a>
-
     <h2> <?= t("Running Tasks") ?> </h2>
     <table>
       <tr>
@@ -66,12 +62,15 @@
         </th>
         <th>
           <?= t("Action") ?>
+          <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
+             class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+            <?= t("cancel all") ?></a>
         </th>
       </tr>
       <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
       <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
@@ -116,10 +115,6 @@
 
   <? if ($finished_tasks->count()): ?>
   <div id="gFinishedTasks">
-    <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
-         class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-       <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
-
     <h2> <?= t("Finished Tasks") ?> </h2>
     <table>
       <tr>
@@ -140,12 +135,15 @@
         </th>
         <th>
           <?= t("Action") ?>
+          <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+               class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+             <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
         </th>
       </tr>
       <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
       <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index c275eb10..21b2b31c 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -312,7 +312,6 @@ li.gError select {
 
 .gError {
   background-color: #f6cbca;
-  color: red;
   background-image: url('../images/ico-error.png');
 }
 
@@ -346,11 +345,7 @@ table .gSuccess {
   background-color: transparent !important;
 }
 
-.gPager .gInfo,
-table .gError,
-table .gInfo,
-table .gSuccess,
-table .gWarning {
+.gPager .gInfo {
   background-image: none !important;
 }
 
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 5eb30bde..7cf4cfbe 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -308,7 +308,6 @@ li.gError select {
 
 .gError {
   background-color: #f6cbca;
-  color: #f00;
   background-image: url('../images/ico-error.png');
 }
 
-- 
cgit v1.2.3