From ef994aa449ccffd6cd0425fe52c60744f682f4a1 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 2 Aug 2012 16:40:32 -0400 Subject: [PATCH 1/2] CC-84: Smart Playlists - block options scroll for small screens --- .../views/scripts/form/smart-block-criteria.phtml | 4 ++-- airtime_mvc/public/css/styles.css | 5 +++++ .../public/js/airtime/playlist/smart_playlistbuilder.js | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml index 056c48ec8..faedcf169 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -1,5 +1,5 @@
-
+
Smart Playlist Options
@@ -17,7 +17,7 @@ - + element->getElement('save_button') ?> element->getElement('generate_button') ?> element->getElement('shuffle_button') ?> diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 55c8ad23c..f852f0915 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -484,6 +484,11 @@ table.library-get-file-md.table-small{ /***** SMART PLAYLIST SPECIFIC STYLES BEGIN *****/ +.sp-scrollable{ + overflow-x: auto; + width: 781px; +} + .sp-invisible{ visibility: hidden; } diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js index 2e45ff323..71ce2640e 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js @@ -155,7 +155,8 @@ function setSmartPlaylistEvents() { item_to_hide.children().attr('disabled', 'disabled'); item_to_hide.find('[name^="sp_criteria_field"]').val(0).end() .find('[name^="sp_criteria_modifier"]').val(0).end() - .find('[name^="sp_criteria_value"]').val(''); + .find('[name^="sp_criteria_value"]').val('').end() + .find('[name^="sp_criteria_extra"]').val(''); sizeTextBoxes(item_to_hide.find('[name^="sp_criteria_value"]'), 'sp_extra_input_text', 'sp_input_text'); item_to_hide.hide(); From 361e681a59887594f5f8dded05bf095858ca214b Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 2 Aug 2012 16:50:35 -0400 Subject: [PATCH 2/2] CC-84: Smart Playlists - remove 'add to playlist' option on showbuilder screen --- 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 78fd1abe5..eeb2b9d35 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -79,7 +79,7 @@ class LibraryController extends Zend_Controller_Action if (!$obj->isStatic()){ unset($menu["play"]); } - if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) { + if (($isAdminOrPM || $obj->getCreatorId() == $user->getId()) && $screen == "playlist") { if ($this->obj_sess->type === "playlist") { $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy"); }