Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
5a4b4ba421
|
@ -72,7 +72,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){
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<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>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>Select your playlist and drag and drop it to the "Items in this show" area.</li>
|
||||
</ol>
|
||||
|
|
Loading…
Reference in New Issue