From fcc4c1f9af2d68bfc7b8dfe1aee38c14fb6f57cc Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Fri, 13 Jul 2012 14:26:17 -0400
Subject: [PATCH] CC-84: Smart Playlists

-fixed merge conflict
---
 airtime_mvc/application/forms/SmartPlaylistCriteria.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/forms/SmartPlaylistCriteria.php b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
index 64e5294b9..91c9127ea 100644
--- a/airtime_mvc/application/forms/SmartPlaylistCriteria.php
+++ b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
@@ -58,7 +58,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
         $numElements = count($criteriaOptions);
         for ($i = 0; $i < $numElements; $i++) {
             $criteria = new Zend_Form_Element_Select('sp_criteria_field_'.$i);
-            $criteria->setAttrib('class', 'input_select');
+            $criteria->setAttrib('class', 'sp_input_select');
             $criteria->setValue('Select criteria');
             $criteria->setDecorators(array('viewHelper'));
             $criteria->setMultiOptions($criteriaOptions);
@@ -69,7 +69,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
             
             $criteriaModifers = new Zend_Form_Element_Select('sp_criteria_modifier_'.$i);
             $criteriaModifers->setValue('Select modifier');
-            $criteriaModifers->setAttrib('class', 'input_select');
+            $criteriaModifers->setAttrib('class', 'sp_input_select');
             $criteriaModifers->setDecorators(array('viewHelper'));
             $criteriaModifers->setMultiOptions(array('0' => 'Select modifier'));
             if ($i != 0){
@@ -78,7 +78,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
             $this->addElement($criteriaModifers);
         
             $criteriaValue = new Zend_Form_Element_Text('sp_criteria_value_'.$i);
-            $criteriaValue->setAttrib('class', 'input_text');
+            $criteriaValue->setAttrib('class', 'input_text sp_input_text');
             $criteriaValue->setDecorators(array('viewHelper'));
             if ($i != 0){
                 $criteriaValue->setAttrib('disabled', 'disabled');