mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-08-22 06:46:05 -04:00
Set organize messages to use existing gMessage, added album cover message.
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user