From 927fcbc42d9871080ff7bd8323692b2ec611f3f5 Mon Sep 17 00:00:00 2001
From: Robb Ebright <ebright.48@osu.edu>
Date: Wed, 3 Jan 2018 18:57:02 -0500
Subject: [PATCH] Pluralized file criteria, cleaned up CSS and removed dead
 code

---
 .../controllers/PlaylistController.php        |  1 +
 .../application/forms/SmartBlockCriteria.php  |  3 +-
 .../scripts/form/smart-block-criteria.phtml   | 31 --------------
 .../views/scripts/playlist/update.phtml       | 40 ++++++++-----------
 airtime_mvc/public/css/styles.css             |  3 ++
 5 files changed, 22 insertions(+), 56 deletions(-)

diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 0fde85f88..4c63d73e5 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -67,6 +67,7 @@ class PlaylistController extends Zend_Controller_Action
         if ($formIsValid) {
             $this->view->poolCount = $obj->getListofFilesMeetCriteria()['count'];
         }
+        $this->view->showPoolCount = true;
         $this->view->html = $this->view->render('playlist/update.phtml');
         $this->view->name = $obj->getName();
         $this->view->description = $obj->getDescription();
diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index 25070006b..bc274e5a3 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -361,8 +361,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
 
         $this->setDecorators(array(
                 array('ViewScript', array('viewScript' => 'form/smart-block-criteria.phtml', "openOption"=> $openSmartBlockOption,
-                        'criteriasLength' => count($this->getCriteriaOptions()), 'poolCount' => $files['count'], 'modRowMap' => $modRowMap,
-                        'showPoolCount' => $showPoolCount))
+                        'criteriasLength' => count($this->getCriteriaOptions()), 'modRowMap' => $modRowMap))
         ));
     }
 
diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
index 7e9a954aa..9a1c31c07 100644
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -119,37 +119,6 @@
             
         <?php } ?>
         </dd>
-
-        <?php
-        // this will never run due to refactoring of playlist controller. it is replaced with code in update.phtml
-        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>
diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index b36de3a46..2f494bbdc 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -2,35 +2,29 @@
 $items = $this->contents;
 $isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic());
 $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>
+<?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->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
+    }
+else if ($this->showPoolCount){
+    ?>
+    <span class='sp-warning-icon' id='sp_pool_count_icon'></span>
+    <?php    echo _("No files meet the criteria");
     }
     ?>
 </div>
-<?php }
-
+<?php
 if (count($items) && ($isStaticSmartBlock || $isPlaylist)) : ?>
 <?php $i = 0; ?>
 <?php foreach($items as $item) :
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 32fb73bd9..27c97268a 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -739,6 +739,7 @@ input.input_text.sp_extra_input_text{
 
 .sp_text_font_bold{
     font-weight: bold;
+    color: white;
 }
 
 .sp-ui-button-icon-only {
@@ -782,6 +783,8 @@ input.input_text.sp_extra_input_text{
 .sp-closed{
     border-width: 0 0 0 !important;
 }
+
+
 /***** SMART BLOCK SPECIFIC STYLES END *****/
 
 label {