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

CC-2704: Support settings UI tweaks

Browse source 
- Move station name to "Support Settins" page
This commit is contained in:
James 2011-08-19 12:19:35 -04:00
parent 138ad06a0e
commit db225dd610
5 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,19 +9,6 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
array('ViewScript', array('viewScript' => 'form/preferences_general.phtml'))
));
//Station name
$this->addElement('text', 'stationName', array(
'class' => 'input_text',
'label' => 'Station Name',
'required' => true,
'filters' => array('StringTrim'),
'validators' => array('NotEmpty'),
'value' => Application_Model_Preference::GetValue("station_name"),
'decorators' => array(
'ViewHelper'
)
));
$defaultFade = Application_Model_Preference::GetDefaultFade();
if($defaultFade == ""){
$defaultFade = '00:00:00.000000';

18
airtime_mvc/application/forms/SupportSettings.php
View file

@ -11,6 +11,18 @@ class Application_Form_SupportSettings extends Zend_Form
array('ViewScript', array('viewScript' => 'form/support-setting.phtml')),
array('File', array('viewScript' => 'form/support-setting.phtml', 'placement' => false)))
);
//Station name
$this->addElement('text', 'stationName', array(
'class' => 'input_text',
'label' => 'Station Name',
'required' => false,
'filters' => array('StringTrim'),
'value' => Application_Model_Preference::GetValue("station_name"),
'decorators' => array(
'ViewHelper'
)
));
// Phone number
$this->addElement('text', 'Phone', array(
@ -147,13 +159,13 @@ class Application_Form_SupportSettings extends Zend_Form
// overwriting isValid function
public function isValid ($data)
{
parent::isValid($data);
$isValid = parent::isValid($data);
$checkPrivacy = $this->getElement('Privacy');
if($data["SupportFeedback"] == "1" && $data["Privacy"] != "1"){
$checkPrivacy->addError("You have to agree to privacy policy.");
return false;
$isValid = false;
}
return true;
return $isValid;
}
}