diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index 42eee6f28..9f5a316f5 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -64,6 +64,12 @@ $pages = array( 'module' => 'default', 'controller' => 'Preference', 'action' => 'stream-setting' + ), + array( + 'label' => 'Support Settings', + 'module' => 'default', + 'controller' => 'Preference', + 'action' => 'support-setting' ) ) ), diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index d69b91323..4d4086167 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -45,30 +45,50 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetSoundCloudLicense($values["preferences_soundcloud"]["SoundCloudLicense"]); - Application_Model_Preference::SetPhone($values["preferences_support"]["Phone"]); - Application_Model_Preference::SetEmail($values["preferences_support"]["Email"]); - Application_Model_Preference::SetStationWebSite($values["preferences_support"]["StationWebSite"]); - Application_Model_Preference::SetSupportFeedback($values["preferences_support"]["SupportFeedback"]); - Application_Model_Preference::SetPublicise($values["preferences_support"]["Publicise"]); - - $form->getSubForm('preferences_support')->Logo->receive(); - $imagePath = $form->getSubForm('preferences_support')->Logo->getFileName(); - - Application_Model_Preference::SetStationCountry($values["preferences_support"]["Country"]); - Application_Model_Preference::SetStationCity($values["preferences_support"]["City"]); - Application_Model_Preference::SetStationDescription($values["preferences_support"]["Description"]); - Application_Model_Preference::SetStationLogo($imagePath); - $this->view->statusMsg = "
Preferences updated.
"; } } - $logo = Application_Model_Preference::GetStationLogo(); - if($logo){ - $this->view->logoImg = $logo; - } $this->view->form = $form; } + public function supportSettingAction() + { + $request = $this->getRequest(); + $baseUrl = $request->getBaseUrl(); + + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/support-setting.js','text/javascript'); + $this->view->statusMsg = ""; + + $form = new Application_Form_SupportSettings(); + + if ($request->isPost()) { + if ($form->isValid($request->getPost())) { + $values = $form->getValues(); + + Application_Model_Preference::SetPhone($values["Phone"]); + Application_Model_Preference::SetEmail($values["Email"]); + Application_Model_Preference::SetStationWebSite($values["StationWebSite"]); + Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); + Application_Model_Preference::SetPublicise($values["Publicise"]); + + $form->Logo->receive(); + $imagePath = $form->Logo->getFileName(); + + Application_Model_Preference::SetStationCountry($values["Country"]); + Application_Model_Preference::SetStationCity($values["City"]); + Application_Model_Preference::SetStationDescription($values["Description"]); + Application_Model_Preference::SetStationLogo($imagePath); + + $this->view->statusMsg = "
Support setting updated.
"; + } + } + $logo = Application_Model_Preference::GetStationLogo(); + if($logo){ + $this->view->logoImg = $logo; + } + $this->view->form = $form; + } + public function directoryConfigAction() { $request = $this->getRequest(); diff --git a/airtime_mvc/application/forms/Preferences.php b/airtime_mvc/application/forms/Preferences.php index 963a58717..0fa9f0b58 100644 --- a/airtime_mvc/application/forms/Preferences.php +++ b/airtime_mvc/application/forms/Preferences.php @@ -18,8 +18,8 @@ class Application_Form_Preferences extends Zend_Form $soundcloud_pref = new Application_Form_SoundcloudPreferences(); $this->addSubForm($soundcloud_pref, 'preferences_soundcloud'); - $support_pref = new Application_Form_SupportPreferences(); - $this->addSubForm($support_pref, 'preferences_support'); + /*$support_pref = new Application_Form_SupportPreferences(); + $this->addSubForm($support_pref, 'preferences_support');*/ $this->addElement('submit', 'submit', array( 'class' => 'ui-button ui-state-default right-floated', diff --git a/airtime_mvc/application/forms/SupportPreferences.php b/airtime_mvc/application/forms/SupportSettings.php similarity index 89% rename from airtime_mvc/application/forms/SupportPreferences.php rename to airtime_mvc/application/forms/SupportSettings.php index 62c6496cf..76618732d 100644 --- a/airtime_mvc/application/forms/SupportPreferences.php +++ b/airtime_mvc/application/forms/SupportSettings.php @@ -1,6 +1,6 @@ setDecorators(array( - array('ViewScript', array('viewScript' => 'form/preferences_support.phtml')), - array('File', array('viewScript' => 'form/preferences_support.phtml', 'placement' => false))) + array('ViewScript', array('viewScript' => 'form/support-setting.phtml')), + array('File', array('viewScript' => 'form/support-setting.phtml', 'placement' => false))) ); // Phone number @@ -134,6 +134,14 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's privacy policy.") ->setDecorators(array('ViewHelper')); $this->addElement($checkboxPrivacy); + + // submit button + $submit = new Zend_Form_Element_Submit("submit"); + $submit->class = 'ui-button ui-state-default right-floated'; + $submit->setIgnore(true) + ->setLabel("Submit") + ->setDecorators(array('ViewHelper')); + $this->addElement($submit); } // overwriting isValid function diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml index f1a8be62b..d6d20ea00 100644 --- a/airtime_mvc/application/views/scripts/form/preferences.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences.phtml @@ -9,11 +9,6 @@ element->getSubform('preferences_soundcloud') ?> -

Support Settings

- -
element->getElement('submit') ?>
diff --git a/airtime_mvc/application/views/scripts/form/preferences_support.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml similarity index 96% rename from airtime_mvc/application/views/scripts/form/preferences_support.phtml rename to airtime_mvc/application/views/scripts/form/support-setting.phtml index d0e100f42..0a7c9e0e8 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_support.phtml +++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml @@ -30,10 +30,10 @@ - - -

Note: In order to promote your station, "Send support feedback" must be enabled

- +

Note: In order to promote your station, "Send support feedback" must be enabled

+