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

SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes

Browse source
This commit is contained in:
Duncan Sommerville 2015-08-12 14:35:27 -04:00
parent 21250e91c4
commit 1957c7827f
18 changed files with 1573 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

13
airtime_mvc/application/controllers/NewPlaylistController.php
View file

@ -86,7 +86,7 @@ class NewPlaylistController extends Zend_Controller_Action
$this->view->length = $formatter->format();
if ($isBlock) {
$form = new Application_Form_SmartBlockCriteria();
$form = new Application_Form_SmartBlockCriteriaNew();
$form->removeDecorator('DtDdWrapper');
$form->startForm($obj->getId(), $formIsValid);
@ -531,7 +531,7 @@ class NewPlaylistController extends Zend_Controller_Action
} catch (BlockNotFoundException $e) {
$this->playlistNotFound('block', true);
}
$form = new Application_Form_SmartBlockCriteria();
$form = new Application_Form_SmartBlockCriteriaNew();
$form->startForm($params['obj_id']);
if ($form->isValid($params)) {
$this->setPlaylistNameDescAction();
@ -547,14 +547,15 @@ class NewPlaylistController extends Zend_Controller_Action
$this->view->id = $bl->getId();
$result['html'] = $this->view->render($viewPath);
$result['result'] = 1;
$result['type'] = "sb";
$result['id'] = $bl->getId();
}
$result['type'] = "sb";
$result['id'] = $bl->getId();
$result["modified"] = $bl->getLastModified("U");
} else if ($params['type'] == 'playlist') {
$result["modified"] = $this->view->modified;
$this->setPlaylistNameDescAction();
}
$result["modified"] = $this->view->modified;
$this->_helper->json->sendJson($result);
}
@ -567,7 +568,7 @@ class NewPlaylistController extends Zend_Controller_Action
try {
$bl = new Application_Model_Block($params['obj_id']);
$form = new Application_Form_SmartBlockCriteria();
$form = new Application_Form_SmartBlockCriteriaNew();
$form->startForm($params['obj_id']);
if ($form->isValid($params)) {
$result = $bl->generateSmartBlock($params['data']);

2
airtime_mvc/application/controllers/ShowBuilderController.php
View file

@ -46,7 +46,7 @@ class ShowBuilderController extends Zend_Controller_Action {
// MEDIA BUILDER
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/_spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/playlist/_smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.ui.timepicker.css?'.$CC_CONFIG['airtime_version']);