From a8f24952bd4a381d44e3d61870488cdf28ffc3ee Mon Sep 17 00:00:00 2001 From: naomiaro Date: Thu, 13 Jan 2011 18:01:15 -0500 Subject: [PATCH] updates the playlists that can be chosen for the show. --- application/controllers/ScheduleController.php | 1 + application/views/scripts/schedule/find-playlists.phtml | 5 +++++ public/js/airtime/schedule/schedule.js | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php index d941e958b..32c83a70b 100644 --- a/application/controllers/ScheduleController.php +++ b/application/controllers/ScheduleController.php @@ -162,6 +162,7 @@ class ScheduleController extends Zend_Controller_Action $this->view->playlists = $show->searchPlaylistsForShow($day); $this->view->showContent = $show->getShowContent($start); + $this->view->choice = $this->view->render('schedule/find-playlists.phtml'); $this->view->chosen = $this->view->render('schedule/scheduled-content.phtml'); $this->view->dialog = $this->view->render('schedule/schedule-show.phtml'); diff --git a/application/views/scripts/schedule/find-playlists.phtml b/application/views/scripts/schedule/find-playlists.phtml index e69de29bb..f5d6626cf 100644 --- a/application/views/scripts/schedule/find-playlists.phtml +++ b/application/views/scripts/schedule/find-playlists.phtml @@ -0,0 +1,5 @@ +playlists) > 0) { + echo $this->partialLoop('schedule/find-playlists-partial.phtml', $this->playlists); + } +?> diff --git a/public/js/airtime/schedule/schedule.js b/public/js/airtime/schedule/schedule.js index d0cdd2025..6531abe89 100644 --- a/public/js/airtime/schedule/schedule.js +++ b/public/js/airtime/schedule/schedule.js @@ -200,6 +200,14 @@ function makeScheduleDialog(dialog, show) { function(json){ var x; + $("#schedule_playlist_choice") + .empty() + .append(json.choice) + .find('li') + .draggable({ + helper: 'clone' + }); + $("#schedule_playlist_chosen") .empty() .append(json.chosen);