Merge changes from playlist preview to avoid conflicts
This commit is contained in:
parent
927fcbc42d
commit
325f99c169
|
@ -2,29 +2,7 @@
|
|||
$items = $this->contents;
|
||||
$isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic());
|
||||
$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)) : ?>
|
||||
<?php $i = 0; ?>
|
||||
<?php foreach($items as $item) :
|
||||
|
|
Loading…
Reference in New Issue