From d9a42c4e4028dc6ef7b3e13af92930499acf75f7 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 27 Mar 2012 17:47:21 +0200 Subject: [PATCH 1/3] CC-3463 : Usability improvements for timeline --- .../public/js/airtime/showbuilder/builder.js | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 1b2349faa..3b44fbe7e 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -786,18 +786,21 @@ var AIRTIME = (function(AIRTIME){ ignoreRightClick: true, build: function($el, e) { - var data, items, callback, $tr; - - $tr = $el.parent(); - data = $tr.data("aData"); - + var items, + $tr = $el.parent(), + data = $tr.data("aData"), + cursorClass = "cursor-selected-row", + callback; + function processMenuItems(oItems) { + $lib = $("#library_content"); + //define a select cursor. if (oItems.selCurs !== undefined) { callback = function() { - $(this).parents('tr').next().addClass("cursor-selected-row"); + $(this).parents('tr').next().addClass(cursorClass); }; oItems.selCurs.callback = callback; @@ -807,7 +810,7 @@ var AIRTIME = (function(AIRTIME){ if (oItems.delCurs !== undefined) { callback = function() { - $(this).parents('tr').next().removeClass("cursor-selected-row"); + $(this).parents('tr').next().removeClass(cursorClass); }; oItems.delCurs.callback = callback; @@ -826,6 +829,21 @@ var AIRTIME = (function(AIRTIME){ oItems.del.callback = callback; } + + //only show the cursor selecting options if the library is visible on the page. + if ($lib.filter(":visible").length === 0) { + delete oItems.selCurs; + delete oItems.delCurs; + } + else { + //check to include either select or remove cursor. + if ($tr.next().hasClass(cursorClass)) { + delete oItems.selCurs; + } + else { + delete oItems.delCurs; + } + } items = oItems; } From c1bdc6ff0fbafca96b66891aad5ea865bc3a752f Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 27 Mar 2012 18:27:58 +0200 Subject: [PATCH 2/3] CC-3463 : Usability improvements for timeline working on timeline context menu. cursor/play functions. --- .../controllers/ShowbuilderController.php | 8 +++-- .../public/js/airtime/showbuilder/builder.js | 36 ++++++++++++------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index ab16fdea9..efd2a3314 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -110,12 +110,14 @@ class ShowbuilderController extends Zend_Controller_Action $item = CcScheduleQuery::create()->findPK($id); $instance = $item->getCcShowInstances(); + + $menu["preview"] = array("name"=> "Play"); + //select the cursor + $menu["selCurs"] = array("name"=> "Select Cursor"); + $menu["delCurs"] = array("name"=> "Remove Cursor"); if ($now < floatval($item->getDbEnds("U.u")) && $user->canSchedule($instance->getDbShowId())) { - //select the cursor - $menu["selCurs"] = array("name"=> "Select Cursor"); - $menu["delCurs"] = array("name"=> "Remove Cursor"); //remove/truncate the item from the schedule $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => "/showbuilder/schedule-remove"); } diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 3b44fbe7e..7f4ba92a6 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -794,9 +794,17 @@ var AIRTIME = (function(AIRTIME){ function processMenuItems(oItems) { - $lib = $("#library_content"); - - //define a select cursor. + //define a preview callback. + if (oItems.preview !== undefined) { + + callback = function() { + open_show_preview(data.instance, data.pos); + }; + + oItems.preview.callback = callback; + } + + //define a select cursor callback. if (oItems.selCurs !== undefined) { callback = function() { @@ -806,7 +814,7 @@ var AIRTIME = (function(AIRTIME){ oItems.selCurs.callback = callback; } - //define a remove cursor. + //define a remove cursor callback. if (oItems.delCurs !== undefined) { callback = function() { @@ -820,30 +828,32 @@ var AIRTIME = (function(AIRTIME){ if (oItems.del !== undefined) { callback = function() { - AIRTIME.showbuilder.fnRemove([{ - id: data.id, - timestamp: data.timestamp, - instance: data.instance - }]); + if (confirm("")) { + AIRTIME.showbuilder.fnRemove([{ + id: data.id, + timestamp: data.timestamp, + instance: data.instance + }]); + } }; oItems.del.callback = callback; } //only show the cursor selecting options if the library is visible on the page. - if ($lib.filter(":visible").length === 0) { + if ($tr.next().find('.marker').length === 0) { delete oItems.selCurs; delete oItems.delCurs; } + //check to include either select or remove cursor. else { - //check to include either select or remove cursor. - if ($tr.next().hasClass(cursorClass)) { + if ($tr.next().hasClass(cursorClass)) { delete oItems.selCurs; } else { delete oItems.delCurs; } - } + } items = oItems; } From 9dbe8a5e5e22b838ce1b3f6f6332dc5ebf56c9f6 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 27 Mar 2012 18:40:17 +0200 Subject: [PATCH 3/3] CC-3463 : Usability improvements for timeline --- airtime_mvc/application/controllers/ShowbuilderController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index efd2a3314..ab901ccd4 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -111,7 +111,7 @@ class ShowbuilderController extends Zend_Controller_Action $item = CcScheduleQuery::create()->findPK($id); $instance = $item->getCcShowInstances(); - $menu["preview"] = array("name"=> "Play"); + $menu["preview"] = array("name"=> "Preview"); //select the cursor $menu["selCurs"] = array("name"=> "Select Cursor"); $menu["delCurs"] = array("name"=> "Remove Cursor");