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

Merge branch 'devel' into 2.3.x-saas

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
This commit is contained in:
Martin Konecny 2013-01-15 13:44:44 -05:00
commit 8cd6bd9aa4
346 changed files with 48955 additions and 11856 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/application/forms/EmailServerPreferences.php
View file

@ -13,7 +13,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
// Enable system emails
$this->addElement('checkbox', 'enableSystemEmail', array(
'label' => 'Enable System Emails (Password Reset)',
'label' => _('Enable System Emails (Password Reset)'),
'required' => false,
'value' => Application_Model_Preference::GetEnableSystemEmail(),
'decorators' => array(
@ -23,14 +23,14 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
$this->addElement('text', 'systemEmail', array(
'class' => 'input_text',
'label' => 'Reset Password \'From\' Email',
'label' => _("Reset Password 'From' Email"),
'value' => Application_Model_Preference::GetSystemEmail(),
'readonly' => true,
'decorators' => array('viewHelper')
));
$this->addElement('checkbox', 'configureMailServer', array(
'label' => 'Configure Mail Server',
'label' => _('Configure Mail Server'),
'required' => false,
'value' => Application_Model_Preference::GetMailServerConfigured(),
'decorators' => array (
@ -39,7 +39,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
));
$this->addElement('checkbox', 'msRequiresAuth', array(
'label' => 'Requires Authentication',
'label' => _('Requires Authentication'),
'required' => false,
'value' => Application_Model_Preference::GetMailServerRequiresAuth(),
'decorators' => array(
@ -49,7 +49,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
$this->addElement('text', 'mailServer', array(
'class' => 'input_text',
'label' => 'Mail Server',
'label' => _('Mail Server'),
'value' => Application_Model_Preference::GetMailServer(),
'readonly' => true,
'decorators' => array('viewHelper'),
@ -63,7 +63,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
$this->addElement('text', 'email', array(
'class' => 'input_text',
'label' => 'Email Address',
'label' => _('Email Address'),
'value' => Application_Model_Preference::GetMailServerEmailAddress(),
'readonly' => true,
'decorators' => array('viewHelper'),
@ -78,7 +78,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
$this->addElement('password', 'ms_password', array(
'class' => 'input_text',
'label' => 'Password',
'label' => _('Password'),
'value' => Application_Model_Preference::GetMailServerPassword(),
'readonly' => true,
'decorators' => array('viewHelper'),
@ -96,7 +96,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
$port->class = 'input_text';
$port->setRequired(false)
->setValue(Application_Model_Preference::GetMailServerPort())
->setLabel('Port')
->setLabel(_('Port'))
->setAttrib('readonly', true)
->setDecorators(array('viewHelper'));