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

Merge remote-tracking branch 'robbt/fix/show_files_meet_criteria' into dev/merge-testing

Browse source
This commit is contained in:
Lucas Bickel 2018-01-09 21:51:30 +01:00
commit b7b581e6ec
5 changed files with 14 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

29
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View file

@ -119,35 +119,6 @@
<?php } ?>
</dd>
<?php if ($this->showPoolCount) { ?>
<div class='sp_text_font sp_text_font_bold'>
<span id='sp_pool_count' class='sp_text_font sp_text_font_bold'>
<?php
if ($this->poolCount > 1) {
echo $this->poolCount;
?>
<?php echo _("files meet the criteria")?>
</span>
<span class='checked-icon sp-checked-icon' id='sp_pool_count_icon'></span>
<?php
} else if ($this->poolCount == 1) {
echo $this->poolCount;
?>
<?php echo _("file meets the criteria")?>
</span>
<span class='checked-icon sp-checked-icon' id='sp_pool_count_icon'></span>
<?php
} else {
?>
0 <?php echo " "._("files meet the criteria")?>
</span>
<span class='sp-warning-icon' id='sp_pool_count_icon'></span>
<?php
}
?>
</div>
<?php } ?>
</dl>
</form>

1
airtime_mvc/application/views/scripts/playlist/update.phtml
View file

@ -123,6 +123,7 @@ if (($i < count($items) -1) && ($items[$i+1]['type'] == 0)) {
}
echo $this->partial('playlist/set-fade.phtml', $vars);
?>
</div>
<?php endif; ?>