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

CC-84: Smart Playlists

Browse source 
- changed playlist controller to also handle Blocks
- created new view for smart blocks
This commit is contained in:
denise 2012-07-25 11:00:46 -04:00
parent c79110644d
commit 722e470f6f
11 changed files with 349 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/configs/constants.php
View file

@ -36,7 +36,9 @@ define('UI_MDATA_VALUE_FORMAT_FILE', 'File');
define('UI_MDATA_VALUE_FORMAT_STREAM', 'live stream');
// Session Keys
define('UI_PLAYLIST_SESSNAME', 'PLAYLIST');
define('UI_PLAYLISTCONTROLLER_OBJ_SESSNAME', 'PLAYLISTCONTROLLER_OBJ');
/*define('UI_PLAYLIST_SESSNAME', 'PLAYLIST');
define('UI_BLOCK_SESSNAME', 'BLOCK');*/
// Soundcloud contants

10
airtime_mvc/application/controllers/LibraryController.php
View file

@ -7,7 +7,7 @@ require_once 'formatters/BitrateFormatter.php';
class LibraryController extends Zend_Controller_Action
{
protected $pl_sess = null;
protected $obj_sess = null;
protected $search_sess = null;
public function init()
@ -23,7 +23,7 @@ class LibraryController extends Zend_Controller_Action
->addActionContext('set-num-entries', 'json')
->initContext();
$this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME);
$this->obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
$this->search_sess = new Zend_Session_Namespace("search");
}
@ -49,9 +49,9 @@ class LibraryController extends Zend_Controller_Action
$file = Application_Model_StoredFile::Recall($id);
if (isset($this->pl_sess->id) && $screen == "playlist") {
if (isset($this->obj_sess->id) && $screen == "playlist") {
// if the user is not admin or pm, check the creator and see if this person owns the playlist
$playlist = new Application_Model_Playlist($this->pl_sess->id);
$playlist = new Application_Model_Playlist($this->obj_sess->id);
if ($isAdminOrPM || $playlist->getCreatorId() == $user->getId()) {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
}
@ -65,7 +65,7 @@ class LibraryController extends Zend_Controller_Action
$menu["download"] = array("name" => "Download", "icon" => "download", "url" => $url);
} elseif ($type === "playlist") {
$playlist = new Application_Model_Playlist($id);
if ($this->pl_sess->id !== $id && $screen == "playlist") {
if ($this->obj_sess->id !== $id && $screen == "playlist") {
if ($isAdminOrPM || $playlist->getCreatorId() == $user->getId()) {
$menu["edit"] = array("name"=> "Edit", "icon" => "edit");
}

306
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -2,7 +2,9 @@
class PlaylistController extends Zend_Controller_Action
{
protected $pl_sess = null;
/*protected $pl_sess = null;
protected $bl_sess = null;*/
protected $obj_sess = null;
public function init()
{
@ -25,78 +27,95 @@ class PlaylistController extends Zend_Controller_Action
->addActionContext('smart-playlist-criteria-save', 'json')
->addActionContext('smart-playlist-generate', 'json')
->addActionContext('smart-playlist-shuffle', 'json')
->addActionContext('new-block', 'json')
->initContext();
$this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME);
/*$this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME);
$this->bl_sess = new Zend_Session_Namespace(UI_BLOCK_SESSNAME);*/
$this->obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
}
private function getPlaylist()
private function getPlaylist($p_type)
{
$pl = null;
$obj = null;
if (isset($this->pl_sess->id)) {
$pl = new Application_Model_Playlist($this->pl_sess->id);
$objInfo = $this->getObjInfo($p_type);
if (isset($this->obj_sess->id)) {
$obj = new $objInfo['className']($this->obj_sess->id);
$modified = $this->_getParam('modified', null);
if ($pl->getLastModified("U") !== $modified) {
$this->createFullResponse($pl);
throw new PlaylistOutDatedException("You are viewing an older version of {$pl->getName()}");
if ($obj->getLastModified("U") !== $modified) {
$this->createFullResponse($obj);
throw new PlaylistOutDatedException("You are viewing an older version of {$obj->getName()}");
}
}
return $pl;
return $obj;
}
private function changePlaylist($pl_id)
private function changePlaylist($p_id, $p_type)
{
if (is_null($pl_id)) {
unset($this->pl_sess->id);
if (is_null($p_id) || is_null($p_type)) {
unset($this->obj_sess->id);
unset($this->obj_sess->type);
} else {
$this->pl_sess->id = intval($pl_id);
$this->obj_sess->id = intval($p_id);
$this->obj_sess->type = $p_type;
}
}
private function createUpdateResponse($pl)
private function createUpdateResponse($obj)
{
$formatter = new LengthFormatter($pl->getLength());
$formatter = new LengthFormatter($obj->getLength());
$this->view->length = $formatter->format();
$this->view->pl = $pl;
$this->view->obj = $obj;
$this->view->html = $this->view->render('playlist/update.phtml');
$this->view->name = $pl->getName();
$this->view->description = $pl->getDescription();
$this->view->modified = $pl->getLastModified("U");
$this->view->name = $obj->getName();
$this->view->description = $obj->getDescription();
$this->view->modified = $obj->getLastModified("U");
unset($this->view->pl);
unset($this->view->obj);
}
private function createFullResponse($pl = null, $isJson = false)
private function createFullResponse($obj = null, $isJson = false)
{
if (isset($pl)) {
$formatter = new LengthFormatter($pl->getLength());
$isBlock = false;
$viewPath = 'playlist/playlist.phtml';
if ($obj instanceof Application_Model_Block) {
$isBlock = true;
$viewPath = 'playlist/smart-block.phtml';
}
if (isset($obj)) {
$formatter = new LengthFormatter($obj->getLength());
$this->view->length = $formatter->format();
$form = new Application_Form_SmartPlaylistCriteria();
if ($isBlock) {
$form = new Application_Form_SmartBlockCriteria();
$form->removeDecorator('DtDdWrapper');
$form->startForm($pl->getId());
$form->startForm($obj->getId());
$this->view->form = $form;
$this->view->pl = $pl;
$this->view->id = $pl->getId();
if ($isJson){
return $this->view->render('playlist/playlist.phtml');
}else{
$this->view->html = $this->view->render('playlist/playlist.phtml');
}
unset($this->view->pl);
if ($isBlock){
$this->view->obj = $obj;
$this->view->id = $obj->getId();
if ($isJson) {
return $this->view->render($viewPath);
} else {
$this->view->html = $this->view->render($viewPath);
}
}else{
$this->view->obj = $obj;
$this->view->id = $obj->getId();
$this->view->html = $this->view->render($viewPath);
unset($this->view->obj);
}
}
else {
if ($isJson){
return $this->view->render('playlist/playlist.phtml');
}else{
$this->view->html = $this->view->render('playlist/playlist.phtml');
}
$this->view->html = $this->view->render($viewPath);
}
}
@ -105,23 +124,23 @@ class PlaylistController extends Zend_Controller_Action
$this->view->error = $e->getMessage();
}
private function playlistDynamic($pl)
private function playlistDynamic($obj)
{
$this->view->error = "You cannot add tracks to dynamic playlist.";
$this->createFullResponse($pl);
$this->createFullResponse($obj);
}
private function playlistNotFound()
private function playlistNotFound($p_type)
{
$this->view->error = "Playlist not found";
$this->view->error = "{$p_type} not found";
Logging::log("Playlist not found");
$this->changePlaylist(null);
Logging::log("{$p_type} not found");
$this->changePlaylist(null, $p_type);
$this->createFullResponse(null);
}
private function playlistNoPermission(){
$this->view->error = "You don't have permission to delete selected playlist(s).";
private function playlistNoPermission($p_type){
$this->view->error = "You don't have permission to delete selected {$p_type}(s).";
}
private function playlistUnknownError($e)
@ -164,20 +183,21 @@ class PlaylistController extends Zend_Controller_Action
$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
try {
if (isset($this->pl_sess->id)) {
$pl = new Application_Model_Playlist($this->pl_sess->id);
if (isset($this->obj_sess->id)) {
$objInfo = $this->getObjInfo($this->obj_sess->type);
$obj = new $objInfo['className']($this->obj_sess->id);
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
$isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
if($isAdminOrPM || $pl->getCreatorId() == $userInfo->id){
$this->view->pl = $pl;
$form = new Application_Form_SmartPlaylistCriteria();
$form->startForm($this->pl_sess->id);
$this->view->form = $form;
if($isAdminOrPM || $obj->getCreatorId() == $userInfo->id){
$this->view->obj = $obj;
//$form = new Application_Form_SmartBlockCriteria();
//$form->startForm($this->pl_sess->id);
//$this->view->form = $form;
}
$formatter = new LengthFormatter($pl->getLength());
$formatter = new LengthFormatter($obj->getLength());
$this->view->length = $formatter->format();
}
} catch (PlaylistNotFoundException $e) {
@ -189,26 +209,45 @@ class PlaylistController extends Zend_Controller_Action
public function newAction()
{
$pl_sess = $this->pl_sess;
//$pl_sess = $this->pl_sess;
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$type = $this->_getParam('type');
$objInfo = $this->getObjInfo($type);
$name = 'Untitled Playlist';
if ($type == 'block') {
$name = 'Untitled Smart Block';
}
$obj = new $objInfo['className']();
$obj->setName($name);
$obj->setMetaData('dc:creator', $userInfo->id);
$this->changePlaylist($obj->getId(), $type);
$this->createFullResponse($obj);
}
/*public function newBlockAction()
{
$bl_sess = $this->bl_sess;
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$pl = new Application_Model_Playlist();
$pl->setName("Untitled Playlist");
$pl->setPLMetaData('dc:creator', $userInfo->id);
$bl = new Application_Model_Block();
$bl->setName("Untitled Smart Block");
$bl->setBLMetaData('dc:creator', $userInfo->id);
$this->changePlaylist($pl->getId());
$this->createFullResponse($pl);
}
$this->changePlaylist($bl->getId(), 'block');
$this->createFullResponse($bl);
}*/
public function editAction()
{
$id = $this->_getParam('id', null);
Logging::log("editing playlist {$id}");
//$form = new Application_Form_SmartPlaylist();
if (!is_null($id)) {
$this->changePlaylist($id);
$this->changePlaylist($id, 'playlist');
}
try {
@ -225,30 +264,37 @@ class PlaylistController extends Zend_Controller_Action
{
$ids = $this->_getParam('ids');
$ids = (!is_array($ids)) ? array($ids) : $ids;
$pl = null;
$type = $this->_getParam('type');
$obj = null;
$objInfo = $this->getObjInfo($type);
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
try {
Logging::log("Currently active playlist {$this->pl_sess->id}");
if (in_array($this->pl_sess->id, $ids)) {
Logging::log("Deleting currently active playlist");
$this->changePlaylist(null);
Logging::log("Currently active {$type} {$this->obj_sess->id}");
if (in_array($this->obj_sess->id, $ids)) {
Logging::log("Deleting currently active {$type}");
$this->changePlaylist(null, $type);
} else {
Logging::log("Not deleting currently active playlist");
$pl = new Application_Model_Playlist($this->pl_sess->id);
Logging::log("Not deleting currently active {$type}");
$obj = new $objInfo['className']($this->obj_sess->id);
}
if (strcmp($objInfo['className'], 'Application_Model_Playlist')==0) {
Application_Model_Playlist::deletePlaylists($ids, $userInfo->id);
$this->createFullResponse($pl);
} else {
Application_Model_Block::deleteBlocks($ids, $userInfo->id);
}
$this->createFullResponse($obj);
}
catch (PlaylistNoPermissionException $e) {
$this->playlistNoPermission();
$this->playlistNoPermission($type);
}
catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -260,24 +306,25 @@ class PlaylistController extends Zend_Controller_Action
$ids = (!is_array($ids)) ? array($ids) : $ids;
$afterItem = $this->_getParam('afterItem', null);
$addType = $this->_getParam('type', 'after');
$obj_type = $this->_getParam('obj_type');
try {
$pl = $this->getPlaylist();
if ($pl->isStatic()) {
$pl->addAudioClips($ids, $afterItem, $addType);
$this->createUpdateResponse($pl);
$obj = $this->getPlaylist($obj_type);
if ($obj_type == 'playlist' || $obj->isStatic()) {
$obj->addAudioClips($ids, $afterItem, $addType);
$this->createUpdateResponse($obj);
} else {
throw new PlaylistDyanmicException;
}
}
catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e);
$this->playlistOutdated($obj, $e);
}
catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($obj_type);
}
catch (PlaylistDyanmicException $e) {
$this->playlistDynamic($pl);
$this->playlistDynamic($obj);
}
catch (Exception $e) {
$this->playlistUnknownError($e);
@ -290,15 +337,16 @@ class PlaylistController extends Zend_Controller_Action
$ids = (!is_array($ids)) ? array($ids) : $ids;
$afterItem = $this->_getParam('afterItem', null);
$modified = $this->_getParam('modified');
$type = $this->_getParam('obj_type');
try {
$pl = $this->getPlaylist();
$pl->moveAudioClips($ids, $afterItem);
$this->createUpdateResponse($pl);
$obj = $this->getPlaylist($type);
$obj->moveAudioClips($ids, $afterItem);
$this->createUpdateResponse($obj);
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -309,15 +357,16 @@ class PlaylistController extends Zend_Controller_Action
$ids = $this->_getParam('ids');
$ids = (!is_array($ids)) ? array($ids) : $ids;
$modified = $this->_getParam('modified');
$type = $this->_getParam('obj_type');
try {
$pl = $this->getPlaylist();
$pl->delAudioClips($ids);
$this->createUpdateResponse($pl);
$obj = $this->getPlaylist($type);
$obj->delAudioClips($ids);
$this->createUpdateResponse($obj);
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -328,21 +377,22 @@ class PlaylistController extends Zend_Controller_Action
$id = $this->_getParam('id');
$cueIn = $this->_getParam('cueIn', null);
$cueOut = $this->_getParam('cueOut', null);
$type = $this->_getParam('type');
try {
$pl = $this->getPlaylist();
$response = $pl->changeClipLength($id, $cueIn, $cueOut);
$obj = $this->getPlaylist($type);
$response = $obj->changeClipLength($id, $cueIn, $cueOut);
if (!isset($response["error"])) {
$this->view->response = $response;
$this->createUpdateResponse($pl);
$this->createUpdateResponse($obj);
} else {
$this->view->cue_error = $response["error"];
}
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -353,13 +403,14 @@ class PlaylistController extends Zend_Controller_Action
$id = $this->_getParam('id');
$fadeIn = $this->_getParam('fadeIn', null);
$fadeOut = $this->_getParam('fadeOut', null);
$type = $this->_getParam('type');
try {
$pl = $this->getPlaylist();
$response = $pl->changeFadeInfo($id, $fadeIn, $fadeOut);
$obj = $this->getPlaylist($type);
$response = $obj->changeFadeInfo($id, $fadeIn, $fadeOut);
if (!isset($response["error"])) {
$this->createUpdateResponse($pl);
$this->createUpdateResponse($obj);
$this->view->response = $response;
} else {
$this->view->fade_error = $response["error"];
@ -367,7 +418,7 @@ class PlaylistController extends Zend_Controller_Action
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -375,17 +426,18 @@ class PlaylistController extends Zend_Controller_Action
public function getPlaylistFadesAction()
{
$type = $this->_getParam('type');
try {
$pl = $this->getPlaylist();
$fades = $pl->getFadeInfo(0);
$obj = $this->getPlaylist($type);
$fades = $obj->getFadeInfo(0);
$this->view->fadeIn = $fades[0];
$fades = $pl->getFadeInfo($pl->getSize()-1);
$fades = $obj->getFadeInfo($obj->getSize()-1);
$this->view->fadeOut = $fades[1];
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -400,15 +452,16 @@ class PlaylistController extends Zend_Controller_Action
{
$fadeIn = $this->_getParam('fadeIn', null);
$fadeOut = $this->_getParam('fadeOut', null);
$type = $this->_getParam('type');
try {
$pl = $this->getPlaylist();
$pl->setPlaylistfades($fadeIn, $fadeOut);
$this->view->modified = $pl->getLastModified("U");
$obj = $this->getPlaylist($type);
$obj->setPlaylistfades($fadeIn, $fadeOut);
$this->view->modified = $obj->getLastModified("U");
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -417,16 +470,17 @@ class PlaylistController extends Zend_Controller_Action
public function setPlaylistNameAction()
{
$name = $this->_getParam('name', 'Unknown Playlist');
$type = $this->_getParam('type');
try {
$pl = $this->getPlaylist();
$pl->setName($name);
$obj = $this->getPlaylist($type);
$obj->setName($name);
$this->view->playlistName = $name;
$this->view->modified = $pl->getLastModified("U");
$this->view->modified = $obj->getLastModified("U");
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -435,16 +489,17 @@ class PlaylistController extends Zend_Controller_Action
public function setPlaylistDescriptionAction()
{
$description = $this->_getParam('description', "");
$type = $this->_getParam('type');
try {
$pl = $this->getPlaylist();
$pl->setDescription($description);
$this->view->description = $pl->getDescription();
$this->view->modified = $pl->getLastModified("U");
$obj = $this->getPlaylist($type);
$obj->setDescription($description);
$this->view->description = $obj->getDescription();
$this->view->modified = $obj->getLastModified("U");
} catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound($type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
@ -470,7 +525,7 @@ class PlaylistController extends Zend_Controller_Action
die(json_encode(array("result"=>0, "html"=>$this->createFullResponse($pl, true))));
}
catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound('block');
}
catch (Exception $e) {
$this->playlistUnknownError($e);
@ -491,7 +546,7 @@ class PlaylistController extends Zend_Controller_Action
die(json_encode(array("result"=>0, "html"=>$this->createFullResponse($pl, true))));
}
catch (PlaylistNotFoundException $e) {
$this->playlistNotFound();
$this->playlistNotFound('block');
}
catch (Exception $e) {
$this->playlistUnknownError($e);
@ -501,4 +556,17 @@ class PlaylistController extends Zend_Controller_Action
}
}
public function getObjInfo($p_type)
{
$info = array();
if (strcmp($p_type, 'playlist')==0) {
$info['className'] = 'Application_Model_Playlist';
} else {
$info['className'] = 'Application_Model_Block';
}
return $info;
}
}

4
airtime_mvc/application/forms/SmartPlaylistCriteria.php → airtime_mvc/application/forms/SmartBlockCriteria.php
View file

@ -1,5 +1,5 @@
<?php
class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
{
public function init(){
@ -241,7 +241,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
$this->addElement($shuffle);
$this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/smart-playlist-criteria.phtml', "openOption"=> $openSmartPlaylistOption,
array('ViewScript', array('viewScript' => 'form/smart-block-criteria.phtml', "openOption"=> $openSmartPlaylistOption,
'criteriasLength' => count($criteriaOptions), 'poolCount' => $files['count']))
));
}

4
airtime_mvc/application/models/Playlist.php
View file

@ -765,7 +765,7 @@ class Application_Model_Playlist
return $md;
}
public function getPLMetaData($category)
public function getMetaData($category)
{
$cat = $this->categories[$category];
$method = 'get' . $cat;
@ -773,7 +773,7 @@ class Application_Model_Playlist
return $this->$method();
}
public function setPLMetaData($category, $value)
public function setMetaData($category, $value)
{
$cat = $this->categories[$category];

0
airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml → airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View file

15
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View file

@ -1,17 +1,18 @@
<button id="spl_new" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">New</button>
<?php if (isset($this->pl)) : ?>
<?php if (isset($this->obj)) : ?>
<button id="spl_delete" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">Delete</button>
<a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button">
<span class="ui-icon crossfade-main-icon"></span><span class="ui-button-text">Playlist crossfade</span>
</a>
<?php endif; ?>
<?php if (isset($this->pl)) : ?>
<input id="pl_id" type="hidden" value="<?php echo $this->pl->getId(); ?>"></input>
<input id="pl_lastMod" type="hidden" value="<?php echo $this->pl->getLastModified('U'); ?>"></input>
<?php if (isset($this->obj)) : ?>
<input id="pl_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input>
<input id="pl_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input>
<input id='obj_type' type='hidden' value='playlist'></input>
<div class="playlist_title">
<h3 id="spl_name">
<a id="playlist_name_display" contenteditable="true"><?php echo $this->pl->getName(); ?></a>
<a id="playlist_name_display" contenteditable="true"><?php echo $this->obj->getName(); ?></a>
</h3>
<h4 id="spl_length"><?php echo $this->length; ?></h4>
</div>
@ -21,7 +22,7 @@
<dl class="zend_form">
<dt id="description-label"><label for="description">Description</label></dt>
<dd id="description-element">
<textarea cols="80" rows="24" id="description" name="description"><?php echo $this->pl->getDescription(); ?></textarea>
<textarea cols="80" rows="24" id="description" name="description"><?php echo $this->obj->getDescription(); ?></textarea>
</dd>
<dt id="submit-label" style="display: none;">&nbsp;</dt>
<dd id="submit-element" class="buttons">
@ -31,7 +32,7 @@
</dl>
</fieldset>
<?php echo $this->form; ?>
<?php //echo $this->form; ?>
<div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
<span class="ui-icon ui-icon-closethick"></span>

58
airtime_mvc/application/views/scripts/playlist/smart-block.phtml Normal file
View file

@ -0,0 +1,58 @@
<button id="spl_new" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">New</button>
<?php if (isset($this->obj)) : ?>
<button id="spl_delete" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">Delete</button>
<a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button">
<span class="ui-icon crossfade-main-icon"></span><span class="ui-button-text">Playlist crossfade</span>
</a>
<?php endif; ?>
<?php if (isset($this->obj)) : ?>
<input id="bl_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input>
<input id="bl_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input>
<input id='obj_type' type='hidden' value='block'></input>
<div class="playlist_title">
<h3 id="bl_name">
<a id="playlist_name_display" contenteditable="true"><?php echo $this->obj->getName(); ?></a>
</h3>
<h4 id="bl_length"><?php echo $this->length; ?></h4>
</div>
<fieldset class="toggle closed" id="fieldset-metadate_change">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
<dl class="zend_form">
<dt id="description-label"><label for="description">Description</label></dt>
<dd id="description-element">
<textarea cols="80" rows="24" id="description" name="description"><?php echo $this->obj->getDescription(); ?></textarea>
</dd>
<dt id="submit-label" style="display: none;">&nbsp;</dt>
<dd id="submit-element" class="buttons">
<input class="ui-button ui-state-default" type="submit" value="Cancel" id="description_cancel" name="cancel">
<input class="ui-button ui-state-default" type="submit" value="Save" id="description_save" name="submit">
</dd>
</dl>
</fieldset>
<?php echo $this->form; ?>
<div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
<span class="ui-icon ui-icon-closethick"></span>
<dl id="spl_editor-main" class="inline-list">
<dt>Fade in (s):</dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
<dd class="edit-error"></dd>
<dt>Fade out (s):</dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
<dd class="edit-error"></dd>
</dl>
</div>
<div class="clear"></div>
<div class="" style="clear:both; float:none; width:100%;">
<ul id="spl_sortable">
<?php //echo $this->render('playlist/update.phtml') ?>
</ul>
</div>
<?php else : ?>
<div>No open smart block</div>
<?php endif; ?>

2
airtime_mvc/application/views/scripts/playlist/update.phtml
View file

@ -1,5 +1,5 @@
<?php
$items = $this->pl->getContents();
$items = $this->obj->getContents();
if (count($items)) : ?>
<?php $i = 0; ?>
<?php foreach($items as $item) : ?>

80
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -70,7 +70,8 @@ var AIRTIME = (function(AIRTIME){
cueIn = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
lastMod = getModified();
lastMod = getModified(),
type = $('#obj_type').val();
if (!isTimeValid(cueIn)){
showError(span, "please put in a time '00:00:00 (.000000)'");
@ -78,7 +79,7 @@ var AIRTIME = (function(AIRTIME){
}
$.post(url,
{format: "json", cueIn: cueIn, id: id, modified: lastMod},
{format: "json", cueIn: cueIn, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
@ -108,7 +109,8 @@ var AIRTIME = (function(AIRTIME){
cueOut = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
lastMod = getModified();
lastMod = getModified(),
type = $('#obj_type').val();
if (!isTimeValid(cueOut)){
showError(span, "please put in a time '00:00:00 (.000000)'");
@ -116,7 +118,7 @@ var AIRTIME = (function(AIRTIME){
}
$.post(url,
{format: "json", cueOut: cueOut, id: id, modified: lastMod},
{format: "json", cueOut: cueOut, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
@ -146,7 +148,8 @@ var AIRTIME = (function(AIRTIME){
fadeIn = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
lastMod = getModified();
lastMod = getModified(),
type = $('#obj_type').val();
if (!isFadeValid(fadeIn)){
showError(span, "please put in a time in seconds '00 (.000000)'");
@ -154,7 +157,7 @@ var AIRTIME = (function(AIRTIME){
}
$.post(url,
{format: "json", fadeIn: fadeIn, id: id, modified: lastMod},
{format: "json", fadeIn: fadeIn, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
@ -183,7 +186,8 @@ var AIRTIME = (function(AIRTIME){
fadeOut = $.trim(span.text()),
li = span.parents("li"),
unqid = li.attr("unqid"),
lastMod = getModified();
lastMod = getModified(),
type = $('#obj_type').val();
if (!isFadeValid(fadeOut)){
showError(span, "please put in a time in seconds '00 (.000000)'");
@ -191,7 +195,7 @@ var AIRTIME = (function(AIRTIME){
}
$.post(url,
{format: "json", fadeOut: fadeOut, id: id, modified: lastMod},
{format: "json", fadeOut: fadeOut, id: id, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
@ -256,12 +260,13 @@ var AIRTIME = (function(AIRTIME){
function editName() {
var nameElement = $(this),
lastMod = getModified();
lastMod = getModified(),
type = $('#obj_type').val();
url = '/Playlist/set-playlist-name';
$.post(url,
{format: "json", name: nameElement.text(), modified: lastMod},
{format: "json", name: nameElement.text(), modified: lastMod, type: type},
function(json){
if (json.error !== undefined) {
@ -378,7 +383,8 @@ var AIRTIME = (function(AIRTIME){
//main playlist fades events
$pl.on("click", "#spl_crossfade", function() {
var lastMod = getModified();
var lastMod = getModified(),
type = $('#obj_type');
if ($(this).hasClass("ui-state-active")) {
$(this).removeClass("ui-state-active");
@ -390,7 +396,7 @@ var AIRTIME = (function(AIRTIME){
var url = '/Playlist/get-playlist-fades';
$.get(url,
{format: "json", modified: lastMod},
{format: "json", modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
playlistError(json);
@ -416,7 +422,8 @@ var AIRTIME = (function(AIRTIME){
var url = "/Playlist/set-playlist-fades",
span = $(this),
fadeIn = $.trim(span.text()),
lastMod = getModified();
lastMod = getModified(),
type = $('#obj_type').val();
if (!isFadeValid(fadeIn)){
showError(span, "please put in a time in seconds '00 (.000000)'");
@ -424,7 +431,7 @@ var AIRTIME = (function(AIRTIME){
}
$.post(url,
{format: "json", fadeIn: fadeIn, modified: lastMod},
{format: "json", fadeIn: fadeIn, modified: lastMod, type: type},
function(json){
hideError(span);
if (json.modified !== undefined) {
@ -439,7 +446,8 @@ var AIRTIME = (function(AIRTIME){
var url = "/Playlist/set-playlist-fades",
span = $(this),
fadeOut = $.trim(span.text()),
lastMod = getModified();
lastMod = getModified(),
type = $('#obj_type').val();
if (!isFadeValid(fadeOut)){
showError(span, "please put in a time in seconds '00 (.000000)'");
@ -447,7 +455,7 @@ var AIRTIME = (function(AIRTIME){
}
$.post(url,
{format: "json", fadeOut: fadeOut, modified: lastMod},
{format: "json", fadeOut: fadeOut, modified: lastMod, type: type},
function(json){
hideError(span);
if (json.modified !== undefined) {
@ -485,12 +493,13 @@ var AIRTIME = (function(AIRTIME){
var textarea = $pl.find("#fieldset-metadate_change textarea"),
description = textarea.val(),
url,
lastMod = getModified();;
lastMod = getModified(),
type = $('#obj_type').val();
url = '/Playlist/set-playlist-description';
$.post(url,
{format: "json", description: description, modified: lastMod},
{format: "json", description: description, modified: lastMod, type: type},
function(json){
if (json.error !== undefined){
playlistError(json);
@ -612,7 +621,20 @@ var AIRTIME = (function(AIRTIME){
stopAudioPreview();
$.post(url,
{format: "json"},
{format: "json", type: 'playlist'},
function(json){
openPlaylist(json);
redrawLib();
});
};
mod.fnNewBlock = function() {
var url = '/Playlist/new';
stopAudioPreview();
$.post(url,
{format: "json", type: 'block'},
function(json){
openPlaylist(json);
redrawLib();
@ -637,10 +659,11 @@ var AIRTIME = (function(AIRTIME){
stopAudioPreview();
id = (plid === undefined) ? getId() : plid;
lastMod = getModified();
type = $('#obj_type').val();
url = '/Playlist/delete';
$.post(url,
{format: "json", ids: id, modified: lastMod},
{format: "json", ids: id, modified: lastMod, type: type},
function(json){
openPlaylist(json);
redrawLib();
@ -690,13 +713,15 @@ var AIRTIME = (function(AIRTIME){
}
function playlistRequest(sUrl, oData) {
var lastMod;
var lastMod,
obj_type = $('#obj_type').val();
mod.disableUI();
lastMod = getModified();
oData["modified"] = lastMod;
oData["obj_type"] = obj_type;
oData["format"] = "json";
$.post(
@ -728,9 +753,18 @@ var AIRTIME = (function(AIRTIME){
};
mod.init = function() {
$.contextMenu({
selector: '#spl_new',
trigger: "left",
ignoreRightClick: true,
items: {
"sp": {name: "New Playlist", callback: AIRTIME.playlist.fnNew},
"sb": {name: "New Smart Block", callback: AIRTIME.playlist.fnNewBlock}
}
});
/*
$pl.delegate("#spl_new",
{"click": AIRTIME.playlist.fnNew});
{"click": AIRTIME.playlist.fnNew});*/
$pl.delegate("#spl_delete", {"click": function(ev){
AIRTIME.playlist.fnDelete();

2
airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
View file

@ -179,6 +179,7 @@ function setSmartPlaylistEvents() {
function setupUI() {
var playlist_type = $('input:radio[name=sp_type]:checked').val();
if ($('#obj_type').val() == 'block') {
if (playlist_type == "0") {
$('button[id="generate_button"]').show();
$('button[id="shuffle_button"]').show();
@ -197,6 +198,7 @@ function setupUI() {
*/
$('#spl_sortable').hide();
}
}
$(".playlist_type_help_icon").qtip({
content: {