From 3d3391bea7648349ff18bbba0fd94e44a5df97e0 Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Sat, 1 Dec 2018 09:21:52 -0500
Subject: [PATCH 1/7] adding part of previous PR that was mistakenly lost

---
 .../views/scripts/playlist/update.phtml       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index 563e2899a..56ccfa2d2 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -2,6 +2,35 @@
 $items = $this->contents;
 $isSmartBlock = ($this->obj instanceof Application_Model_Block);
 $isPlaylist = ($this->obj instanceof Application_Model_Playlist);
+if ($this->poolCount) { ?>
+    <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
+}
 if (count($items) && ($isSmartBlock || $isPlaylist)) : ?>
 <?php $i = 0; ?>
 <?php if ($isSmartBlock && !($this->obj->isStatic())) {

From 641ba717cfaf3e243fe1040ca9cd332cfae036cb Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Sat, 1 Dec 2018 09:42:02 -0500
Subject: [PATCH 2/7] redid refactor to pluralize output

---
 .../views/scripts/playlist/update.phtml       | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index 56ccfa2d2..da4e2397e 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -4,22 +4,15 @@ $isSmartBlock = ($this->obj instanceof Application_Model_Block);
 $isPlaylist = ($this->obj instanceof Application_Model_Playlist);
 if ($this->poolCount) { ?>
     <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 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->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") ?>

From 618ca4a5596062bb5fe8853527d8b4dfbfb139cd Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Mon, 3 Dec 2018 16:48:16 -0500
Subject: [PATCH 3/7] fixed update.phtml to simplify code and show properly on
 0 case

---
 .../views/scripts/playlist/update.phtml       | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index da4e2397e..1f649973a 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -2,27 +2,25 @@
 $items = $this->contents;
 $isSmartBlock = ($this->obj instanceof Application_Model_Block);
 $isPlaylist = ($this->obj instanceof Application_Model_Playlist);
-if ($this->poolCount) { ?>
+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 > 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 {
-            ?>
-            0 <?php echo " " . _("files meet the criteria") ?>
-            </span>
+        </span>
+        <?php if ($this->poolCount > 0) { ?>
+            <span class='checked-icon sp-checked-icon' id='sp_pool_count_icon'></span>
+        <?php }
+        else { ?>
             <span class='sp-warning-icon' id='sp_pool_count_icon'></span>
-            <?php
-        }
-        ?>
+        <?php } ?>
     </div>
     <?php
+}
+else {
+    
 }
 if (count($items) && ($isSmartBlock || $isPlaylist)) : ?>
 <?php $i = 0; ?>
@@ -170,4 +168,4 @@ if (($i < count($items) -1) && ($items[$i+1]['type'] == 0)) {
     }
 ?>
 </div>
-<?php endif; ?>
+<?php endif; ?>
\ No newline at end of file

From acc995279446b30ddb92d51704db14220631b832 Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Mon, 3 Dec 2018 16:51:39 -0500
Subject: [PATCH 4/7] removed dead code that was not being used

---
 airtime_mvc/application/forms/SmartBlockCriteria.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index b83a6e208..54ffab137 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -477,15 +477,6 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             $limitValue->setValue(1);
         }
 
-        //getting block content candidate count that meets criteria
-        $bl = new Application_Model_Block($p_blockId);
-        if ($p_isValid) {
-            $files = $bl->getListofFilesMeetCriteria();
-            $showPoolCount = true;
-        } else {
-            $files = null;
-            $showPoolCount = false;
-        }
 
         $generate = new Zend_Form_Element_Button('generate_button');
         $generate->setAttrib('class', 'sp-button btn');

From 6bae72345fe5d5371258ce4d1130f7a330e3308f Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Mon, 3 Dec 2018 20:27:45 -0500
Subject: [PATCH 5/7] removed dangling else statement

---
 airtime_mvc/application/views/scripts/playlist/update.phtml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index 1f649973a..d8070a962 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -18,9 +18,6 @@ if ($this->showPoolCount) { ?>
         <?php } ?>
     </div>
     <?php
-}
-else {
-    
 }
 if (count($items) && ($isSmartBlock || $isPlaylist)) : ?>
 <?php $i = 0; ?>

From bfe88efdf343d8092cd04fc01e836aebe78deb6b Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Mon, 10 Dec 2018 15:11:26 -0500
Subject: [PATCH 6/7] fixed grammar

---
 airtime_mvc/application/views/scripts/playlist/update.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index d8070a962..a8673626d 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -7,7 +7,7 @@ if ($this->showPoolCount) { ?>
         <span id='sp_pool_count' class='sp_text_font sp_text_font_bold'>
         <?php
             echo $this->poolCount;
-            echo ngettext(" file meets the criteria", " files meets the criteria", $this->poolCount);
+            echo ngettext(" file meets the criteria", " files meet the criteria", $this->poolCount);
         ?>
         </span>
         <?php if ($this->poolCount > 0) { ?>

From d6796ade9717acb71bc1ca185f0b8a54551e2e18 Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Mon, 10 Dec 2018 15:24:18 -0500
Subject: [PATCH 7/7] changed wording on displayed message to be more
 understandable

---
 airtime_mvc/application/views/scripts/playlist/update.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index a8673626d..212eb1d03 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -7,7 +7,7 @@ if ($this->showPoolCount) { ?>
         <span id='sp_pool_count' class='sp_text_font sp_text_font_bold'>
         <?php
             echo $this->poolCount;
-            echo ngettext(" file meets the criteria", " files meet the criteria", $this->poolCount);
+            echo ngettext(" track matches your search criteria.", " tracks match your search criteria.", $this->poolCount);
         ?>
         </span>
         <?php if ($this->poolCount > 0) { ?>