From 5003e86eacb1c0d1c91198e0e24dc8419d5a8675 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 17:37:38 -0400 Subject: [PATCH 1/2] - changed smart block qtip text --- .../public/js/airtime/playlist/smart_blockbuilder.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index ca085fa87..9862eb48e 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -363,10 +363,10 @@ function setupUI() { $(".playlist_type_help_icon").qtip({ content: { - text: "A static playlist will save the criteria and generate the playlist content immediately." + - "This allows you to edit and view it in the Playlist Builder before adding it to a show.

" + - "A dynamic playlist will only save the criteria. The playlist content will get generated upon " + - "adding it to a show. You will not be able to view and edit it in the Playlist Builder." + 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." }, hide: { delay: 500, From 92b40bea0c2502a0ee3d06bf0e7f8ca65525e378 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 17:43:13 -0400 Subject: [PATCH 2/2] CC-4484: Some js files do not have the airtime version appended -fixed --- airtime_mvc/application/controllers/LibraryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 2d8f06b71..a1d0d245e 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -41,7 +41,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); - $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_playlistbuilder.js'), 'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/events/library_playlistbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/media_library.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']);