Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3463 : Usability improvements for timeline 

working on timeline context menu.
cursor/play functions.
This commit is contained in:
Naomi Aro 2012-03-27 18:27:58 +02:00
parent d9a42c4e40
commit c1bdc6ff0f
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/application/controllers/ShowbuilderController.php
View File

@ -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");
}

36
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -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;
}