From 055f541657b204cc787f26f89996591e3472e35e Mon Sep 17 00:00:00 2001 From: naomiaro Date: Tue, 21 Dec 2010 17:47:51 -0500 Subject: [PATCH] side playlist working, need to add to search page as well. --- application/controllers/SideplaylistController.php | 6 +----- application/layouts/scripts/sidebar.phtml | 2 +- public/js/campcaster/library/library.js | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/application/controllers/SideplaylistController.php b/application/controllers/SideplaylistController.php index 3469dbb4e..e18205bd0 100644 --- a/application/controllers/SideplaylistController.php +++ b/application/controllers/SideplaylistController.php @@ -12,17 +12,13 @@ class SideplaylistController extends Zend_Controller_Action $this->_redirect('login/index'); } - //$ajaxContext = $this->_helper->getHelper('AjaxContext'); - //$ajaxContext->addActionContext('event-feed', 'json') - // ->initContext(); - $this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME); } public function indexAction() { $this->_helper->layout->setLayout('sidebar'); - $this->_helper->viewRenderer->setResponseSegment('sidebar'); + $this->_helper->viewRenderer->setResponseSegment('spl'); $pl_sess = $this->pl_sess; diff --git a/application/layouts/scripts/sidebar.phtml b/application/layouts/scripts/sidebar.phtml index 7c9e1284d..c53955f4f 100644 --- a/application/layouts/scripts/sidebar.phtml +++ b/application/layouts/scripts/sidebar.phtml @@ -13,7 +13,7 @@
layout()->content ?>
- +
layout()->spl ?>
diff --git a/public/js/campcaster/library/library.js b/public/js/campcaster/library/library.js index 30a8bd378..a4753ab10 100644 --- a/public/js/campcaster/library/library.js +++ b/public/js/campcaster/library/library.js @@ -143,8 +143,8 @@ $(document).ready(function() { $("#spl_sortable" ).bind( "sortstop", moveSPLItem); $("#spl_remove_selected").click(deleteSPLItem); - $("#spl_sortable").droppable(); - $("#spl_sortable" ).bind( "drop", addSPLItem); + $("#side_playlist").droppable(); + $("#side_playlist" ).bind( "drop", addSPLItem); $('input[name="all"]').click(function(){ $('form[name="SPL"]').find('input').attr("checked", $(this).attr("checked"));