From 30f36177b7c7d39d53c93abace82310c3202dafd Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Fri, 2 Dec 2011 13:54:37 -0500 Subject: [PATCH 1/2] CC-3141: Capitalization of SHOUTcast in stream settings page Fixed --- airtime_mvc/application/forms/StreamSettingSubForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/forms/StreamSettingSubForm.php b/airtime_mvc/application/forms/StreamSettingSubForm.php index 96c348775..7be023f1b 100644 --- a/airtime_mvc/application/forms/StreamSettingSubForm.php +++ b/airtime_mvc/application/forms/StreamSettingSubForm.php @@ -73,7 +73,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{ $output = new Zend_Form_Element_Select('output'); $output->setLabel("Service Type:") - ->setMultiOptions(array("icecast"=>"Icecast", "shoutcast"=>"Shoutcast")) + ->setMultiOptions(array("icecast"=>"Icecast", "shoutcast"=>"SHOUTcast")) ->setValue(isset($setting[$prefix.'_output'])?$setting[$prefix.'_output']:"icecast") ->setDecorators(array('ViewHelper')); if($disable_all){ From ee5b6755621a4bb813b59c023180f9490b119080 Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Fri, 2 Dec 2011 13:57:40 -0500 Subject: [PATCH 2/2] CC-3147: Change text in help > Getting Started: "Only admins can add shows." Fixed --- airtime_mvc/application/views/scripts/dashboard/help.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml index 60d1de162..32737c9a1 100644 --- a/airtime_mvc/application/views/scripts/dashboard/help.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml @@ -6,7 +6,7 @@
  1. Add your files to the library using the "Add Media" button. You can drag and drop your files to this window too.
  2. Create a playlist in the Playlist Builder menu using your audio files.
    3. -
  3. Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins can add shows.
    4. +
  4. Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins and program managers can add shows.
  5. Add the playlist to the show by going to your show in the Schedule calendar, left-clicking on it and selecting "Add Content."
  6. Select your playlist and drag and drop it to the "Items in this show" area.