From f350ecbcf668f224bb7b98fa98a4d1179a03486e Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 1 Apr 2014 14:52:44 -0400 Subject: [PATCH] CC-5765 : Fixing up history page to match UI/UX --- .../controllers/PlayouthistoryController.php | 1 - .../js/airtime/playouthistory/historytable.js | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/PlayouthistoryController.php b/airtime_mvc/application/controllers/PlayouthistoryController.php index 9ced0cd49..79d60ac71 100644 --- a/airtime_mvc/application/controllers/PlayouthistoryController.php +++ b/airtime_mvc/application/controllers/PlayouthistoryController.php @@ -90,7 +90,6 @@ class PlayouthistoryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/TableTools-2.1.5/js/ZeroClipboard.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/TableTools-2.1.5/js/TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'js/timepicker/jquery.ui.timepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/historytable.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js index f69aca58a..2ba7e8f17 100644 --- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js +++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js @@ -803,11 +803,22 @@ var AIRTIME = (function(AIRTIME) { } }); + //shortcut to open edit dialog. + $historyContentDiv.on("dblclick", "tr", function(e) { + var editUrl = $(this).data('url-edit'); + + $.post(editUrl, {format: "json"}, function(json) { + + makeHistoryDialog(json.dialog); + + }, "json"); + }); + // begin context menu initialization. $.contextMenu({ selector: '#history_content td:not(.his_checkbox)', - trigger: "left", - ignoreRightClick: true, + trigger: "right", + ignoreRightClick: false, build: function($el, e) { var items = {},