From 0f6a72f6f82e0eb68db5517f0dd8ab207b01fdb2 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 19 Apr 2012 12:51:36 -0400 Subject: [PATCH 1/7] CC-3668: Live stream player - volume control needs improved usability -fixed centered volume control --- .../public/js/jplayer/skin/jplayer.blue.monday.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css b/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css index 293dbaef0..7dea2f6fa 100644 --- a/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css +++ b/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css @@ -287,15 +287,15 @@ a.jp-mute, a.jp-unmute, a.jp-volume-max { } div.jp-audio div.jp-type-single a.jp-mute{ top: 15px; - left: 102px; + left: 106px; } div.jp-audio div.jp-type-single a.jp-unmute { top: 15px; - left: 90px; + left: 95px; } div.jp-audio div.jp-type-playlist a.jp-mute, div.jp-audio div.jp-type-playlist a.jp-unmute { top: 32px; - left: 296px; + left: 297px; } div.jp-video a.jp-mute, div.jp-video a.jp-unmute { top: 27px; @@ -351,7 +351,7 @@ div.jp-volume-bar { } div.jp-audio div.jp-type-single div.jp-volume-bar { top: 24px; - left: 120px; + left: 125px; } div.jp-audio div.jp-type-playlist div.jp-volume-bar { top: 37px; From 636c40eb11aa014e81cc4c370e44d5653157020e Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 19 Apr 2012 18:23:30 -0400 Subject: [PATCH 2/7] CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata -fixed --- airtime_mvc/public/js/contextmenu/jquery.contextMenu.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/airtime_mvc/public/js/contextmenu/jquery.contextMenu.js b/airtime_mvc/public/js/contextmenu/jquery.contextMenu.js index 92153b0ca..ddc699160 100755 --- a/airtime_mvc/public/js/contextmenu/jquery.contextMenu.js +++ b/airtime_mvc/public/js/contextmenu/jquery.contextMenu.js @@ -306,6 +306,13 @@ var // currently active contextMenu trigger e.stopImmediatePropagation(); $this.remove(); root.$menu.trigger('contextmenu:hide'); + /* (Airtime) added this to allow user to exit out of menu + * if ignoreThisClick remains false, every right click + * thereafter continues to show the menu + */ + if (e.button == 2) { + ignoreThisClick = true; + } }, // key handled :hover keyStop: function(e, opt) { From 6b4fd7d3bb46fe536474cfdf910bf100854ed9be Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Fri, 20 Apr 2012 13:03:50 +0200 Subject: [PATCH 3/7] CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline --- .../controllers/UsersettingsController.php | 4 ++-- airtime_mvc/application/models/Schedule.php | 3 ++- .../application/models/ShowBuilder.php | 22 ++++++++++++++++++- .../public/js/airtime/showbuilder/builder.js | 21 +++++++++++++++++- 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/controllers/UsersettingsController.php b/airtime_mvc/application/controllers/UsersettingsController.php index 00c3bb5ec..2260d0400 100644 --- a/airtime_mvc/application/controllers/UsersettingsController.php +++ b/airtime_mvc/application/controllers/UsersettingsController.php @@ -11,9 +11,9 @@ class UsersettingsController extends Zend_Controller_Action ->addActionContext('get-library-datatable', 'json') ->addActionContext('set-library-datatable', 'json') ->addActionContext('get-timeline-datatable', 'json') - ->addActionContext('set-timeline-datatable', 'json') - ->addActionContext('register', 'json') + ->addActionContext('set-timeline-datatable', 'json') ->addActionContext('remindme', 'json') + ->addActionContext('donotshowregistrationpopup', 'json') ->initContext(); } diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 4f5983a35..8320b1e99 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -244,7 +244,8 @@ class Application_Model_Schedule { showt.background_color AS show_background_color, showt.id AS show_id, si.starts AS si_starts, si.ends AS si_ends, si.time_filled AS si_time_filled, - si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.id AS si_id, si.last_scheduled AS si_last_scheduled, + si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.instance_id AS parent_show, + si.id AS si_id, si.last_scheduled AS si_last_scheduled, sched.starts AS sched_starts, sched.ends AS sched_ends, sched.id AS sched_id, sched.cue_in AS cue_in, sched.cue_out AS cue_out, diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index 1d1b05817..2d157c208 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -159,6 +159,22 @@ class Application_Model_ShowBuilder { $showEndDT->setTimezone(new DateTimeZone($this->timezone)); $endsEpoch = floatval($showEndDT->format("U.u")); + //is a rebroadcast show + if (intval($p_item["si_rebroadcast"]) === 1) { + $row["rebroadcast"] = true; + + $parentInstance = CcShowInstancesQuery::create()->findPk($p_item["parent_show"]); + $name = $parentInstance->getCcShow()->getDbName(); + $dt = $parentInstance->getDbStarts(null); + $dt->setTimezone(new DateTimeZone($this->timezone)); + $time = $dt->format("Y-m-d H:i"); + + $row["rebroadcast_title"] = "Rebroadcast of {$name} from {$time}"; + } + else if (intval($p_item["si_record"]) === 1) { + $row["record"] = true; + } + if ($startsEpoch < $this->epoch_now && $endsEpoch > $this->epoch_now) { $row["currentShow"] = true; $this->currentShow = true; @@ -238,7 +254,11 @@ class Application_Model_ShowBuilder { $row["id"] = 0 ; $row["instance"] = intval($p_item["si_id"]); } - + + if (intval($p_item["si_rebroadcast"]) === 1) { + $row["record"] = true; + } + if ($this->currentShow = true) { $row["currentShow"] = true; } diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 5b7fdada6..47e8f4c69 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -228,7 +228,8 @@ var AIRTIME = (function(AIRTIME){ //background-color to imitate calendar color. r,g,b,a, $nRow = $(nRow), - $image; + $image, + $div; fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) { @@ -252,7 +253,25 @@ var AIRTIME = (function(AIRTIME){ node.innerHTML = ''; cl = 'sb-header'; + if (aData.record === true) { + $div = $("
", { + "class": "small-icon recording" + }); + $(node).append($div); + } + else if(aData.rebroadcast === true) { + $div = $("
", { + "class": "small-icon rebroadcast" + }); + $(node).append($div); + } + sSeparatorHTML = ''+aData.title+''; + + if (aData.rebroadcast === true) { + sSeparatorHTML += ''+aData.rebroadcast_title+''; + } + sSeparatorHTML += ''; if (aData.startDate === aData.endDate) { From 9afdbe2fbcabfcf9400e4b390f6788b26d664672 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 20 Apr 2012 10:03:12 -0400 Subject: [PATCH 4/7] CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata -consider it wrapped --- airtime_mvc/public/js/contextmenu/jquery.contextMenu.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/js/contextmenu/jquery.contextMenu.js b/airtime_mvc/public/js/contextmenu/jquery.contextMenu.js index ddc699160..4f97a0dc3 100755 --- a/airtime_mvc/public/js/contextmenu/jquery.contextMenu.js +++ b/airtime_mvc/public/js/contextmenu/jquery.contextMenu.js @@ -306,12 +306,14 @@ var // currently active contextMenu trigger e.stopImmediatePropagation(); $this.remove(); root.$menu.trigger('contextmenu:hide'); - /* (Airtime) added this to allow user to exit out of menu + /* (Airtime) added this to allow user to exit out of menu. * if ignoreThisClick remains false, every right click * thereafter continues to show the menu */ - if (e.button == 2) { - ignoreThisClick = true; + if (ignoreRightClick) { + if (e.button == 2) { + ignoreThisClick = true; + } } }, // key handled :hover From d5a416be43a2eb5c9b89195370feb0dd9658e5db Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Fri, 20 Apr 2012 16:10:27 +0200 Subject: [PATCH 5/7] CC-3416 : Create password reset form --- .../application/controllers/LoginController.php | 4 ++-- airtime_mvc/application/models/Auth.php | 2 ++ .../views/scripts/form/password-change.phtml | 15 +++++++++++++++ .../views/scripts/form/password-restore.phtml | 7 +++++++ .../scripts/login/password-restore-after.phtml | 2 +- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php index fee77faac..043983ede 100644 --- a/airtime_mvc/application/controllers/LoginController.php +++ b/airtime_mvc/application/controllers/LoginController.php @@ -115,7 +115,7 @@ class LoginController extends Zend_Controller_Action $auth = new Application_Model_Auth(); $auth->sendPasswordRestoreLink($user, $this->view); - $this->_helper->redirector('password-restore-after', 'auth'); + $this->_helper->redirector('password-restore-after', 'login'); } else { $form->email->addError($this->view->translate("Given email not found.")); @@ -146,7 +146,7 @@ class LoginController extends Zend_Controller_Action //check validity of token if (!$auth->checkToken($user_id, $token, 'password.restore')) { - echo "token not valid"; + Logging::debug("token not valid"); $this->_helper->redirector('index', 'login'); } diff --git a/airtime_mvc/application/models/Auth.php b/airtime_mvc/application/models/Auth.php index 6e5cdb62c..fa2ab8bd3 100644 --- a/airtime_mvc/application/models/Auth.php +++ b/airtime_mvc/application/models/Auth.php @@ -16,6 +16,8 @@ class Application_Model_Auth { $info->setDbCreated(gmdate('Y-m-d H:i:s')); $info->save(); + Logging::debug("generated token {$token}"); + return $token; } diff --git a/airtime_mvc/application/views/scripts/form/password-change.phtml b/airtime_mvc/application/views/scripts/form/password-change.phtml index fdd380884..8214e67a5 100644 --- a/airtime_mvc/application/views/scripts/form/password-change.phtml +++ b/airtime_mvc/application/views/scripts/form/password-change.phtml @@ -8,6 +8,14 @@
element->getElement('password') ?>
+ element->getElement('password')->hasErrors()): ?> +
    + element->getElement('password')->getMessages() as $error): ?> +
    • + +
