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

CC-2411 : Interface for Music Folders Preferences

Browse source 
applying html/css changes to music folder preference page.
This commit is contained in:
Naomi Aro 2011-06-27 11:46:23 +02:00
parent c5ec6b5a53
commit 4a478117c6
6 changed files with 143 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -25,11 +25,11 @@ class PreferenceController extends Zend_Controller_Action
$this->view->statusMsg = "";
$form = new Application_Form_Preferences();
if ($request->isPost()) {
if ($form->isValid($request->getPost())) {
$values = $form->getValues();
Application_Model_Preference::SetHeadTitle($values["preferences_general"]["stationName"], $this->view);
Application_Model_Preference::SetDefaultFade($values["preferences_general"]["stationDefaultFade"]);
Application_Model_Preference::SetStreamLabelFormat($values["preferences_general"]["streamFormat"]);
@ -123,7 +123,6 @@ class PreferenceController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/musicdirs.js','text/javascript');
$watched_dirs_pref = new Application_Form_WatchedDirPreferences();
$watched_dirs_pref->setWatchedDirs();
$this->view->form = $watched_dirs_pref;
}
@ -180,8 +179,6 @@ class PreferenceController extends Zend_Controller_Action
RabbitMq::SendMessageToMediaMonitor("change_stor", $data);
}
$watched_dirs_form->setWatchedDirs();
$this->view->subform = $watched_dirs_form->render();
}
@ -200,8 +197,6 @@ class PreferenceController extends Zend_Controller_Action
RabbitMq::SendMessageToMediaMonitor("new_watch", $data);
}
$watched_dirs_form->setWatchedDirs();
$this->view->subform = $watched_dirs_form->render();
}
@ -215,6 +210,9 @@ class PreferenceController extends Zend_Controller_Action
$data = array();
$data["directory"] = $chosen;
RabbitMq::SendMessageToMediaMonitor("remove_watch", $data);
$watched_dirs_form = new Application_Form_WatchedDirPreferences();
$this->view->subform = $watched_dirs_form->render();
}
}

18
airtime_mvc/application/forms/WatchedDirPreferences.php
View file

@ -47,23 +47,5 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
}
public function setWatchedDirs() {
$watched_dirs = MusicDir::getWatchedDirs();
$i = 1;
foreach($watched_dirs as $dir) {
$text = new Zend_Form_Element_Text("watched_dir_$i");
$text->setAttrib('class', 'input_text');
$text->addFilter('StringTrim');
$text->setValue($dir->getDirectory());
$text->setDecorators(array('ViewHelper'));
$this->addElement($text);
$i = $i + 1;
}
}
}

88
airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
View file

@ -1,47 +1,49 @@
<dl class="zend_form">
<fieldset class="padded" id="watched-folder-section">
<dl class="zend_form">
<dt id="storageFolder-label" class="block-display">
<label class="required" for="storageFolder"><?php echo $this->element->getElement('storageFolder')->getLabel() ?></label>
</dt>
<dd id="storageFolder-element">
<?php echo $this->element->getElement('storageFolder') ?>
<input id="storageFolder-selection" type="button" value="choose folder"></input>
<input id="storageFolder-ok" type="button" value="OK"></input>
<?php if($this->element->getElement('storageFolder')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('storageFolder')->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<dt id="storageFolder-label" class="block-display">
<label class="required" for="storageFolder"><?php echo $this->element->getElement('storageFolder')->getLabel() ?></label>
</dt>
<dd id="storageFolder-element" class="block-display">
<?php echo $this->element->getElement('storageFolder') ?>
<input id="storageFolder-selection" type="button" value="choose folder"></input>
<input id="storageFolder-ok" type="button" value="OK"></input>
<?php if($this->element->getElement('storageFolder')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('storageFolder')->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<dd class="block-display selected-item"><strong>Current Storage Folder:</strong><?php $stor = MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dt id="watchedFolder-label" class="block-display">
<label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>
</dt>
<dd id="watchedFolder-element" class="block-display">
<?php echo $this->element->getElement('watchedFolder') ?>
<input id="watchedFolder-selection" type="button" value="choose folder"></input>
<input id="watchedFolder-ok" type="button" value="OK"></input>
<?php if($this->element->getElement('watchedFolder')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('watchedFolder')->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<?php $watched_dirs = MusicDir::getWatchedDirs(); ?>
<dd id="watchedFolder-table" class="block-display selected-item">
<?php if (count($watched_dirs) > 0): ?>
<?php foreach($watched_dirs as $watched_dir): ?>
<span><?php echo $watched_dir->getDirectory(); ?></span><span class="ui-icon ui-icon-close"></span>
<?php endforeach; ?>
<?php else: ?>
<span>You are not watching any music folders.</span>
<?php endif; ?>
</dd>
<div>Current Storage Folder: <?php $stor = MusicDir::getStorDir(); echo $stor->getDirectory(); ?></div>
</dd>
<dt id="watchedFolder-label" class="block-display">
<label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>
</dt>
<dd id="watchedFolder-element">
<?php echo $this->element->getElement('watchedFolder') ?>
<input id="watchedFolder-selection" type="button" value="choose folder"></input>
<input id="watchedFolder-ok" type="button" value="OK"></input>
<?php if($this->element->getElement('watchedFolder')->hasErrors()) : ?>
<ul class='errors'>
<?php foreach($this->element->getElement('watchedFolder')->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<div id="watchedFolder-table">
<?php $i = 1; ?>
<?php $element = $this->element->getElement("watched_dir_$i"); ?>
<?php while(isset($element)): ?>
<div><span><?php echo $element->getValue(); ?></span><span class="ui-icon ui-icon-close"></span></div>
<?php $i = $i + 1; ?>
<?php $element = $this->element->getElement("watched_dir_$i"); ?>
<?php endwhile; ?>
</div>
</dl>
</dl>
</fieldset>

3
airtime_mvc/application/views/scripts/preference/directory-config.phtml
View file

@ -1,3 +1,4 @@
<div id="watched-folder-section">
<div id="watched-folder-section" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong manage-folders">
<h2>Manage Music Folders</h2>
<?php echo $this->form; ?>
</div>