diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 4b5a92320..d1ebe0721 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -263,9 +263,10 @@ class ScheduleController extends Zend_Controller_Action } } else { if($instance->isRepeating()){ - $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array()); + /*$menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array()); $menu["edit"]["items"]["instance"] = array("name"=> "Edit Show Instance", "icon" => "edit", "url" => "/Schedule/populate-show-instance-form"); - $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form"); + $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form");*/ + $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"all", "url" => "/Schedule/populate-show-form"); }else{ if($instance->isRebroadcast()){ $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"rebroadcast", "url" => "/Schedule/populate-show-form"); @@ -284,9 +285,10 @@ class ScheduleController extends Zend_Controller_Action if ($isAdminOrPM || $isDJ) { if($instance->isRepeating()){ - $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array()); + /*$menu["edit"] = array("name"=> "Edit", "icon" => "edit", "items" => array()); $menu["edit"]["items"]["instance"] = array("name"=> "Edit Show Instance", "icon" => "edit", "url" => "/Schedule/populate-show-instance-form"); - $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form"); + $menu["edit"]["items"]["all"] = array("name"=> "Edit Show", "icon" => "edit", "url" => "/Schedule/populate-show-form");*/ + $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"all", "url" => "/Schedule/populate-show-form"); }else{ if($instance->isRebroadcast()){ $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"rebroadcast", "url" => "/Schedule/populate-show-form"); @@ -439,7 +441,9 @@ class ScheduleController extends Zend_Controller_Action unset($this->view->showContent); } - public function populateShowInstanceFormAction(){ + // we removed edit show instance option in menu item + // this feature is disabled in 2.1 and should be back in 2.2 + /*public function populateShowInstanceFormAction(){ $formWhat = new Application_Form_AddShowWhat(); $formWho = new Application_Form_AddShowWho(); $formWhen = new Application_Form_AddShowWhen(); @@ -496,15 +500,15 @@ class ScheduleController extends Zend_Controller_Action $formRepeats->disable(); $formStyle->disable(); - /* - $formRecord->disable(); - $formAbsoluteRebroadcast->disable(); - $formRebroadcast->disable(); - */ + + //$formRecord->disable(); + //$formAbsoluteRebroadcast->disable(); + //$formRebroadcast->disable(); + $this->view->action = "edit-show-instance"; $this->view->newForm = $this->view->render('schedule/add-show-form.phtml'); - } + }*/ public function populateShowFormAction() { @@ -518,12 +522,12 @@ class ScheduleController extends Zend_Controller_Action // repeating shows. It's value is either "instance","rebroadcast", or "all" $type = $this->_getParam('type'); - if($type == "rebroadcast") { - $this->view->action = "edit-show-rebroadcast"; + /*if($type == "rebroadcast") { + //$this->view->action = "edit-show-rebroadcast"; } else { $this->view->action = "edit-show"; - } - + }*/ + $this->view->action = "edit-show"; try{ $showInstance = new Application_Model_ShowInstance($showInstanceId); }catch(Exception $e){ @@ -677,10 +681,6 @@ class ScheduleController extends Zend_Controller_Action $formRepeats->disable(); $formStyle->disable(); } - - if($type == "rebroadcast"){ - $formWhen->disable(); - } $this->view->newForm = $this->view->render('schedule/add-show-form.phtml'); $this->view->entries = 5; @@ -726,7 +726,7 @@ class ScheduleController extends Zend_Controller_Action $this->view->edit = true; } - public function editShowInstanceAction(){ + /*public function editShowInstanceAction(){ $js = $this->_getParam('data'); $data = array(); @@ -743,7 +743,7 @@ class ScheduleController extends Zend_Controller_Action $this->view->addNewShow = false; $this->view->form = $this->view->render('schedule/add-show-form.phtml'); } - } + }*/ public function editShowAction(){ @@ -775,6 +775,7 @@ class ScheduleController extends Zend_Controller_Action if (!array_key_exists('add_show_start_time', $data)){ $startTime = Application_Common_DateHelper::ConvertToLocalDateTime($show->getStartTime()); $data['add_show_start_time'] = $startTime->format("H:i"); + $validateStartTime = false; } $validateStartDate = false; } @@ -789,6 +790,9 @@ class ScheduleController extends Zend_Controller_Action if (!$validateStartDate){ $this->view->when->getElement('add_show_start_date')->setOptions(array('disabled' => true)); } + if(!$validateStartTime){ + $this->view->when->getElement('add_show_start_time')->setOptions(array('disabled' => true)); + } $this->view->rr->getElement('add_show_record')->setOptions(array('disabled' => true)); $this->view->addNewShow = false; $this->view->form = $this->view->render('schedule/add-show-form.phtml'); diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 015c12bcc..cb9a446e6 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1265,9 +1265,7 @@ class Application_Model_Show { Logging::log('$start time of non repeating record '.$start); - if ($newInstance){ - self::createRebroadcastInstances($rebroadcasts, $currentUtcTimestamp, $show_id, $show_instance_id, $start, $duration, $timezone); - } + self::createRebroadcastInstances($rebroadcasts, $currentUtcTimestamp, $show_id, $show_instance_id, $start, $duration, $timezone); } } diff --git a/airtime_mvc/application/models/airtime/map/CcShowTableMap.php b/airtime_mvc/application/models/airtime/map/CcShowTableMap.php index f0d7c84c3..713de40a9 100644 --- a/airtime_mvc/application/models/airtime/map/CcShowTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcShowTableMap.php @@ -45,8 +45,8 @@ class CcShowTableMap extends TableMap { $this->addColumn('DESCRIPTION', 'DbDescription', 'VARCHAR', false, 512, null); $this->addColumn('COLOR', 'DbColor', 'VARCHAR', false, 6, null); $this->addColumn('BACKGROUND_COLOR', 'DbBackgroundColor', 'VARCHAR', false, 6, null); - $this->addColumn('LIVE_STREAM_USING_AIRTIME_AUTH', 'DbLiveStreamUsingAirtimeAuth', 'BOOLEAN', false, null, null); - $this->addColumn('LIVE_STREAM_USING_CUSTOM_AUTH', 'DbLiveStreamUsingCustomAuth', 'BOOLEAN', false, null, null); + $this->addColumn('LIVE_STREAM_USING_AIRTIME_AUTH', 'DbLiveStreamUsingAirtimeAuth', 'BOOLEAN', false, null, false); + $this->addColumn('LIVE_STREAM_USING_CUSTOM_AUTH', 'DbLiveStreamUsingCustomAuth', 'BOOLEAN', false, null, false); $this->addColumn('LIVE_STREAM_USER', 'DbLiveStreamUser', 'VARCHAR', false, 255, null); $this->addColumn('LIVE_STREAM_PASS', 'DbLiveStreamPass', 'VARCHAR', false, 255, null); // validators diff --git a/airtime_mvc/application/models/airtime/om/BaseCcShow.php b/airtime_mvc/application/models/airtime/om/BaseCcShow.php index 78722b5ba..35f9798bb 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcShow.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcShow.php @@ -71,12 +71,14 @@ abstract class BaseCcShow extends BaseObject implements Persistent /** * The value for the live_stream_using_airtime_auth field. + * Note: this column has a database default value of: false * @var boolean */ protected $live_stream_using_airtime_auth; /** * The value for the live_stream_using_custom_auth field. + * Note: this column has a database default value of: false * @var boolean */ protected $live_stream_using_custom_auth; @@ -138,6 +140,8 @@ abstract class BaseCcShow extends BaseObject implements Persistent $this->name = ''; $this->url = ''; $this->genre = ''; + $this->live_stream_using_airtime_auth = false; + $this->live_stream_using_custom_auth = false; } /** @@ -412,7 +416,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent $v = (boolean) $v; } - if ($this->live_stream_using_airtime_auth !== $v) { + if ($this->live_stream_using_airtime_auth !== $v || $this->isNew()) { $this->live_stream_using_airtime_auth = $v; $this->modifiedColumns[] = CcShowPeer::LIVE_STREAM_USING_AIRTIME_AUTH; } @@ -432,7 +436,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent $v = (boolean) $v; } - if ($this->live_stream_using_custom_auth !== $v) { + if ($this->live_stream_using_custom_auth !== $v || $this->isNew()) { $this->live_stream_using_custom_auth = $v; $this->modifiedColumns[] = CcShowPeer::LIVE_STREAM_USING_CUSTOM_AUTH; } @@ -502,6 +506,14 @@ abstract class BaseCcShow extends BaseObject implements Persistent return false; } + if ($this->live_stream_using_airtime_auth !== false) { + return false; + } + + if ($this->live_stream_using_custom_auth !== false) { + return false; + } + // otherwise, everything was equal, so return TRUE return true; } // hasOnlyDefaultValues() diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml index de20357df..ce4faa068 100644 --- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml @@ -75,7 +75,6 @@ $(document).ready(function(){
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml index 16494c300..d60020de1 100644 --- a/airtime_mvc/build/schema.xml +++ b/airtime_mvc/build/schema.xml @@ -146,8 +146,8 @@ - - + + diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql index da3029ff6..62b865c1e 100644 --- a/airtime_mvc/build/sql/schema.sql +++ b/airtime_mvc/build/sql/schema.sql @@ -178,8 +178,8 @@ CREATE TABLE "cc_show" "description" VARCHAR(512), "color" VARCHAR(6), "background_color" VARCHAR(6), - "live_stream_using_airtime_auth" BOOLEAN, - "live_stream_using_custom_auth" BOOLEAN, + "live_stream_using_airtime_auth" BOOLEAN default 'f', + "live_stream_using_custom_auth" BOOLEAN default 'f', "live_stream_user" VARCHAR(255), "live_stream_pass" VARCHAR(255), PRIMARY KEY ("id") diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 368e776d5..077d9b780 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -434,7 +434,7 @@ function init() { $('.listen-control-button').click(function() { if (stream_window == null || stream_window.closed) - stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=178'); + stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=158'); stream_window.focus(); return false; }); diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer-mute-unmute.png b/airtime_mvc/public/js/jplayer/skin/jplayer-mute-unmute.png new file mode 100644 index 000000000..b8dabe982 Binary files /dev/null and b/airtime_mvc/public/js/jplayer/skin/jplayer-mute-unmute.png differ 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 d1b726386..293dbaef0 100644 --- a/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css +++ b/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css @@ -1,2 +1,507 @@ -@charset "utf-8";/* * Skin for jPlayer Plugin (jQuery JavaScript Library) * http://www.happyworm.com/jquery/jplayer * * Skin Name:Blue Monday * * Copyright (c) 2010 Happyworm Ltd * Dual licensed under the MIT and GPL licenses. * - http://www.opensource.org/licenses/mit-license.php * - http://www.gnu.org/copyleft/gpl.html * * Author:Silvia Benvenuti * Skin Version:3.0 (jPlayer 2.0.0) * Date:20th December 2010 */.jp-container{background:#282828; height:100%; margin:0; padding:0;width:400px;position:relative}.jp-container h1{ color:#CCC; font-size:20px; font-weight:normal; margin:0; padding:8px 0; position:absolute; right:16px; text-align:center; text-shadow:0 -1px 1px #000; top:12px}.jp-logo{width:400px;height:67px; background:#282828 no-repeat 120px 14px;background:no-repeat 120px 14px,-moz-radial-gradient(200px 0px,circle cover,rgba(70,70,70,1) 0%,rgba(40,40,40,1) 90%);background:no-repeat 120px 14px,-webkit-radial-gradient(170px 20px,rgba(70,70,70,1) 0%,rgba(40,40,40,1) 70%);display:block}.jp-logo img{ display:block; display:block; padding:14px 0 0 16px}.jp-stream{height:27px;display:block;border-top:1px solid #050505;color:#ff5d1a;font-size:12px;padding:6px 4px 4px 16px;background:#313131;background:-moz-linear-gradient(top,#292929 0,#3a3a3a 100%); background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#292929),color-stop(100%,#3a3a3a));box-shadow:rgba(248,248,248,.3) 0px 1px 0px,rgba(0,0,0,0.2) 0 2px 2px inset;-moz-box-shadow:rgba(0,0,0,0.7) 0 0 5px inset;-webkit-box-shadow:rgba(0,0,0,0.7) 0 0 5px inset;line-height:23px}.jp-stream-text,.jp-stream form{float:left}.jp-stream form{margin-left:10px;width:283px}.jp-stream label{color:#ababab;padding:0 10px 0 0;font-size:12px}.jp-stream label input[type="radio"]{}.jp-stream form input[type="text"],.jp-stream form select{ background-color:#212121; border:1px solid #1a1a1a; box-shadow:inset 0 2px 2px rgba(0,0,0,0.5);-moz-box-shadow:inset 0 2px 2px rgba(0,0,0,0.5);-webkit-box-shadow:inset 0 2px 2px rgba(0,0,0,0.5); color:#767676; font-family:Arial,Helvetica,sans-serif; font-size:12px; height:25px; margin:0; padding:2px 2px 2px 0; vertical-align:top;width:100%}div.jp-audio,div.jp-video{/* Edit the font-size to counteract inherited font sizing. * Eg. 1.25em = 1 / 0.8em */font-size:1em;/* No parent CSS that can effect the size in these demos */font-family:Verdana,Arial,sans-serif;line-height:1.6;color:#666}div.jp-audio{/*width:180px;*/}div.jp-video-270p{width:480px}div.jp-video-360p{width:640px}div.jp-interface{position:relative;background-color:#3D3D3D;background:-moz-linear-gradient(top,#4e4e4e 0,#3a3a3a 100%); background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4e4e4e),color-stop(100%,#3a3a3a));width:100%;border-top:1px solid #5a5a5a;border-bottom:1px solid #1a1a1a}div.jp-audio div.jp-type-single div.jp-interface{height:70px}div.jp-audio div.jp-type-playlist div.jp-interface{height:80px}div.jp-video div.jp-type-single div.jp-interface{height:60px;border-bottom:none}div.jp-video div.jp-type-playlist div.jp-interface{height:60px}div.jp-interface ul.jp-controls{list-style-type:none;padding:0;margin:0}div.jp-interface ul.jp-controls li{/* position:absolute;*/display:inline}div.jp-interface ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px}a.jp-play,a.jp-pause{width:75px;height:40px;z-index:1}div.jp-audio div.jp-type-single a.jp-play,div.jp-audio div.jp-type-single a.jp-pause{top:15px;left:15px}div.jp-audio div.jp-type-playlist a.jp-play,div.jp-audio div.jp-type-playlist a.jp-pause{top:20px;left:48px}div.jp-video a.jp-play,div.jp-video a.jp-pause{top:15px}div.jp-video-270p div.jp-type-single a.jp-play,div.jp-video-270p div.jp-type-single a.jp-pause{left:195px}div.jp-video-270p div.jp-type-playlist a.jp-play,div.jp-video-270p div.jp-type-playlist a.jp-pause{left:220px}div.jp-video-360p div.jp-type-single a.jp-play,div.jp-video-360p div.jp-type-single a.jp-pause{left:275px}div.jp-video-360p div.jp-type-playlist a.jp-play,div.jp-video-360p div.jp-type-playlist a.jp-pause{left:300px}a.jp-play{background:url(jplayer.png) 0 0 no-repeat}a.jp-play:hover{background:url(jplayer.png) -75px 0 no-repeat}a.jp-pause{background:url(jplayer.png) 0 -40px no-repeat;display:none}a.jp-pause:hover{background:url(jplayer.png) -75px -40px no-repeat}div.jp-audio div.jp-type-single a.jp-stop{top:26px;left:90px}div.jp-audio div.jp-type-playlist a.jp-stop{top:26px;left:126px}div.jp-video a.jp-stop{top:21px}div.jp-video-270p div.jp-type-single a.jp-stop{left:245px}div.jp-video-270p div.jp-type-playlist a.jp-stop{left:298px}div.jp-video-360p div.jp-type-single a.jp-stop{left:325px}div.jp-video-360p div.jp-type-playlist a.jp-stop{left:378px}a.jp-stop{background:url(jplayer.png) 0 -83px no-repeat;width:28px;height:28px;z-index:1}a.jp-stop:hover{background:url(jplayer.png) -29px -83px no-repeat}div.jp-audio div.jp-type-playlist a.jp-previous{left:20px;top:26px}div.jp-video div.jp-type-playlist a.jp-previous{top:21px}div.jp-video-270p div.jp-type-playlist a.jp-previous{left:192px}div.jp-video-360p div.jp-type-playlist a.jp-previous{left:272px}a.jp-previous{background:url(jplayer.png) 0 -112px no-repeat;width:28px;height:28px}a.jp-previous:hover{background:url(jplayer.png) -29px -112px no-repeat}div.jp-audio div.jp-type-playlist a.jp-next{left:88px;top:26px}div.jp-video div.jp-type-playlist a.jp-next{top:21px}div.jp-video-270p div.jp-type-playlist a.jp-next{left:260px}div.jp-video-360p div.jp-type-playlist a.jp-next{left:340px}a.jp-next{background:url(jplayer.png) 0 -141px no-repeat;width:28px;height:28px}a.jp-next:hover{background:url(jplayer.png) -29px -141px no-repeat}div.jp-progress{position:absolute;overflow:hidden;background-color:#ddd}div.jp-audio div.jp-type-single div.jp-progress{top:32px;left:130px;width:122px;height:15px}div.jp-audio div.jp-type-playlist div.jp-progress{top:32px;left:164px;width:122px;height:15px}div.jp-video div.jp-progress{top:0px;left:0px;width:100%;height:10px}div.jp-seek-bar{background:url(jplayer.png) 0 -202px repeat-x;width:0px;/* height:15px;*/height:100%;cursor:pointer}div.jp-play-bar{background:url(jplayer.png) 0 -218px repeat-x;width:0px;/* height:15px;*/height:100%}/* The seeking class is added/removed inside jPlayer */div.jp-seeking-bg{background:url(pbar-ani.gif)}a.jp-mute,a.jp-unmute,a.jp-volume-max{width:20px;height:20px}div.jp-audio div.jp-type-single a.jp-mute,div.jp-audio div.jp-type-single a.jp-unmute{top:45clearpx;left:210px}div.jp-audio div.jp-type-playlist a.jp-mute,div.jp-audio div.jp-type-playlist a.jp-unmute{top:32px;left:296px}div.jp-video a.jp-mute,div.jp-video a.jp-unmute{top:27px}div.jp-video-270p div.jp-type-single a.jp-mute,div.jp-video-270p div.jp-type-single a.jp-unmute{left:304px}div.jp-video-270p div.jp-type-playlist a.jp-unmute,div.jp-video-270p div.jp-type-playlist a.jp-mute{left:363px}div.jp-video-360p div.jp-type-single a.jp-mute,div.jp-video-360p div.jp-type-single a.jp-unmute{left:384px}div.jp-video-360p div.jp-type-playlist a.jp-mute,div.jp-video-360p div.jp-type-playlist a.jp-unmute{left:443px}a.jp-mute{background:url(jplayer.png) 0 -90px no-repeat}a.jp-mute:hover{background:url(jplayer.png) -30px -90px no-repeat}a.jp-unmute{background:url(jplayer.png) -61px -90px no-repeat;display:none}a.jp-unmute:hover{background:url(jplayer.png) -91px -90px no-repeat}div.jp-interface ul.jp-controls a.jp-volume-max{ background:url(jplayer.png) no-repeat scroll 0 -110px transparent}div.jp-interface ul.jp-controls a.jp-volume-max:hover{ background:url(jplayer.png) no-repeat scroll -30px -110px transparent}div.jp-audio ul.jp-controls a.jp-volume-max{ left:371px; top:28px}div.jp-volume-bar{position:absolute;overflow:hidden;background:#393939;-moz-box-shadow:rgba(0,0,0,0.5) 0 0 1px inset;-webkit-box-shadow:rgba(0,0,0,0.5) 0 0 1px inset;border-bottom:1px solid #5e5e5e;border-top:1px solid #262526;border-left:1px solid #262526;border-right:1px solid #262526;width:160px;height:4px;cursor:pointer}div.jp-audio div.jp-type-single div.jp-volume-bar{top:48px;left:225px}div.jp-audio div.jp-type-playlist div.jp-volume-bar{top:37px;left:324px}div.jp-video div.jp-volume-bar{top:32px}div.jp-video-270p div.jp-type-single div.jp-volume-bar{left:332px}div.jp-video-270p div.jp-type-playlist div.jp-volume-bar{left:391px}div.jp-video-360p div.jp-type-single div.jp-volume-bar{left:412px}div.jp-video-360p div.jp-type-playlist div.jp-volume-bar{left:471px}div.jp-volume-bar-value{background-color:#fb7018; background:-moz-linear-gradient(top,#fc9318 0,#e56815 100%); background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fc9318),color-stop(100%,#e56815));width:0px;height:3px}div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique}div.jp-duration{text-align:right}div.jp-audio div.jp-type-single div.jp-current-time,div.jp-audio div.jp-type-single div.jp-duration{top:49px;left:130px;width:122px}div.jp-audio div.jp-type-playlist div.jp-current-time,div.jp-audio div.jp-type-playlist div.jp-duration{top:49px;left:164px;width:122px}div.jp-video div.jp-current-time,div.jp-video div.jp-duration{top:10px;left:0px;width:98%;padding:0 1%}div.jp-playlist{/* width:418px;*/width:100%;background-color:#ccc;/*border:1px solid #009be3;*/border-top:none}div.jp-playlist ul{list-style-type:none;margin:0;padding:0 20px;/* background-color:#ccc;*//* border:1px solid #009be3;*//* border-top:none;*//* width:378px;*/font-size:.72em}div.jp-type-single div.jp-playlist li{padding:5px 0 5px 20px;font-weight:bold}div.jp-type-playlist div.jp-playlist li{padding:5px 0 4px 20px;border-bottom:1px solid #eee}div.jp-type-playlist div.jp-playlist li.jp-playlist-last{padding:5px 0 5px 20px;border-bottom:none}div.jp-type-playlist div.jp-playlist li.jp-playlist-current{list-style-type:square;list-style-position:inside;padding-left:8px}div.jp-type-playlist div.jp-playlist a{color:#666;text-decoration:none}div.jp-type-playlist div.jp-playlist a:hover{color:#0d88c1}div.jp-type-playlist div.jp-playlist a.jp-playlist-current{color:#0d88c1}div.jp-type-playlist div.jp-playlist div.jp-free-media{display:inline;margin-left:20px}div.jp-video div.jp-video-play{background:transparent url(jplayer.blue.monday.video.play.png) no-repeat center;/* position:relative;*/position:absolute;cursor:pointer;z-index:2}div.jp-video div.jp-video-play:hover{background:transparent url(jplayer.blue.monday.video.play.hover.png) no-repeat center}div.jp-video-270p div.jp-video-play{top:-270px;width:480px;height:270px}div.jp-video-360p div.jp-video-play{top:-360px;width:640px;height:360px}div.jp-jplayer{width:0px;height:0px}div.jp-video div.jp-jplayer{border:1px solid #009be3;border-bottom:none;z-index:1}div.jp-video-270p div.jp-jplayer{width:480px;height:270px}div.jp-video-360p div.jp-jplayer{width:640px;height:360px}div.jp-jplayer{background-color:#000}div.jp-now-playing{height:19px;padding:3px 0 0 15px;color:#a7a7a7;font-size:12px;border-top:1px solid #515151;border-bottom:1px solid #2c2c2c;background-color:#353535;background:-moz-linear-gradient(top,#3e3e3e 0,#353535 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#3e3e3e),color-stop(100%,#353535))}div.jp-now-playing span{color:#898989} +@charset "utf-8"; + /* * Skin for jPlayer Plugin (jQuery JavaScript Library) * http: //www.happyworm.com/jquery/jplayer * * Skin Name:Blue Monday * * Copyright (c) 2010 Happyworm Ltd * Dual licensed under the MIT and GPL licenses. * - http://www.opensource.org/licenses/mit-license.php * - http://www.gnu.org/copyleft/gpl.html * * Author:Silvia Benvenuti * Skin Version:3.0 (jPlayer 2.0.0) * Date:20th December 2010 */.jp-container { + background: #282828; + height: 100%; + margin: 0; + padding: 0; + width: 400px; + position: relative; +} +.jp-container h1 { + color: #CCC; + font-size: 20px; + font-weight: normal; + margin: 0; + padding: 8px 0; + position: absolute; + right: 16px; + text-align: center; + text-shadow: 0 -1px 1px #000; + top: 12px; +} +.jp-logo { + width: 400px; + height: 67px; + background: #282828 no-repeat 120px 14px; + background: no-repeat 120px 14px, -moz-radial-gradient(200px 0px, circle cover, rgba(70, 70, 70, 1) 0%, rgba(40, 40, 40, 1) 90%); + background: no-repeat 120px 14px, -webkit-radial-gradient(170px 20px, rgba(70, 70, 70, 1) 0%, rgba(40, 40, 40, 1) 70%); + display: block; +} +.jp-logo img { + display: block; + display: block; + padding: 14px 0 0 16px; +} +.jp-stream { + height: 27px; + display: block; + border-top: 1px solid #050505; + color: #ff5d1a; + font-size: 12px; + padding: 6px 4px 4px 16px; + background: #313131; + background: -moz-linear-gradient(top, #292929 0, #3a3a3a 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #292929), color-stop(100%, #3a3a3a)); + box-shadow: rgba(248, 248, 248, .3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset; + -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 0 5px inset; + -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 0 5px inset; + line-height: 23px; +} +.jp-stream-text, .jp-stream form { + float: left; +} +.jp-stream form { + margin-left: 10px; + width: 283px; +} +.jp-stream label { + color: #ababab; + padding: 0 10px 0 0; + font-size: 12px; +} +.jp-stream label input[type="radio"] { +} +.jp-stream form input[type="text"], .jp-stream form select { + background-color: #212121; + border: 1px solid #1a1a1a; + box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.5); + -moz-box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.5); + color: #767676; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + height: 25px; + margin: 0; + padding: 2px 2px 2px 0; + vertical-align: top; + width: 100%} +div.jp-audio, div.jp-video { + /* Edit the font-size to counteract inherited font sizing. * Eg. 1.25em = 1 / 0.8em */font-size: 1em; + /* No parent CSS that can effect the size in these demos */font-family: Verdana, Arial, sans-serif; + line-height: 1.6; + color: #666; +} +div.jp-audio { + /*width: 180px; + */} +div.jp-video-270p { + width: 480px; +} +div.jp-video-360p { + width: 640px; +} +div.jp-interface { + position: relative; + background-color: #3D3D3D; + background: -moz-linear-gradient(top, #4e4e4e 0, #3a3a3a 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #4e4e4e), color-stop(100%, #3a3a3a)); + width: 100%; + border-top: 1px solid #5a5a5a; + border-bottom: 1px solid #1a1a1a; +} +div.jp-audio div.jp-type-single div.jp-interface { + height: 50px; +} +div.jp-audio div.jp-type-playlist div.jp-interface { + height: 80px; +} +div.jp-video div.jp-type-single div.jp-interface { + height: 60px; + border-bottom: none; +} +div.jp-video div.jp-type-playlist div.jp-interface { + height: 60px; +} +div.jp-interface ul.jp-controls { + list-style-type: none; + padding: 0; + margin: 0; +} +div.jp-interface ul.jp-controls li { + /* position: absolute; + */display: inline; +} +div.jp-interface ul.jp-controls a { + position: absolute; + overflow: hidden; + text-indent: -9999px; +} +a.jp-play, a.jp-pause { + width: 75px; + height: 40px; + z-index: 1; +} +div.jp-audio div.jp-type-single a.jp-play, div.jp-audio div.jp-type-single a.jp-pause { + top: 15px; + left: 15px; +} +div.jp-audio div.jp-type-playlist a.jp-play, div.jp-audio div.jp-type-playlist a.jp-pause { + top: 20px; + left: 48px; +} +div.jp-video a.jp-play, div.jp-video a.jp-pause { + top: 15px; +} +div.jp-video-270p div.jp-type-single a.jp-play, div.jp-video-270p div.jp-type-single a.jp-pause { + left: 195px; +} +div.jp-video-270p div.jp-type-playlist a.jp-play, div.jp-video-270p div.jp-type-playlist a.jp-pause { + left: 220px; +} +div.jp-video-360p div.jp-type-single a.jp-play, div.jp-video-360p div.jp-type-single a.jp-pause { + left: 275px; +} +div.jp-video-360p div.jp-type-playlist a.jp-play, div.jp-video-360p div.jp-type-playlist a.jp-pause { + left: 300px; +} +a.jp-play { + background: url(jplayer.png) 0 0 no-repeat; +} +a.jp-play:hover { + background: url(jplayer.png) -75px 0 no-repeat; +} +a.jp-pause { + background: url(jplayer.png) 0 -40px no-repeat; + display: none; +} +a.jp-pause:hover { + background: url(jplayer.png) -75px -40px no-repeat; +} +div.jp-audio div.jp-type-single a.jp-stop { + top: 26px; + left: 90px; +} +div.jp-audio div.jp-type-playlist a.jp-stop { + top: 26px; + left: 126px; +} +div.jp-video a.jp-stop { + top: 21px; +} +div.jp-video-270p div.jp-type-single a.jp-stop { + left: 245px; +} +div.jp-video-270p div.jp-type-playlist a.jp-stop { + left: 298px; +} +div.jp-video-360p div.jp-type-single a.jp-stop { + left: 325px; +} +div.jp-video-360p div.jp-type-playlist a.jp-stop { + left: 378px; +} +a.jp-stop { + background: url(jplayer.png) 0 -83px no-repeat; + width: 28px; + height: 28px; + z-index: 1; +} +a.jp-stop:hover { + background: url(jplayer.png) -29px -83px no-repeat; +} +div.jp-audio div.jp-type-playlist a.jp-previous { + left: 20px; + top: 26px; +} +div.jp-video div.jp-type-playlist a.jp-previous { + top: 21px; +} +div.jp-video-270p div.jp-type-playlist a.jp-previous { + left: 192px; +} +div.jp-video-360p div.jp-type-playlist a.jp-previous { + left: 272px; +} +a.jp-previous { + background: url(jplayer.png) 0 -112px no-repeat; + width: 28px; + height: 28px; +} +a.jp-previous:hover { + background: url(jplayer.png) -29px -112px no-repeat; +} +div.jp-audio div.jp-type-playlist a.jp-next { + left: 88px; + top: 26px; +} +div.jp-video div.jp-type-playlist a.jp-next { + top: 21px; +} +div.jp-video-270p div.jp-type-playlist a.jp-next { + left: 260px; +} +div.jp-video-360p div.jp-type-playlist a.jp-next { + left: 340px; +} +a.jp-next { + background: url(jplayer.png) 0 -141px no-repeat; + width: 28px; + height: 28px; +} +a.jp-next:hover { + background: url(jplayer.png) -29px -141px no-repeat; +} +div.jp-progress { + position: absolute; + overflow: hidden; + background-color: #ddd; +} +div.jp-audio div.jp-type-single div.jp-progress { + top: 32px; + left: 130px; + width: 122px; + height: 15px; +} +div.jp-audio div.jp-type-playlist div.jp-progress { + top: 32px; + left: 164px; + width: 122px; + height: 15px; +} +div.jp-video div.jp-progress { + top: 0px; + left: 0px; + width: 100%; + height: 10px; +} +div.jp-seek-bar { + background: url(jplayer.png) 0 -202px repeat-x; + width: 0px; + /* height: 15px; + */height: 100%; + cursor: pointer; +} +div.jp-play-bar { + background: url(jplayer.png) 0 -218px repeat-x; + width: 0px; + /* height: 15px; */ + height: 100% +} +/* The seeking class is added/removed inside jPlayer */ +div.jp-seeking-bg { + background: url(pbar-ani.gif); +} +a.jp-mute, a.jp-unmute, a.jp-volume-max { + width: 25px; + height: 20px; +} +div.jp-audio div.jp-type-single a.jp-mute{ + top: 15px; + left: 102px; +} +div.jp-audio div.jp-type-single a.jp-unmute { + top: 15px; + left: 90px; +} +div.jp-audio div.jp-type-playlist a.jp-mute, div.jp-audio div.jp-type-playlist a.jp-unmute { + top: 32px; + left: 296px; +} +div.jp-video a.jp-mute, div.jp-video a.jp-unmute { + top: 27px; +} +div.jp-video-270p div.jp-type-single a.jp-mute, div.jp-video-270p div.jp-type-single a.jp-unmute { + left: 304px; +} +div.jp-video-270p div.jp-type-playlist a.jp-unmute, div.jp-video-270p div.jp-type-playlist a.jp-mute { + left: 363px; +} +div.jp-video-360p div.jp-type-single a.jp-mute, div.jp-video-360p div.jp-type-single a.jp-unmute { + left: 384px; +} +div.jp-video-360p div.jp-type-playlist a.jp-mute, div.jp-video-360p div.jp-type-playlist a.jp-unmute { + left: 443px; +} +a.jp-mute { + background: url(jplayer-mute-unmute.png) 0 0 no-repeat; +} +a.jp-mute:hover { + background: url(jplayer-mute-unmute.png) -42px 0 no-repeat; +} +a.jp-unmute { + background: url(jplayer-mute-unmute.png) -84px 0 no-repeat; + display: none; +} +a.jp-unmute:hover { + background: url(jplayer-mute-unmute.png) -124px 0 no-repeat; +} +div.jp-interface ul.jp-controls a.jp-volume-max { + background: url(jplayer.png) no-repeat scroll 0 -110px transparent; +} +div.jp-interface ul.jp-controls a.jp-volume-max:hover { + background: url(jplayer.png) no-repeat scroll -30px -110px transparent; +} +div.jp-audio ul.jp-controls a.jp-volume-max { + left: 371px; + top: 28px; +} +div.jp-volume-bar { + position: absolute; + overflow: hidden; + background: #393939; + -moz-box-shadow: rgba(0, 0, 0, 0.5) 0 0 1px inset; + -webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 0 1px inset; + border-bottom: 1px solid #5e5e5e; + border-top: 1px solid #262526; + border-left: 1px solid #262526; + border-right: 1px solid #262526; + width: 160px; + height: 7px; + cursor: pointer; +} +div.jp-audio div.jp-type-single div.jp-volume-bar { + top: 24px; + left: 120px; +} +div.jp-audio div.jp-type-playlist div.jp-volume-bar { + top: 37px; + left: 324px; +} +div.jp-video div.jp-volume-bar { + top: 32px; +} +div.jp-video-270p div.jp-type-single div.jp-volume-bar { + left: 332px; +} +div.jp-video-270p div.jp-type-playlist div.jp-volume-bar { + left: 391px; +} +div.jp-video-360p div.jp-type-single div.jp-volume-bar { + left: 412px; +} +div.jp-video-360p div.jp-type-playlist div.jp-volume-bar { + left: 471px; +} +div.jp-volume-bar-value { + background-color: #fb7018; + background: -moz-linear-gradient(top, #fc9318 0, #e56815 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fc9318), color-stop(100%, #e56815)); + width: 0px; + height: 6px; +} +div.jp-current-time, div.jp-duration { + position: absolute; + font-size: .64em; + font-style: oblique; +} +div.jp-duration { + text-align: right; +} +div.jp-audio div.jp-type-single div.jp-current-time, div.jp-audio div.jp-type-single div.jp-duration { + top: 49px; + left: 130px; + width: 122px; +} +div.jp-audio div.jp-type-playlist div.jp-current-time, div.jp-audio div.jp-type-playlist div.jp-duration { + top: 49px; + left: 164px; + width: 122px; +} +div.jp-video div.jp-current-time, div.jp-video div.jp-duration { + top: 10px; + left: 0px; + width: 98%; + padding: 0 1%} +div.jp-playlist { + /* width: 418px; */ + width: 100%; + background-color: #ccc; + /*border: 1px solid #009be3; */ + border-top: none; +} +div.jp-playlist ul { + list-style-type: none; + margin: 0; + padding: 0 20px; + /* background-color: #ccc; + *//* border: 1px solid #009be3; + *//* borderg-top: none; + *//* width: 378px; + */font-size: .72em; +} +div.jp-type-single div.jp-playlist li { + padding: 5px 0 5px 20px; + font-weight: bold; +} +div.jp-type-playlist div.jp-playlist li { + padding: 5px 0 4px 20px; + border-bottom: 1px solid #eee; +} +div.jp-type-playlist div.jp-playlist li.jp-playlist-last { + padding: 5px 0 5px 20px; + border-bottom: none; +} +div.jp-type-playlist div.jp-playlist li.jp-playlist-current { + list-style-type: square; + list-style-position: inside; + padding-left: 8px; +} +div.jp-type-playlist div.jp-playlist a { + color: #666; + text-decoration: none; +} +div.jp-type-playlist div.jp-playlist a:hover { + color: #0d88c1; +} +div.jp-type-playlist div.jp-playlist a.jp-playlist-current { + color: #0d88c1; +} +div.jp-type-playlist div.jp-playlist div.jp-free-media { + display: inline; + margin-left: 20px; +} +div.jp-video div.jp-video-play { + background: transparent url(jplayer.blue.monday.video.play.png) no-repeat center; + /* position: relative; + */position: absolute; + cursor: pointer; + z-index: 2; +} +div.jp-video div.jp-video-play:hover { + background: transparent url(jplayer.blue.monday.video.play.hover.png) no-repeat center; +} +div.jp-video-270p div.jp-video-play { + top: -270px; + width: 480px; + height: 270px; +} +div.jp-video-360p div.jp-video-play { + top: -360px; + width: 640px; + height: 360px; +} +div.jp-jplayer { + width: 0px; + height: 0px; +} +div.jp-video div.jp-jplayer { + border: 1px solid #009be3; + border-bottom: none; + z-index: 1; +} +div.jp-video-270p div.jp-jplayer { + width: 480px; + height: 270px; +} +div.jp-video-360p div.jp-jplayer { + width: 640px; + height: 360px; +} +div.jp-jplayer { + background-color: #000; +} +div.jp-now-playing { + height: 19px; + padding: 3px 0 0 15px; + color: #a7a7a7; + font-size: 12px; + border-top: 1px solid #515151; + border-bottom: 1px solid #2c2c2c; + background-color: #353535; + background: -moz-linear-gradient(top, #3e3e3e 0, #353535 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3e3e3e), color-stop(100%, #353535)); +} +div.jp-now-playing span { + color: #898989; +} diff --git a/install_minimal/upgrades/airtime-2.1.0/common/Version20120405114454.php b/install_minimal/upgrades/airtime-2.1.0/common/Version20120405114454.php index 953c14a90..1f17976d0 100644 --- a/install_minimal/upgrades/airtime-2.1.0/common/Version20120405114454.php +++ b/install_minimal/upgrades/airtime-2.1.0/common/Version20120405114454.php @@ -18,11 +18,7 @@ class Version20120405114454 extends AbstractMigration $cc_subjs_token->addColumn('token', 'string', array('length' => 40, 'notnull' => 1)); $cc_subjs_token->addColumn('created', 'datetime', array('notnull' => 1)); - $cc_subjs_token->setPrimaryKey(array('id')); - - $cc_subjs = $schema->getTable('cc_subjs'); - $cc_subjs_token->addNamedForeignKeyConstraint('cc_subjs_token_userid_fkey', $cc_subjs, array('user_id'), array('id')); - $cc_subjs_token->addUniqueIndex(array('token'), 'uniq_token'); + $cc_subjs_token->setPrimaryKey(array('id')); //end create cc_subjs_token table } diff --git a/install_minimal/upgrades/airtime-2.1.0/common/Version20120410104441.php b/install_minimal/upgrades/airtime-2.1.0/common/Version20120410104441.php index c41f7ef31..aada5793c 100644 --- a/install_minimal/upgrades/airtime-2.1.0/common/Version20120410104441.php +++ b/install_minimal/upgrades/airtime-2.1.0/common/Version20120410104441.php @@ -12,6 +12,14 @@ class Version20120410104441 extends AbstractMigration */ public function up(Schema $schema) { + $this->_addSql("DROP TRIGGER calculate_position ON cc_playlistcontents"); + $this->_addSql("DROP FUNCTION calculate_position()"); + + $this->_addSql("ALTER TABLE cc_subjs_token ALTER COLUMN created TYPE timestamp"); + + $this->_addSql("ALTER TABLE cc_subjs_token ADD CONSTRAINT cc_subjs_token_idx UNIQUE (token);"); + $this->_addSql("ALTER TABLE cc_subjs_token ADD CONSTRAINT cc_subjs_token_userid_fkey FOREIGN KEY (user_id) REFERENCES cc_subjs(id) ON DELETE CASCADE"); + //add temp columns for changing bitrate and sample rate to integers. $this->_addSql("ALTER TABLE cc_files ADD temp_br integer"); $this->_addSql("ALTER TABLE cc_files ADD temp_sr integer"); @@ -26,8 +34,8 @@ class Version20120410104441 extends AbstractMigration $this->_addSql("ALTER TABLE cc_files RENAME COLUMN temp_br TO bit_rate"); //add utime, lptime - $this->_addSql("ALTER TABLE cc_files ADD utime timestamp(6)"); - $this->_addSql("ALTER TABLE cc_files ADD lptime timestamp(6)"); + $this->_addSql("ALTER TABLE cc_files ADD utime timestamp"); + $this->_addSql("ALTER TABLE cc_files ADD lptime timestamp"); //setting these to a default now for timeline refresh purposes. $now = gmdate("Y-m-d H:i:s"); diff --git a/install_minimal/upgrades/airtime-2.1.0/common/Version20120410143340.php b/install_minimal/upgrades/airtime-2.1.0/common/Version20120410143340.php index c85c60987..a4468606b 100644 --- a/install_minimal/upgrades/airtime-2.1.0/common/Version20120410143340.php +++ b/install_minimal/upgrades/airtime-2.1.0/common/Version20120410143340.php @@ -19,7 +19,7 @@ class Version20120410143340 extends AbstractMigration $this->_addSql("ALTER TABLE cc_playlist ADD CONSTRAINT cc_playlist_createdby_fkey FOREIGN KEY (creator_id) REFERENCES cc_subjs(id) NOT DEFERRABLE INITIALLY IMMEDIATE"); - $this->_addSql("ALTER TABLE cc_playlist ADD utime timestamp(6)"); + $this->_addSql("ALTER TABLE cc_playlist ADD utime timestamp"); //set the initial created to modified time since this is the closest we can get to inital creation time. $this->_addSql("UPDATE cc_playlist SET utime = mtime"); diff --git a/install_minimal/upgrades/airtime-2.1.0/common/Version20120411102907.php b/install_minimal/upgrades/airtime-2.1.0/common/Version20120411102907.php index 3eee194f2..a1b9c32f4 100644 --- a/install_minimal/upgrades/airtime-2.1.0/common/Version20120411102907.php +++ b/install_minimal/upgrades/airtime-2.1.0/common/Version20120411102907.php @@ -14,24 +14,27 @@ class Version20120411102907 extends AbstractMigration */ public function up(Schema $schema) { - $this->_addSql("ALTER TABLE cc_files ALTER COLUMN length TYPE interval"); + $this->_addSql("ALTER TABLE cc_files ALTER COLUMN length TYPE interval DEFAULT '00:00:00'"); + $this->_addSql("ALTER TABLE cc_files ALTER COLUMN file_exists DROP NOT NULL"); - $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cuein TYPE interval"); - $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cueout TYPE interval"); - $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cliplength TYPE interval"); + $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cuein TYPE interval DEFAULT '00:00:00'"); + $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cueout TYPE interval DEFAULT '00:00:00'"); + $this->_addSql("ALTER TABLE cc_playlistcontents ALTER COLUMN cliplength TYPE interval DEFAULT '00:00:00'"); - $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_in TYPE interval"); - $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_out TYPE interval"); - $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN clip_length TYPE interval"); + $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_in TYPE interval DEFAULT '00:00:00'"); + $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN cue_out TYPE interval DEFAULT '00:00:00'"); + $this->_addSql("ALTER TABLE cc_schedule ALTER COLUMN clip_length TYPE interval DEFAULT '00:00:00'"); - $this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN time_filled TYPE interval"); + $this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN time_filled TYPE interval DEFAULT '00:00:00'"); //remove old columns from cc_schedule that deal with groups or playlists. $this->_addSql("ALTER TABLE cc_schedule DROP COLUMN group_id"); $this->_addSql("ALTER TABLE cc_schedule DROP COLUMN schedule_group_played"); $this->_addSql("ALTER TABLE cc_schedule DROP COLUMN playlist_id"); - $this->_addSql("ALTER TABLE cc_schedule ADD playout_status integer DEFAULT 1 NOT NULL"); + $this->_addSql("ALTER TABLE cc_schedule ADD playout_status smallint DEFAULT 1 NOT NULL"); + + $this->_addSql("ALTER TABLE cc_music_dirs ALTER COLUMN exists DROP NOT NULL, ALTER COLUMN watched DROP NOT NULL"); } public function down(Schema $schema) diff --git a/install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php b/install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php index 8f8c1ba02..0ad900353 100644 --- a/install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php +++ b/install_minimal/upgrades/airtime-2.1.0/common/Version20120411174904.php @@ -12,8 +12,8 @@ class Version20120411174904 extends AbstractMigration */ public function up(Schema $schema) { - $this->_addSql("ALTER TABLE cc_show_instances ADD created timestamp(6)"); - $this->_addSql("ALTER TABLE cc_show_instances ADD last_scheduled timestamp(6)"); + $this->_addSql("ALTER TABLE cc_show_instances ADD created timestamp"); + $this->_addSql("ALTER TABLE cc_show_instances ALTER COLUMN created SET NOT NULL"); //setting these to a default now for timeline refresh purposes. $now = gmdate("Y-m-d H:i:s");