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

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

Browse source
This commit is contained in:
James 2012-07-17 11:07:38 -04:00
commit 7c07bf146c
6 changed files with 44 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/forms/SmartPlaylistCriteria.php
View file

@ -216,8 +216,16 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
$save = new Zend_Form_Element_Button('save_button');
$save->setAttrib('class', 'ui-button ui-state-default right-floated');
$save->setIgnore(true);
$save->setLabel('Generate');
$save->setLabel('Save');
$save->setDecorators(array('viewHelper'));
$this->addElement($save);
$generate = new Zend_Form_Element_Button('generate_button');
$generate->setAttrib('class', 'ui-button ui-state-default right-floated');
$generate->setIgnore(true);
$generate->setLabel('Generate');
$generate->setDecorators(array('viewHelper'));
$this->addElement($generate);
}

10
airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml
View file

@ -27,7 +27,7 @@
<?php echo $this->element->getElement('sp_criteria_modifier_'.$i) ?>
<?php echo $this->element->getElement('sp_criteria_value_'.$i) ?><span id="extra_criteria" <?php echo $this->element->getElement('sp_criteria_extra_'.$i)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>> to <?php echo $this->element->getElement('sp_criteria_extra_'.$i) ?></span>
<?php if ($i != 0) { ?>
<a class='ui-button sp-add sp-ui-button-icon-only' id='criteria_remove_<?php echo $i ?>'>
<a class='ui-button sp-ui-button-icon-only' id='criteria_remove_<?php echo $i ?>'>
<span class='ui-icon ui-icon-closethick'></span>
</a>
<?php } ?>
@ -45,10 +45,10 @@
<?php echo $this->element->getElement('sp_limit_options') ?>
</label>
</dd>
<dd id='sp_save'>
<?php echo $this->element->getElement('save_button') ?>
</dd>
<dd id='action_buttons'>
<?php echo $this->element->getElement('save_button') ?>
<?php echo $this->element->getElement('generate_button') ?>
</dd>
</dl>
</fieldset>

4
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View file

@ -31,9 +31,7 @@
</dl>
</fieldset>
<?php
echo $this->form; ?>
<?php echo $this->form; ?>
<div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
<span class="ui-icon ui-icon-closethick"></span>