From 0601bd675e8317a87535f05f7eb5e7cbce692cff Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 9 Jul 2015 14:38:44 -0400 Subject: [PATCH] SAAS-939: Add option to preferences to display login button on radio page --- .../application/controllers/IndexController.php | 2 ++ .../application/controllers/PreferenceController.php | 1 + airtime_mvc/application/forms/GeneralPreferences.php | 11 +++++++++++ airtime_mvc/application/models/Preference.php | 9 +++++++++ .../views/scripts/form/preferences_general.phtml | 3 +++ .../application/views/scripts/index/index.phtml | 10 ++++++---- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/controllers/IndexController.php b/airtime_mvc/application/controllers/IndexController.php index 56d239e5c..32e4a17a1 100644 --- a/airtime_mvc/application/controllers/IndexController.php +++ b/airtime_mvc/application/controllers/IndexController.php @@ -27,6 +27,8 @@ class IndexController extends Zend_Controller_Action $this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl(); + $this->view->displayLoginButton = Application_Model_Preference::getRadioPageDisplayLoginButton(); + } public function mainAction() diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 5803d3223..39b7a8613 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -47,6 +47,7 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetDefaultLocale($values["locale"]); Application_Model_Preference::SetDefaultTimezone($values["timezone"]); Application_Model_Preference::SetWeekStartDay($values["weekStartDay"]); + Application_Model_Preference::setRadioPageDisplayLoginButton($values["radioPageLoginButton"]); $logoUploadElement = $form->getSubForm('preferences_general')->getElement('stationLogo'); $logoUploadElement->receive(); diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index aa2906d82..ff3cf4118 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -136,6 +136,17 @@ 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' + )); + $radioPageLoginButton->addDecorator('Label', array("class" => "enable-tunein")); + $radioPageLoginButton->setLabel(_("Display login button on your Radio Page?")); + $radioPageLoginButton->setValue(Application_Model_Preference::getRadioPageDisplayLoginButton()); + $this->addElement($radioPageLoginButton); } private function getWeekStartDays() diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 5c1e7c889..6143058ba 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -1512,4 +1512,13 @@ class Application_Model_Preference self::setValue("task_manager_lock", $value); } + public static function getRadioPageDisplayLoginButton() + { + return self::getValue("radio_page_display_login_button"); + } + + public static function setRadioPageDisplayLoginButton($value) + { + self::setValue("radio_page_display_login_button", $value); + } } diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml index 614416765..77f4201f5 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml @@ -37,5 +37,8 @@ element->getElement('thirdPartyApi')->render() ?> + element->getElement('radioPageLoginButton')->renderViewHelper() ?> + element->getElement('radioPageLoginButton')->renderLabel() ?> + diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml index a8467757f..7940ec812 100644 --- a/airtime_mvc/application/views/scripts/index/index.phtml +++ b/airtime_mvc/application/views/scripts/index/index.phtml @@ -24,12 +24,14 @@ document.getElementById(id).width= (newwidth) + "px"; echo ""; } ?> -
- + displayLoginButton) { + echo " +
"; + }?>