From 7c799cd3af3ae955ebe93ed3026ccc2d173eb1ed Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 18 Oct 2012 13:01:55 +0100 Subject: [PATCH 1/4] Fixed formatting of tooltip for smart blocks --- airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index 9862eb48e..0dc3bc0a9 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -363,7 +363,7 @@ function setupUI() { $(".playlist_type_help_icon").qtip({ content: { - text: "A static smart block will save the criteria and generate the block content immediately." + + text: "A static smart block will save the criteria and generate the block content immediately. " + "This allows you to edit and view it in the Library before adding it to a show.

" + "A dynamic smart block will only save the criteria. The block content will get generated upon " + "adding it to a show. You will not be able to view and edit the content in the Library." From 887a86c6a16aea01e4a14ae6e88a33a3ac44372f Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 18 Oct 2012 10:51:24 -0400 Subject: [PATCH 2/4] CC-4591: Calendar: Cannot change start time for repeating show -fixed --- airtime_mvc/application/forms/AddShowWhen.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php index a3d445796..1ed9d2619 100644 --- a/airtime_mvc/application/forms/AddShowWhen.php +++ b/airtime_mvc/application/forms/AddShowWhen.php @@ -179,7 +179,14 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm /* Check first show * Continue if the first show does not overlap */ - $overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end, $update, $instanceId); + if ($update) { + $overlapping = Application_Model_Schedule::checkOverlappingShows( + $show_start, $show_end, $update, null, $formData["add_show_id"]); + } else { + $overlapping = Application_Model_Schedule::checkOverlappingShows( + $show_start, $show_end); + } + //$overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end, $update, $instanceId); /* Check if repeats overlap with previously scheduled shows * Do this for each show day From dc7b60911555ef4f9ffbb860c79d77bf4d5db9f6 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 18 Oct 2012 16:12:51 +0100 Subject: [PATCH 3/4] CC-4593: Widen container in CSS so label is not truncated --- airtime_mvc/public/css/playlist_builder.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index ea8a35586..43b942a7f 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -85,7 +85,7 @@ font-size: 9px; height: 15px; /*right: 35px;*/ - width: 120px; + width: 124px; margin-top: 2px; cursor: pointer; color: #fff; @@ -584,4 +584,4 @@ li.spl_empty { } .expand-block-separate { border-top: 1px solid #5B5B5B; -} \ No newline at end of file +} From 6c8c7aa2855f9f55a68aee71e8f03af8c0143621 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 18 Oct 2012 12:09:48 -0400 Subject: [PATCH 4/4] CC-4592: Library: Changing fades does not save microseconds -fixed --- .../application/models/airtime/CcBlockcontents.php | 14 +++++++++++--- .../models/airtime/CcPlaylistcontents.php | 12 ++++++++++-- .../application/models/airtime/CcSchedule.php | 13 +++++++++++-- .../propel/airtime/CcPlaylistcontents.php | 12 ++++++++++-- .../airtime-2.1.0/propel/airtime/CcSchedule.php | 12 ++++++++++-- 5 files changed, 52 insertions(+), 11 deletions(-) diff --git a/airtime_mvc/application/models/airtime/CcBlockcontents.php b/airtime_mvc/application/models/airtime/CcBlockcontents.php index 7c307610a..caae46f6a 100644 --- a/airtime_mvc/application/models/airtime/CcBlockcontents.php +++ b/airtime_mvc/application/models/airtime/CcBlockcontents.php @@ -63,7 +63,11 @@ class CcBlockcontents extends BaseCcBlockcontents { } } - $this->fadein = $dt->format('H:i:s').".".$microsecond; + if ($microsecond == 0) { + $this->fadein = $dt->format('H:i:s.u'); + } else { + $this->fadein = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcBlockcontentsPeer::FADEIN; return $this; @@ -95,8 +99,12 @@ class CcBlockcontents extends BaseCcBlockcontents { throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x); } } - - $this->fadeout = $dt->format('H:i:s').".".$microsecond; + + if ($microsecond == 0) { + $this->fadeout = $dt->format('H:i:s.u'); + } else { + $this->fadeout = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcBlockcontentsPeer::FADEOUT; return $this; diff --git a/airtime_mvc/application/models/airtime/CcPlaylistcontents.php b/airtime_mvc/application/models/airtime/CcPlaylistcontents.php index 1b0abe796..ab0aa6d56 100644 --- a/airtime_mvc/application/models/airtime/CcPlaylistcontents.php +++ b/airtime_mvc/application/models/airtime/CcPlaylistcontents.php @@ -62,7 +62,11 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents { } } - $this->fadein = $dt->format('H:i:s').".".$microsecond; + if ($microsecond == 0) { + $this->fadein = $dt->format('H:i:s.u'); + } else { + $this->fadein = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN; return $this; @@ -95,7 +99,11 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents { } } - $this->fadeout = $dt->format('H:i:s').".".$microsecond; + if ($microsecond == 0) { + $this->fadeout = $dt->format('H:i:s.u'); + } else { + $this->fadeout = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT; return $this; diff --git a/airtime_mvc/application/models/airtime/CcSchedule.php b/airtime_mvc/application/models/airtime/CcSchedule.php index 4230c54b8..e051df6c3 100644 --- a/airtime_mvc/application/models/airtime/CcSchedule.php +++ b/airtime_mvc/application/models/airtime/CcSchedule.php @@ -125,7 +125,12 @@ class CcSchedule extends BaseCcSchedule { throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x); } } - $this->fade_in = $dt->format('H:i:s').".".$microsecond; + + if ($microsecond == 0) { + $this->fadein = $dt->format('H:i:s.u'); + } else { + $this->fadein = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcSchedulePeer::FADE_IN; return $this; @@ -158,7 +163,11 @@ class CcSchedule extends BaseCcSchedule { } } - $this->fade_in = $dt->format('H:i:s').".".$microsecond; + if ($microsecond == 0) { + $this->fadeout = $dt->format('H:i:s.u'); + } else { + $this->fadeout = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcSchedulePeer::FADE_OUT; return $this; diff --git a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php index 1b0abe796..ab0aa6d56 100644 --- a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php +++ b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcPlaylistcontents.php @@ -62,7 +62,11 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents { } } - $this->fadein = $dt->format('H:i:s').".".$microsecond; + if ($microsecond == 0) { + $this->fadein = $dt->format('H:i:s.u'); + } else { + $this->fadein = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN; return $this; @@ -95,7 +99,11 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents { } } - $this->fadeout = $dt->format('H:i:s').".".$microsecond; + if ($microsecond == 0) { + $this->fadeout = $dt->format('H:i:s.u'); + } else { + $this->fadeout = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT; return $this; diff --git a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php index 6108e48af..b411d410e 100644 --- a/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php +++ b/install_minimal/upgrades/airtime-2.1.0/propel/airtime/CcSchedule.php @@ -125,7 +125,11 @@ class CcSchedule extends BaseCcSchedule { throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x); } } - $this->fade_in = $dt->format('H:i:s').".".$microsecond; + if ($microsecond == 0) { + $this->fadein = $dt->format('H:i:s.u'); + } else { + $this->fadein = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcSchedulePeer::FADE_IN; return $this; @@ -158,7 +162,11 @@ class CcSchedule extends BaseCcSchedule { } } - $this->fade_out = $dt->format('H:i:s').".".$microsecond; + if ($microsecond == 0) { + $this->fadeout = $dt->format('H:i:s.u'); + } else { + $this->fadeout = $dt->format('H:i:s').".".$microsecond; + } $this->modifiedColumns[] = CcSchedulePeer::FADE_OUT; return $this;