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

Merge changes from playlist preview to avoid conflicts

This commit is contained in:
Robbt 2018-01-08 18:42:55 -05:00
parent 927fcbc42d
commit 325f99c169
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
airtime_mvc/application/views/scripts/playlist/update.phtml
View File

@ -2,29 +2,7 @@
$items = $this->contents; $items = $this->contents;
$isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic()); $isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic());
$isPlaylist = ($this->obj instanceof Application_Model_Playlist); $isPlaylist = ($this->obj instanceof Application_Model_Playlist);
?>
<div class='sp_text_font sp_text_font_bold'>
<?php
if ($this->poolCount) { ?>
<span id='sp_pool_count' class='sp_text_font sp_text_font_bold'>
<?php
if ($this->poolCount > 0) {
echo $this->poolCount;
echo ngettext(" file meets the criteria", " files meets the criteria", $this->poolCount);
}
?>
</span>
<span class='checked-icon sp-checked-icon' id='sp_pool_count_icon'></span>
<?php
}
else if ($this->showPoolCount){
?>
<span class='sp-warning-icon' id='sp_pool_count_icon'></span>
<?php echo _("No files meet the criteria");
}
?>
</div>
<?php
if (count($items) && ($isStaticSmartBlock || $isPlaylist)) : ?> if (count($items) && ($isStaticSmartBlock || $isPlaylist)) : ?>
<?php $i = 0; ?> <?php $i = 0; ?>
<?php foreach($items as $item) : <?php foreach($items as $item) :