Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2011-12-02 16:23:03 -05:00
parent efbaebbbf5 ee5b675562
commit 5a4b4ba421
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/forms/StreamSettingSubForm.php
View File

@ -72,7 +72,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
$output = new Zend_Form_Element_Select('output'); $output = new Zend_Form_Element_Select('output');
$output->setLabel("Service Type:") $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") ->setValue(isset($setting[$prefix.'_output'])?$setting[$prefix.'_output']:"icecast")
->setDecorators(array('ViewHelper')); ->setDecorators(array('ViewHelper'));
if($disable_all){ if($disable_all){

2
airtime_mvc/application/views/scripts/dashboard/help.phtml
View File

@ -6,7 +6,7 @@
<ol> <ol>
<li>Add your files to the library using the "Add Media" button. You can drag and drop your files to this window too. </li> <li>Add your files to the library using the "Add Media" button. You can drag and drop your files to this window too. </li>
<li>Create a playlist in the Playlist Builder menu using your audio files. </li> <li>Create a playlist in the Playlist Builder menu using your audio files. </li>
<li>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.</li> <li>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.</li>
<li>Add the playlist to the show by going to your show in the Schedule calendar, left-clicking on it and selecting "Add Content." </li> <li>Add the playlist to the show by going to your show in the Schedule calendar, left-clicking on it and selecting "Add Content." </li>
<li>Select your playlist and drag and drop it to the "Items in this show" area.</li> <li>Select your playlist and drag and drop it to the "Items in this show" area.</li>
</ol> </ol>