+ +
element->getElement('password_confirm') ?>
+ element->getElement('password_confirm')->hasErrors()): ?> +
    + element->getElement('password_confirm')->getMessages() as $error): ?> +
    • + +
+
 
diff --git a/airtime_mvc/application/views/scripts/form/password-restore.phtml b/airtime_mvc/application/views/scripts/form/password-restore.phtml index ce8d84edd..5c8d099ac 100644 --- a/airtime_mvc/application/views/scripts/form/password-restore.phtml +++ b/airtime_mvc/application/views/scripts/form/password-restore.phtml @@ -8,6 +8,13 @@
element->getElement('email') ?>
+ element->getElement('email')->hasErrors()): ?> +
    + element->getElement('email')->getMessages() as $error): ?> +
    • + +
+
 
diff --git a/airtime_mvc/application/views/scripts/login/password-restore-after.phtml b/airtime_mvc/application/views/scripts/login/password-restore-after.phtml index c99394212..5577d3a65 100644 --- a/airtime_mvc/application/views/scripts/login/password-restore-after.phtml +++ b/airtime_mvc/application/views/scripts/login/password-restore-after.phtml @@ -3,6 +3,6 @@

Email sent

From 4fcb4a530f6cda910cf808510dc4a1fbe214c224 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 20 Apr 2012 10:21:14 -0400 Subject: [PATCH 6/7] CC-3330: Regression in library behavior: left click anywhere in a row should bring up menu, right click anywhere in row should bring up metadata -added README for jquery.contextMenu.js bug fix --- .../public/js/contextmenu/AIRTIME_DEV_README | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 airtime_mvc/public/js/contextmenu/AIRTIME_DEV_README diff --git a/airtime_mvc/public/js/contextmenu/AIRTIME_DEV_README b/airtime_mvc/public/js/contextmenu/AIRTIME_DEV_README new file mode 100644 index 000000000..d10d53c7b --- /dev/null +++ b/airtime_mvc/public/js/contextmenu/AIRTIME_DEV_README @@ -0,0 +1,23 @@ +Before you overwrite jquery.contextMenu.js, note that we have changed a few lines +in this file. + +denise@denise-DX4860:~/airtime/airtime_mvc/public/js/contextmenu$ diff -u jquery.contextMenu_orig.js jquery.contextMenu.js +--- jquery.contextMenu_orig.js 2012-04-20 10:15:59.943215571 -0400 ++++ jquery.contextMenu.js 2012-04-20 10:00:18.911178927 -0400 +@@ -306,6 +306,15 @@ + e.stopImmediatePropagation(); + $this.remove(); + root.$menu.trigger('contextmenu:hide'); ++ /* (Airtime) added this to allow user to exit out of menu. ++ * if ignoreThisClick remains false, every right click ++ * thereafter continues to show the menu ++ */ ++ if (ignoreRightClick) { ++ if (e.button == 2) { ++ ignoreThisClick = true; ++ } ++ } + }, + // key handled :hover + keyStop: function(e, opt) { + From c1a6202da87073ef75682f1dc123604f5e65b537 Mon Sep 17 00:00:00 2001 From: James Date: Fri, 20 Apr 2012 10:56:51 -0400 Subject: [PATCH 7/7] CC-3630: Deleting files from organize folder if they don't have correct Meta data - done --- .../airtimefilemonitor/airtimeprocessevent.py | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index 40022f571..e1e847b41 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py @@ -142,8 +142,15 @@ class AirtimeProcessEvent(ProcessEvent): #delete files from organize if they can not be read properly. if pathname is None: - os.remove(oldPath) - return + try: + self.logger.info("Deleting file because it cannot be read properly: %s", oldPath) + os.remove(oldPath) + return + except Exception, e: + import traceback + top = traceback.format_exc() + self.logger.error('Exception: %s', e) + self.logger.error("traceback: %s", top) self.mmc.set_needed_file_permissions(pathname, dir) is_recorded = self.mmc.is_parent_directory(pathname, self.config.recorded_directory) @@ -245,7 +252,14 @@ class AirtimeProcessEvent(ProcessEvent): #delete files from organize if they can not be read properly. if filepath is None: - os.remove(event.pathname) + try: + self.logger.info("Deleting file because it cannot be read properly: %s", event.pathname) + os.remove(event.pathname) + except Exception, e: + import traceback + top = traceback.format_exc() + self.logger.error('Exception: %s', e) + self.logger.error("traceback: %s", top) else: filepath = event.pathname @@ -258,7 +272,14 @@ class AirtimeProcessEvent(ProcessEvent): #delete files from organize if they can not be read properly. if filepath is None: - os.remove(event.pathname) + try: + self.logger.info("Deleting file because it cannot be read properly: %s", event.pathname) + os.remove(event.pathname) + except Exception, e: + import traceback + top = traceback.format_exc() + self.logger.error('Exception: %s', e) + self.logger.error("traceback: %s", top) else: #show dragged from unwatched folder into a watched folder. Do not "organize".:q! if self.mmc.is_parent_directory(event.pathname, self.config.recorded_directory):