Set organize messages to use existing gMessage, added album cover message.

4 files changed, 19 insertions, 11 deletions

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 41eea643..3059d8e9 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -138,6 +138,9 @@ class Organize_Controller extends Controller {
       $item = ORM::factory("item", (int)$task->get("target"));
       $type = $task->get("type");
       switch ($type) {
+      case "albumCover":
+        $task->status = t("Album cover set");
+        break;
       case "move":
         $task->status = t("Move to '%album' completed", array("album" => $item->title));
         break;
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 1e5e90ed..baa16d5c 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -2,9 +2,14 @@
 /*******************************************************************
  * Dialog wide stylings
  */
-#gOrganizeStatus {
-  height: 1.2em;
-  font-weight: bold;
+#gMessage {
+  margin-bottom: .4em;
+}
+
+#gMessage .gInfo {
+  background-color: transparent;
+  background-image: none;
+  padding-left: .4em;
 }
 
 #gOrganizeProgressDialog {
@@ -148,7 +153,7 @@
 }
 
 #gOrganizeEditDrawerPanel {
-  background-color: #CFDEFF;
+  background-color: #fff;
   border: 1px solid #13A;
   display: none;
   min-height: 150px; 
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 606320b1..b3aa523d 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -109,7 +109,7 @@ var treeDroppable =  {
     $("#gDragHelper").hide();
     var targetItemId = $(this).attr("ref");
     if ($(this).hasClass("gBranchSelected")) {
-      $("#gOrganizeStatus").empty().append(INVALID_DROP_TARGET);
+      $("#gMessage").empty().append(INVALID_DROP_TARGET);
       ui.draggable.trigger("stop", event);
       return false;
     }
@@ -119,7 +119,7 @@ var treeDroppable =  {
       okToMove &= targetItemId != $(this).attr("ref");
     });
     if (!okToMove) {
-      $("#gOrganizeStatus").empty().append(INVALID_DROP_TARGET);
+      $("#gMessage").empty().append(INVALID_DROP_TARGET);
       ui.draggable.trigger("stop", event);
       return false;
     }
@@ -277,7 +277,7 @@ var operationCallback = function (data, textStatus) {
       success: function(data, textStatus) {
         setDrawerButtonState();
         task = null;
-        $("#gOrganizeStatus").empty().append("<div class='gSuccess'>" + data.task.status + "</div>");
+        $("#gMessage").empty().append("<div class='gSuccess'>" + data.task.status + "</div>");
       },
       dataType: "json",
       type: "POST",
@@ -433,13 +433,13 @@ function createProgressDialog(title) {
     $("#gOrganizeTaskPause").hide();
     $("#gOrganizeTaskResume").show();
     $("#gOrganizeTaskCancel").show();
-    $("#gOrganizeStatus").empty().append(task.pauseMsg);
+    $("#gMessage").empty().append(task.pauseMsg);
   });
   $("#gOrganizeTaskResume").click(function(event) {
     $("#gOrganizeTaskPause").show();
     $("#gOrganizeTaskResume").hide();
     $("#gOrganizeTaskCancel").hide();
-    $("#gOrganizeStatus").empty().append(task.resumeMsg);
+    $("#gMessage").empty().append(task.resumeMsg);
     operationCallback();
     //startRearrangeCallback();
   });
@@ -453,7 +453,7 @@ function createProgressDialog(title) {
         task = null;
         paused = false;
         transitItems = [];
-        $("#gOrganizeStatus").empty().append("<div class='gWarning'>" + data.task.status + "</div>");
+        $("#gMessage").empty().append("<div class='gWarning'>" + data.task.status + "</div>");
         $("#gOrganizeProgressDialog").dialog("destroy").remove();
       },
       dataType: "json",
diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php
index 1b4a130a..c4247561 100644
--- a/modules/organize/views/organize.html.php
+++ b/modules/organize/views/organize.html.php
@@ -24,7 +24,7 @@
       <div class="yui-u first">
         <h3><?= t("Albums") ?></h3>
       </div>
-      <div id="gOrganizeStatus" class="yui-u">
+      <div id="gMessage" 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>