From 325f99c169e91d84c80625bbd4f5d6fc263eaa4f Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Mon, 8 Jan 2018 18:42:55 -0500
Subject: [PATCH] Merge changes from playlist preview to avoid conflicts

---
 .../views/scripts/playlist/update.phtml       | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index 2f494bbdc..5673c1fa9 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -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) :