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; ?> +
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 @@ -