From 4842f1a5a1c40ee0c673788fcd9f7f780142ea40 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 11 Jul 2012 15:52:46 -0400 Subject: [PATCH] CC-84: Smart Playlists -removed limit checkbox --- .../forms/SmartPlaylistCriteria.php | 50 +++++++++---------- .../form/smart-playlist-criteria.phtml | 3 +- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/airtime_mvc/application/forms/SmartPlaylistCriteria.php b/airtime_mvc/application/forms/SmartPlaylistCriteria.php index 99da27d22..ab1a79e88 100644 --- a/airtime_mvc/application/forms/SmartPlaylistCriteria.php +++ b/airtime_mvc/application/forms/SmartPlaylistCriteria.php @@ -6,33 +6,36 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm $criteriaOptions = array( 0 => "Select criteria", - "track_title" => "Title", + "album_title" => "Album", "artist_name" => "Artist", "bit_rate" => "Bit Rate", - "sample_rate" => "Sample Rate", - "length" => "Length", - "album_title" => "Album", - "genre" => "Genre", - "year" => "Year", - "track_num" => "Track Number", "bmp" => "Bpm", - "rating" => "Rating", - "disc_number" => "Disc Number", - "mood" => "Mood", - "label" => "Label", - "composer" => "Composer", - "lyricist" => "Lyricist", - "name" => "Name", - "isrc_number" => "ISRC Number", - "language" => "Language", - "utime" => "Date Added", - "mtime" => "Date Modified", "comments" => "Comments", - "orchestra" => "Orchestra", "composer" => "Composer", "conductor" => "Conductor", + "utime" => "Date Added", + "mtime" => "Date Modified", + "disc_number" => "Disc Number", + "genre" => "Genre", + "isrc_number" => "ISRC Number", + "label" => "Label", + "language" => "Language", + "length" => "Length", + "lyricist" => "Lyricist", + "mood" => "Mood", + "name" => "Name", + "orchestra" => "Orchestra", "radio_station_name" => "Radio Station Name", - "soundcloud_id" => "Soundcloud Upload" + "rating" => "Rating", + "sample_rate" => "Sample Rate", + "soundcloud_id" => "Soundcloud Upload", + "track_title" => "Title", + "track_num" => "Track Number", + "year" => "Year" + ); + + $criteriaTypes = array( + ); $stringCriteriaOptions = array( @@ -106,12 +109,6 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm $this->addElement($criteriaValue); } - $limitCheck = new Zend_Form_Element_Checkbox('sp_limit_check'); - $limitCheck->setLabel('Limit to'); - $limitCheck->setDecorators(array('viewHelper')); - $limitCheck->setValue(true); - $this->addElement($limitCheck); - $limit = new Zend_Form_Element_Select('sp_limit_options'); $limit->setAttrib('class', 'input_select'); $limit->setDecorators(array('viewHelper')); @@ -120,6 +117,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm $limitValue = new Zend_Form_Element_Text('sp_limit_value'); $limitValue->setAttrib('class', 'input_text'); + $limitValue->setLabel('Limit to'); $limitValue->setDecorators(array('viewHelper')); $this->addElement($limitValue); diff --git a/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml index b656b8c01..41576151d 100644 --- a/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml @@ -35,8 +35,7 @@