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

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

Browse source
This commit is contained in:
Naomi Aro 2011-11-29 17:22:23 +01:00
commit dbc65983e2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/SoundcloudPreferences.php
View file

@ -23,7 +23,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
//enable soundcloud uploads option //enable soundcloud uploads option
$this->addElement('checkbox', 'UploadToSoundcloudOption', array( $this->addElement('checkbox', 'UploadToSoundcloudOption', array(
'label' => 'Enable Soundcloud Upload', 'label' => 'Enable SoundCloud Upload',
'required' => false, 'required' => false,
'value' => Application_Model_Preference::GetUploadToSoundcloudOption(), 'value' => Application_Model_Preference::GetUploadToSoundcloudOption(),
'decorators' => array( 'decorators' => array(

2
airtime_mvc/application/layouts/scripts/bare.phtml
View file

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Livestream</title> <title>Live stream</title>
<?php echo $this->headScript() ?> <?php echo $this->headScript() ?>
<?php echo $this->headLink() ?> <?php echo $this->headLink() ?>
</head> </head>