From 89267748d40df008b5a2e805c1d93cec733e8493 Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 11 Feb 2011 18:55:08 -0500 Subject: [PATCH] CC-1916 playlist metadata page looks better. --- .../controllers/PlaylistController.php | 34 +++++------ application/forms/PlaylistMetadata.php | 12 +++- .../views/scripts/playlist/metadata.phtml | 4 +- application/views/scripts/playlist/new.phtml | 5 +- public/css/styles.css | 59 ++++++++++++++++++- public/js/airtime/library/spl.js | 32 +++++----- 6 files changed, 107 insertions(+), 39 deletions(-) diff --git a/application/controllers/PlaylistController.php b/application/controllers/PlaylistController.php index a047e47da..e32eb2e59 100644 --- a/application/controllers/PlaylistController.php +++ b/application/controllers/PlaylistController.php @@ -93,7 +93,8 @@ class PlaylistController extends Zend_Controller_Action $this->changePlaylist($pl_id); $form = new Application_Form_PlaylistMetadata(); - $this->view->form = $form->__toString(); + $this->view->fieldset = $form; + $this->view->form = $this->view->render('playlist/new.phtml'); } public function metadataAction() @@ -115,26 +116,25 @@ class PlaylistController extends Zend_Controller_Action } if ($request->isPost()) { - if ($form->isValid($request->getPost())) { - - $formdata = $form->getValues(); + $title = $this->_getParam('title', null); + $description = $this->_getParam('description', null); - $pl = $this->getPlaylist(); - - if($formdata["title"]) - $pl->setName($formdata["title"]); - - if(isset($formdata["description"])) { - $pl->setPLMetaData(UI_MDATA_KEY_DESCRIPTION, $formdata["description"]); - } + $pl = $this->getPlaylist(); + + if($title) + $pl->setName($title); + + if(isset($description)) { + $pl->setPLMetaData(UI_MDATA_KEY_DESCRIPTION, $description); + } - $this->view->pl = $pl; - $this->view->html = $this->view->render('playlist/index.phtml'); - unset($this->view->pl); - } + $this->view->pl = $pl; + $this->view->html = $this->view->render('playlist/index.phtml'); + unset($this->view->pl); } - $this->view->form = $form->__toString(); + $this->view->fieldset = $form; + $this->view->form = $this->view->render('playlist/new.phtml'); } public function editAction() diff --git a/application/forms/PlaylistMetadata.php b/application/forms/PlaylistMetadata.php index 4fc64ce39..fb546f35a 100644 --- a/application/forms/PlaylistMetadata.php +++ b/application/forms/PlaylistMetadata.php @@ -1,6 +1,6 @@ addElement('text', 'title', array( 'label' => 'Title:', + 'class' => 'input_text', 'required' => false, 'filters' => array('StringTrim'), 'validators' => array( @@ -18,10 +19,15 @@ class Application_Form_PlaylistMetadata extends Zend_Form // Add the comment element $this->addElement('textarea', 'description', array( 'label' => 'Description:', + 'class' => 'input_text_area', 'required' => false, )); + + // Add the comment element + $this->addElement('button', 'new_playlist_submit', array( + 'label' => 'Submit', + 'ignore' => true + )); } - - } diff --git a/application/views/scripts/playlist/metadata.phtml b/application/views/scripts/playlist/metadata.phtml index 440203443..63e18ca2c 100644 --- a/application/views/scripts/playlist/metadata.phtml +++ b/application/views/scripts/playlist/metadata.phtml @@ -1 +1,3 @@ -form; ?> +
+view->fieldset; ?> +
diff --git a/application/views/scripts/playlist/new.phtml b/application/views/scripts/playlist/new.phtml index 07e36af17..efd1d6872 100644 --- a/application/views/scripts/playlist/new.phtml +++ b/application/views/scripts/playlist/new.phtml @@ -1 +1,4 @@ -

View script for controller Playlist and script/action name new
\ No newline at end of file +

Playlist Metadata

+
+fieldset; ?> +
diff --git a/public/css/styles.css b/public/css/styles.css index adf53ab77..6512e8fb8 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -1347,6 +1347,61 @@ ul.errors li { #show_content_dialog .datatable { margin-top:8px; - - +} +.simple-formblock.metadata { + border:none; + width:100%; +} +#side_playlist .simple-formblock.metadata .input_text, #side_playlist .simple-formblock.metadata .input_text_area { + width:95%; +} +#side_playlist .simple-formblock.metadata.simple-formblock dd { + width:70%; +} +#side_playlist h3.plain { + float:none; + font-size:18px; + margin:2px 0 20px 0; +} + +.qtip { + font-size:11px; + line-height:160%; +} + +#schedule-show-who.scrolled { + margin-bottom: 0; + max-height:300px; + overflow:auto; +} +.text-content { + padding:20px 10px 0 20px; +} +.text-content h2 { + font-size:2.8em; + color:#242424; +} +.text-content p { + font-size:1.6em; + line-height:140%; + color:#242424; + margin:0 0 1.4em 0; +} +.text-content a { + color:#cccccc; + text-decoration:none; +} +.text-content a:hover { + text-decoration:underline; +} + +.text-content ol { + margin:0; + list-style-position:inside; +} + +.text-content ol li { + margin:0 0 4px 0; + font-size:1.6em; + list-style-position:inside; } \ No newline at end of file diff --git a/public/js/airtime/library/spl.js b/public/js/airtime/library/spl.js index 101ef9a2d..e32e83f62 100644 --- a/public/js/airtime/library/spl.js +++ b/public/js/airtime/library/spl.js @@ -331,20 +331,8 @@ function closeSPL() { function createPlaylistMetaForm(json) { var submit, form; - submit = $('') - .button() - .click(function(){ - var url, data; - - url = '/Playlist/metadata/format/json'; - data = $("#side_playlist form").serialize(); - - $.post(url, data, function(json){ - openDiffSPL(json); - }) - }); - form = $(json.form); + form.find("fieldset").addClass("simple-formblock metadata"); form.find("input, textarea") .keydown(function(event){ @@ -355,10 +343,24 @@ function createPlaylistMetaForm(json) { } }) + form.find("#new_playlist_submit") + .button() + .click(function(event){ + event.preventDefault(); + + var url, data; + + url = '/Playlist/metadata/format/json'; + data = $("#side_playlist form").serialize(); + + $.post(url, data, function(json){ + openDiffSPL(json); + }) + }); + $("#side_playlist") .empty() - .append(form) - .append(submit); + .append(form); } function newSPL() {