From 395d25158f5c02496d41b2a4a7efedc749758bcf Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 10 Oct 2012 16:26:32 +0100 Subject: [PATCH 1/8] CC-4545: Fix tooltip for Auto Switch On feature --- airtime_mvc/public/js/airtime/preferences/streamsetting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 45e91eed0..35f7b373e 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -313,7 +313,7 @@ $(document).ready(function() { $("#auto_switch_help").qtip({ content: { - text: "Check this box to automatically switch on Master/Show source upon source disconnection." + text: "Check this box to automatically switch on Master/Show source upon source connection." }, hide: { delay: 500, From 2fbd8e868b251f2f6271fbdf69c1a9e2c55f9c4f Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 10 Oct 2012 14:22:09 -0400 Subject: [PATCH 2/8] CC-4547: Calendar: Create record & rebroadcast show will be blocked by "overlapping error" -fixed --- airtime_mvc/application/forms/AddShowWhen.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php index ffad27fea..86018ff1a 100644 --- a/airtime_mvc/application/forms/AddShowWhen.php +++ b/airtime_mvc/application/forms/AddShowWhen.php @@ -243,7 +243,9 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm $minutes = "0"; $durationToAdd = "PT".$hours."H"; } - + + if (empty($formData["add_show_rebroadcast_date_absolute_".$i])) break; + $abs_rebroadcast_start = $formData["add_show_rebroadcast_date_absolute_".$i]." ". $formData["add_show_rebroadcast_time_absolute_".$i]; $rebroadcastShowStart = new DateTime($abs_rebroadcast_start); From c95050c04c97ee53c975ac6a06dc166edfd7cc10 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 10 Oct 2012 15:06:30 -0400 Subject: [PATCH 3/8] CC-4546: Library->Context view for playlist: It only displays "..." instead of Static smart block's name -fixed --- airtime_mvc/application/controllers/PlaylistController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 0d7a34f7f..2cca81ac2 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -436,7 +436,7 @@ class PlaylistController extends Zend_Controller_Action try { $obj = $this->getPlaylist($type); - $obj->setName($name); + $obj->setName(trim($name)); $obj->setDescription($description); $this->view->description = $description; $this->view->playlistName = $name; From 5f35336fd08a72fa535ca99cd07d1e638a69d02d Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 11 Oct 2012 11:49:04 -0400 Subject: [PATCH 4/8] CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values: -fixed --- airtime_mvc/application/models/Block.php | 16 ++++++++++++---- airtime_mvc/application/models/Playlist.php | 14 +++++++++++--- airtime_mvc/public/js/airtime/library/spl.js | 16 ++++++++-------- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index fa305a90a..4d62b8329 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -229,10 +229,17 @@ SQL; $formatter = new LengthFormatter($offset_cliplength); $row['offset'] = $formatter->format(); - //format the fades in format 00(.000000) + //format the fades in format 00(.0) $fades = $this->getFadeInfo($row['position']); $row['fadein'] = $fades[0]; $row['fadeout'] = $fades[1]; + + // format the cues in format 00:00:00(.0) + // we need to add the '.0' for cues and not fades + // because propel takes care of this for us + // (we use propel to fetch the fades) + $row['cuein'] = str_pad(substr($row['cuein'], 0, 10), 10, '.0'); + $row['cueout'] = str_pad(substr($row['cueout'], 0, 10), 10, '.0'); //format original length $formatter = new LengthFormatter($row['orig_length']); @@ -611,9 +618,10 @@ SQL; - #Propel returns values in form 00.000000 format which is for only seconds. - $fadeIn = $row->getDbFadein(); - $fadeOut = $row->getDbFadeout(); + //Propel returns values in form 00.000000 format which is for only seconds. + //We only want to display 1 decimal + $fadeIn = substr($row->getDbFadein(), 0, 4); + $fadeOut = substr($row->getDbFadeout(), 0, 4); return array($fadeIn, $fadeOut); } diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 021783c49..c99fbb019 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -244,6 +244,13 @@ SQL; $fades = $this->getFadeInfo($row['position']); $row['fadein'] = $fades[0]; $row['fadeout'] = $fades[1]; + + // format the cues in format 00:00:00(.0) + // we need to add the '.0' for cues and not fades + // because propel takes care of this for us + // (we use propel to fetch the fades) + $row['cuein'] = str_pad(substr($row['cuein'], 0, 10), 10, '.0'); + $row['cueout'] = str_pad(substr($row['cueout'], 0, 10), 10, '.0'); //format original length $formatter = new LengthFormatter($row['orig_length']); @@ -585,9 +592,10 @@ SQL; if (!$row) { return NULL; } - #Propel returns values in form 00.000000 format which is for only seconds. - $fadeIn = $row->getDbFadein(); - $fadeOut = $row->getDbFadeout(); + //Propel returns values in form 00.000000 format which is for only seconds. + //We only want to display 1 decimal + $fadeIn = substr($row->getDbFadein(), 0, 4); + $fadeOut = substr($row->getDbFadeout(), 0, 4); return array($fadeIn, $fadeOut); } diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 2513f97d9..a5937820d 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -18,13 +18,13 @@ var AIRTIME = (function(AIRTIME){ function isTimeValid(time) { //var regExpr = new RegExp("^\\d{2}[:]\\d{2}[:]\\d{2}([.]\\d{1,6})?$"); - var regExpr = new RegExp("^\\d{2}[:]([0-5]){1}([0-9]){1}[:]([0-5]){1}([0-9]){1}([.]\\d{1,6})?$"); + var regExpr = new RegExp("^\\d{2}[:]([0-5]){1}([0-9]){1}[:]([0-5]){1}([0-9]){1}([.]\\d{1})?$"); return regExpr.test(time); } function isFadeValid(fade) { - var regExpr = new RegExp("^\\d{1}(\\d{1})?([.]\\d{1,6})?$"); + var regExpr = new RegExp("^\\d{1}(\\d{1})?([.]\\d{1})?$"); return regExpr.test(fade); } @@ -74,7 +74,7 @@ var AIRTIME = (function(AIRTIME){ type = $('#obj_type').val(); if (!isTimeValid(cueIn)){ - showError(span, "please put in a time '00:00:00 (.000000)'"); + showError(span, "please put in a time '00:00:00 (.0)'"); return; } $.post(url, @@ -111,7 +111,7 @@ var AIRTIME = (function(AIRTIME){ type = $('#obj_type').val(); if (!isTimeValid(cueOut)){ - showError(span, "please put in a time '00:00:00 (.000000)'"); + showError(span, "please put in a time '00:00:00 (.0)'"); return; } @@ -150,7 +150,7 @@ var AIRTIME = (function(AIRTIME){ type = $('#obj_type').val(); if (!isFadeValid(fadeIn)){ - showError(span, "please put in a time in seconds '00 (.000000)'"); + showError(span, "please put in a time in seconds '00 (.0)'"); return; } @@ -188,7 +188,7 @@ var AIRTIME = (function(AIRTIME){ type = $('#obj_type').val(); if (!isFadeValid(fadeOut)){ - showError(span, "please put in a time in seconds '00 (.000000)'"); + showError(span, "please put in a time in seconds '00 (.0)'"); return; } @@ -545,7 +545,7 @@ var AIRTIME = (function(AIRTIME){ type = $('#obj_type').val(); if (!isFadeValid(fadeIn)){ - showError(span, "please put in a time in seconds '00 (.000000)'"); + showError(span, "please put in a time in seconds '00 (.0)'"); return; } @@ -569,7 +569,7 @@ var AIRTIME = (function(AIRTIME){ type = $('#obj_type').val(); if (!isFadeValid(fadeOut)){ - showError(span, "please put in a time in seconds '00 (.000000)'"); + showError(span, "please put in a time in seconds '00 (.0)'"); return; } From 843a456b3b573eba5bdd86a2d9248944313c530e Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 11 Oct 2012 17:03:09 +0100 Subject: [PATCH 5/8] CC-4552: Fixed various errors in Support Feedback page --- .../views/scripts/form/support-setting.phtml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml index 46b93bb6c..247fc2cf2 100644 --- a/airtime_mvc/application/views/scripts/form/support-setting.phtml +++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml @@ -3,9 +3,9 @@
- Help Airtime improve by letting us know how you are using it. This info - will be collected regularly in order to enhance your user experience.

- Click "Yes, help Airtime" and we'll make sure the features you use are + Help Airtime improve by letting Sourcefabric know how you are using it. This information + will be collected regularly in order to enhance your user experience.
+ Click the "Send support feedback" box and we'll make sure the features you use are constantly improving.
-
Click the box below to advertise your station on - Sourcefabric.org. - In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.
+
Click the box below to promote your station on + Sourcefabric.org. +
-

Note: In order to promote your station, "Send support feedback" must be enabled

+
(In order to promote your station, "Send support feedback" must be enabled).
;">
@@ -179,7 +179,7 @@ - Terms and Conditions + Sourcefabric Privacy Policy From 5c0bdfa2db968134a6d48e7d15cff97164bfbbe0 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 11 Oct 2012 12:11:53 -0400 Subject: [PATCH 6/8] CC-4544: Playlist/Smart Blocks: Add cue format helper -done --- .../application/views/scripts/playlist/playlist.phtml | 4 ++-- airtime_mvc/application/views/scripts/playlist/set-cue.phtml | 4 ++-- .../application/views/scripts/playlist/set-fade.phtml | 4 ++-- .../application/views/scripts/playlist/smart-block.phtml | 4 ++-- airtime_mvc/public/css/playlist_builder.css | 5 +++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index 4ae48b038..6f962b97b 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -57,10 +57,10 @@ if (isset($this->obj)) {