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

Merge branch 'saas-dev' into saas-stream-settings

Browse source 
Conflicts:
	airtime_mvc/application/models/Preference.php
This commit is contained in:
Duncan Sommerville 2015-07-10 10:29:38 -04:00
commit 37ed35f5b2
16 changed files with 94 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/forms/AddShowLiveStream.php
View file

@ -8,6 +8,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
{
$cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
$cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME))
->setChecked(true)
->setRequired(false);
$this->addElement($cb_airtime_auth);
@ -57,7 +58,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
$showSourceMount = new Zend_Form_Element_Text('show_source_mount');
$showSourceMount->setAttrib('readonly', true)
->setLabel(_('Mount:'))
->setValue(isset($showSourceParams["mount"])?$showSourceParams["mount"]:"");
->setValue(isset($showSourceParams["path"])?$showSourceParams["path"]:"");
$this->addElement($showSourceMount);
$this->setDecorators(

15
airtime_mvc/application/forms/GeneralPreferences.php
View file

@ -136,6 +136,21 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
$week_start_day->setMultiOptions($this->getWeekStartDays());
$week_start_day->setValue(Application_Model_Preference::GetWeekStartDay());
$this->addElement($week_start_day);
$radioPageLoginButton = new Zend_Form_Element_Checkbox("radioPageLoginButton");
$radioPageLoginButton->setDecorators(array(
'ViewHelper',
'Errors',
'Label'
));
$displayRadioPageLoginButtonValue = Application_Model_Preference::getRadioPageDisplayLoginButton();
if ($displayRadioPageLoginButtonValue == "") {
$displayRadioPageLoginButtonValue = true;
}
$radioPageLoginButton->addDecorator('Label', array("class" => "enable-tunein"));
$radioPageLoginButton->setLabel(_("Display login button on your Radio Page?"));
$radioPageLoginButton->setValue($displayRadioPageLoginButtonValue);
$this->addElement($radioPageLoginButton);
}
private function getWeekStartDays()