CC-6079 - merge and remove underscore files

This commit is contained in:
Duncan Sommerville 2015-08-18 15:23:42 -04:00
parent 5ab0850d9a
commit 3f25ab2647
38 changed files with 2131 additions and 9600 deletions

View file

@ -1,21 +1,9 @@
<form id="smart-block-form" method="post" action="">
<fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?> sb-criteria-fieldset' id='smart_block_options'>
<legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span><?php echo _("Smart Block Options") ?></legend>
<form class="smart-block-form" method="post" action="">
<dl class='zend_form search-criteria'>
<div class='btn-toolbar clearfix'>
<div class='btn-group sp-button'>
<?php echo $this->element->getElement('generate_button') ?>
</div>
<div class='btn-group sp-button'>
<?php echo $this->element->getElement('shuffle_button') ?>
</div>
</div>
<div id='sp-success' class='success' style='display:none'></div>
<dd id='sp_type-element'>
<label class='sp-label'>
<?php echo $this->element->getElement('sp_type')->getLabel() ?>
<span class='playlist_type_help_icon'></span>
</label>
<?php $i=0;
$value = $this->element->getElement('sp_type')->getValue();
@ -26,6 +14,7 @@
</label>
<?php $i = $i + 1; ?>
<?php endforeach; ?>
<span class='playlist_type_help_icon'></span>
</dd>
<dd id='sp_criteria-element' class='criteria-element'>
@ -79,12 +68,10 @@
<?php } ?>
<?php } ?>
<br />
</dd>
<dd id='sp_repeate_tracks-element'>
<dd id='sp_repeat_tracks-element'>
<span class='sp_text_font'><?php echo $this->element->getElement('sp_repeat_tracks')->getLabel() ?></span>
<span class='repeat_tracks_help_icon'></span>
<?php echo $this->element->getElement('sp_repeat_tracks')?>
<?php if($this->element->getElement("sp_repeat_tracks")->hasErrors()) : ?>
<?php foreach($this->element->getElement("sp_repeat_tracks")->getMessages() as $error): ?>
@ -93,7 +80,7 @@
</span>
<?php endforeach; ?>
<?php endif; ?>
<br />
<span class='repeat_tracks_help_icon'></span>
</dd>
<dd id='sp_sort-element'>
<span class='sp_text_font'>Sort tracks by</span>
@ -105,8 +92,7 @@
</span>
<?php endforeach; ?>
<?php endif; ?>
<br />
</dd>
</dd>
<dd id='sp_limit-element'>
<span class='sp_text_font'><?php echo $this->element->getElement('sp_limit_value')->getLabel() ?></span>
<?php echo $this->element->getElement('sp_limit_value')?>
@ -118,7 +104,6 @@
</span>
<?php endforeach; ?>
<?php endif; ?>
<br />
</dd>
<?php if ($this->showPoolCount) { ?>
@ -135,7 +120,7 @@
} else if ($this->poolCount == 1) {
echo $this->poolCount;
?>
<?php echo _("file meet the criteria")?>
<?php echo _("file meets the criteria")?>
</span>
<span class='checked-icon sp-checked-icon' id='sp_pool_count_icon'></span>
<?php
@ -149,8 +134,15 @@
?>
</div>
<?php } ?>
</dl>
</fieldset>
</form>
<div class='btn-toolbar left-floated'>
<div class='btn-group sp-button'>
<?php echo $this->element->getElement('generate_button');?>
</div>
<div class='btn-group sp-button'>
<?php echo $this->element->getElement('shuffle_button');?>
</div>
</div>