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

Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist

This commit is contained in:
James 2012-07-11 16:14:59 -04:00
parent 93b34bb079 4842f1a5a1
commit d52c079606
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
airtime_mvc/application/forms/SmartPlaylistCriteria.php
View File

@ -6,33 +6,36 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
$criteriaOptions = array( $criteriaOptions = array(
0 => "Select criteria", 0 => "Select criteria",
"track_title" => "Title", "album_title" => "Album",
"artist_name" => "Artist", "artist_name" => "Artist",
"bit_rate" => "Bit Rate", "bit_rate" => "Bit Rate",
"sample_rate" => "Sample Rate",
"length" => "Length",
"album_title" => "Album",
"genre" => "Genre",
"year" => "Year",
"track_num" => "Track Number",
"bmp" => "Bpm", "bmp" => "Bpm",
"rating" => "Rating",
"disc_number" => "Disc Number",
"mood" => "Mood",
"label" => "Label",
"composer" => "Composer",
"lyricist" => "Lyricist",
"name" => "Name",
"isrc_number" => "ISRC Number",
"language" => "Language",
"utime" => "Date Added",
"mtime" => "Date Modified",
"comments" => "Comments", "comments" => "Comments",
"orchestra" => "Orchestra",
"composer" => "Composer", "composer" => "Composer",
"conductor" => "Conductor", "conductor" => "Conductor",
"utime" => "Date Added",
"mtime" => "Date Modified",
"disc_number" => "Disc Number",
"genre" => "Genre",
"isrc_number" => "ISRC Number",
"label" => "Label",
"language" => "Language",
"length" => "Length",
"lyricist" => "Lyricist",
"mood" => "Mood",
"name" => "Name",
"orchestra" => "Orchestra",
"radio_station_name" => "Radio Station Name", "radio_station_name" => "Radio Station Name",
"soundcloud_id" => "Soundcloud Upload" "rating" => "Rating",
"sample_rate" => "Sample Rate",
"soundcloud_id" => "Soundcloud Upload",
"track_title" => "Title",
"track_num" => "Track Number",
"year" => "Year"
);
$criteriaTypes = array(
); );
$stringCriteriaOptions = array( $stringCriteriaOptions = array(
@ -106,12 +109,6 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
$this->addElement($criteriaValue); $this->addElement($criteriaValue);
} }
$limitCheck = new Zend_Form_Element_Checkbox('sp_limit_check');
$limitCheck->setLabel('Limit to');
$limitCheck->setDecorators(array('viewHelper'));
$limitCheck->setValue(true);
$this->addElement($limitCheck);
$limit = new Zend_Form_Element_Select('sp_limit_options'); $limit = new Zend_Form_Element_Select('sp_limit_options');
$limit->setAttrib('class', 'input_select'); $limit->setAttrib('class', 'input_select');
$limit->setDecorators(array('viewHelper')); $limit->setDecorators(array('viewHelper'));
@ -120,6 +117,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
$limitValue = new Zend_Form_Element_Text('sp_limit_value'); $limitValue = new Zend_Form_Element_Text('sp_limit_value');
$limitValue->setAttrib('class', 'input_text'); $limitValue->setAttrib('class', 'input_text');
$limitValue->setLabel('Limit to');
$limitValue->setDecorators(array('viewHelper')); $limitValue->setDecorators(array('viewHelper'));
$this->addElement($limitValue); $this->addElement($limitValue);

3
airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml
View File

@ -35,8 +35,7 @@
<dd id='sp_limit-element'> <dd id='sp_limit-element'>
<label> <label>
<?php echo $this->element->getElement('sp_limit_check') ?> <?php echo $this->element->getElement('sp_limit_value')->getLabel() ?>
<?php echo $this->element->getElement('sp_limit_check')->getLabel() ?>
<?php echo $this->element->getElement('sp_limit_value')?> <?php echo $this->element->getElement('sp_limit_value')?>
<?php echo $this->element->getElement('sp_limit_options') ?> <?php echo $this->element->getElement('sp_limit_options') ?>
</label> </label>