From 925f98e3d0c514a583735db6ec39066fba445ac7 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 25 May 2012 15:48:27 -0400 Subject: [PATCH 1/3] SAAS-242: Livechat window obscures trial end date graphic -fixed --- airtime_mvc/public/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index f7c435f62..635444259 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2419,7 +2419,7 @@ tfoot tr th { height:38px; display:block; position:absolute; - right:20px; + left:20px; bottom:10px; background-color:#222; background-color:rgba(0, 0, 0, 0.7); From 561934c8efa95e43e11b63e7770c7363aca6ab3c Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 25 May 2012 16:23:33 -0400 Subject: [PATCH 2/3] SAAS-244: Live chat box appears in stream-player and preview windows -fixed --- airtime_mvc/application/Bootstrap.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index f512da0d4..f2ae6fe86 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -89,9 +89,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $userType = ""; } $view->headScript()->appendScript("var userType = '$userType';"); - if (Application_Model_Preference::GetPlanLevel() != "disabled" - && ($_SERVER['REQUEST_URI'] != '/Dashboard/stream-player' || $_SERVER['REQUEST_URI'] != '/audiopreview/audio-preview-player')) { + && !($_SERVER['REQUEST_URI'] == '/Dashboard/stream-player' || $_SERVER['REQUEST_URI'] == '/audiopreview/audio-preview-player')) { $client_id = Application_Model_Preference::GetClientId(); $view->headScript()->appendScript("var livechat_client_id = '$client_id';"); $view->headScript()->appendFile($baseUrl . '/js/airtime/common/livechat.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); From 396795e70efc448d685d5f209bcdfaed1630b2ab Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 28 May 2012 17:59:26 +0200 Subject: [PATCH 3/3] CC-3879 : Now Playing-> Guest's clicking on Preview pops up error window --- airtime_mvc/application/configs/ACL.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php index 91167dd93..a8e6b2adc 100644 --- a/airtime_mvc/application/configs/ACL.php +++ b/airtime_mvc/application/configs/ACL.php @@ -34,11 +34,11 @@ $ccAcl->allow('G', 'index') ->allow('G', 'api') ->allow('G', 'schedule') ->allow('G', 'dashboard') + ->allow('G', 'audiopreview') ->allow('H', 'usersettings') ->allow('H', 'plupload') ->allow('H', 'library') ->allow('H', 'playlist') - ->allow('H', 'audiopreview') ->allow('A', 'playouthistory') ->allow('A', 'user') ->allow('A', 'systemstatus')