Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forgot to change some names to remove sideplaylist scripts.

This commit is contained in:
naomiaro 2011-01-16 16:00:44 -05:00
parent 01df8d8d6b
commit 91e0db7647
4 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/controllers/LibraryController.php
View File

@ -32,16 +32,16 @@ class LibraryController extends Zend_Controller_Action
$this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript'); $this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript');
$this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript'); $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
$this->view->headLink()->appendStylesheet('/css/contextmenu.css'); $this->view->headLink()->appendStylesheet('/css/contextmenu.css');
$this->view->headLink()->appendStylesheet('/css/media_library.css'); //$this->view->headLink()->appendStylesheet('/css/media_library.css');
$this->_helper->layout->setLayout('library'); $this->_helper->layout->setLayout('library');
unset($this->search_sess->page); unset($this->search_sess->page);
unset($this->search_sess->md); unset($this->search_sess->md);
$this->_helper->actionStack('index', 'playlist');
$this->_helper->actionStack('contents', 'library'); $this->_helper->actionStack('contents', 'library');
$this->_helper->actionStack('quick-search', 'library'); $this->_helper->actionStack('quick-search', 'library');
$this->_helper->actionStack('index', 'playlist');
} }
public function contextMenuAction() public function contextMenuAction()
@ -72,14 +72,14 @@ class LibraryController extends Zend_Controller_Action
if(!isset($pl_sess->id) || $pl_sess->id !== $id) { if(!isset($pl_sess->id) || $pl_sess->id !== $id) {
$menu[] = array('action' => $menu[] = array('action' =>
array('type' => 'ajax', array('type' => 'ajax',
'url' => '/Playlist/edit/view/spl'.$params, 'url' => '/Playlist/edit'.$params,
'callback' => 'window["openDiffSPL"]'), 'callback' => 'window["openDiffSPL"]'),
'title' => 'Edit'); 'title' => 'Edit');
} }
else if(isset($pl_sess->id) && $pl_sess->id === $id) { else if(isset($pl_sess->id) && $pl_sess->id === $id) {
$menu[] = array('action' => $menu[] = array('action' =>
array('type' => 'ajax', array('type' => 'ajax',
'url' => '/Playlist/close/view/spl'.$params, 'url' => '/Playlist/close'.$params,
'callback' => 'window["noOpenPL"]'), 'callback' => 'window["noOpenPL"]'),
'title' => 'Close'); 'title' => 'Close');
} }

12
application/controllers/PlaylistController.php
View File

@ -36,13 +36,10 @@ class PlaylistController extends Zend_Controller_Action
$pl = Playlist::Recall($pl_sess->id); $pl = Playlist::Recall($pl_sess->id);
if($pl === FALSE) { if($pl === FALSE) {
unset($pl_sess->id); unset($pl_sess->id);
$this->_helper->redirector('index'); return;
} }
return $pl; return $pl;
} }
$this->_helper->redirector('index');
} }
private function changePlaylist($pl_id){ private function changePlaylist($pl_id){
@ -87,12 +84,7 @@ class PlaylistController extends Zend_Controller_Action
$pl_sess = $this->pl_sess; $pl_sess = $this->pl_sess;
if(isset($pl_sess->id)) { $this->view->pl = $this->getPlaylist();
$pl = $this->getPlaylist();
$this->view->pl = $pl;
}
} }
public function newAction() public function newAction()

3
application/views/scripts/playlist/index.phtml
View File

@ -5,13 +5,12 @@
<?php endif; ?> <?php endif; ?>
<?php if (isset($this->pl)) : ?> <?php if (isset($this->pl)) : ?>
<div id="spl_name"><?php echo $this->pl->getName(); ?></div> <div id="spl_name"><?php echo $this->pl->getName(); ?></div>
<div id="spl_length"><?php echo $this->pl->getLength(); ?></div> <div id="spl_length"><?php echo $this->pl->getLength(); ?></div>
<ul id="spl_sortable"> <ul id="spl_sortable">
<?php if (count($this->pl->getContents())) : ?> <?php if (count($this->pl->getContents())) : ?>
<?php echo $this->partialLoop('sideplaylist/sidebarcontent.phtml', $this->pl->getContents()); ?> <?php echo $this->partialLoop('playlist/sidebarcontent.phtml', $this->pl->getContents()); ?>
<?php else : ?> <?php else : ?>
<li class="spl_empty">Empty playlist</li> <li class="spl_empty">Empty playlist</li>
<?php endif; ?> <?php endif; ?>

12
application/views/scripts/playlist/update.phtml
View File

@ -1,7 +1,5 @@
<?php <?php if (count($this->pl->getContents())) : ?>
if (count($this->pl->getContents())) { <?php echo $this->partialLoop('playlist/sidebarcontent.phtml', $this->pl->getContents()); ?>
echo $this->partialLoop('sideplaylist/sidebarcontent.phtml', $this->pl->getContents()); <?php else : ?>
} <li class="pl_empty">Empty playlist</li>
else { <?php endif; ?>
echo '<li class="pl_empty">Empty playlist</li>';
}