diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 6c9b0bfd9..0fe76262e 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -110,47 +110,6 @@ class PreferenceController extends Zend_Controller_Action $this->_helper->json->sendJson(array("url" => $url)); } - public function supportSettingAction() - { - $CC_CONFIG = Config::getConfig(); - - $request = $this->getRequest(); - - $baseUrl = Application_Common_OsPath::getBaseDir(); - - $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/support-setting.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->statusMsg = ""; - - SessionHelper::reopenSessionForWriting(); - - $form = new Application_Form_SupportSettings(); - if ($request->isPost()) { - $values = $request->getPost(); - if ($form->isValid($values)) { - Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view); - Application_Model_Preference::SetPhone($values["Phone"]); - Application_Model_Preference::SetEmail($values["Email"]); - Application_Model_Preference::SetStationWebSite($values["StationWebSite"]); - - Application_Model_Preference::SetStationCountry($values["Country"]); - Application_Model_Preference::SetStationCity($values["City"]); - Application_Model_Preference::SetStationDescription($values["Description"]); - if (isset($values["Privacy"])) { - Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]); - } - } - $this->view->statusMsg = "
"._("Support setting updated.")."
"; - } - - $privacyChecked = false; - if (Application_Model_Preference::GetPrivacyPolicyCheck() == 1) { - $privacyChecked = true; - } - $this->view->privacyChecked = $privacyChecked; - $this->view->section_title = _('Support Feedback'); - $this->view->form = $form; - } - public function directoryConfigAction() { } diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php deleted file mode 100644 index e582f407b..000000000 --- a/airtime_mvc/application/forms/SupportSettings.php +++ /dev/null @@ -1,150 +0,0 @@ -setDecorators(array( - 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' => true, - 'filters' => array('StringTrim'), - 'validators' => array($notEmptyValidator), - 'value' => Application_Model_Preference::GetStationName(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - // Phone number - $this->addElement('text', 'Phone', array( - 'class' => 'input_text', - 'label' => _('Phone:'), - 'required' => false, - 'filters' => array('StringTrim'), - 'value' => Application_Model_Preference::GetPhone(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - //Email - $this->addElement('text', 'Email', array( - 'class' => 'input_text', - 'label' => _('Email:'), - 'required' => false, - 'filters' => array('StringTrim'), - 'value' => Application_Model_Preference::GetEmail(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - // Station Web Site - $this->addElement('text', 'StationWebSite', array( - 'label' => _('Station Web Site:'), - 'required' => false, - 'class' => 'input_text', - 'value' => Application_Model_Preference::GetStationWebSite(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - // county list dropdown - $this->addElement('select', 'Country', array( - 'label' => _('Country:'), - 'required' => false, - 'value' => Application_Model_Preference::GetStationCountry(), - 'multiOptions' => $country_list, - 'decorators' => array( - 'ViewHelper' - ) - )); - - // Station city - $this->addElement('text', 'City', array( - 'label' => _('City:'), - 'required' => false, - 'class' => 'input_text', - 'value' => Application_Model_Preference::GetStationCity(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - // Station Description - $description = new Zend_Form_Element_Textarea('Description'); - $description->class = 'input_text_area'; - $description->setLabel(_('Station Description:')) - ->setRequired(false) - ->setValue(Application_Model_Preference::GetStationDescription()) - ->setDecorators(array('ViewHelper')) - ->setAttrib('ROWS','2') - ->setAttrib('COLS','58'); - $this->addElement($description); - - //enable support feedback - $this->addElement('checkbox', 'SupportFeedback', array( - 'label' => _('Send support feedback'), - 'required' => false, - 'value' => Application_Model_Preference::GetSupportFeedback(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - // checkbox for publicise - $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise"); - $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE)) - ->setRequired(false) - ->setDecorators(array('ViewHelper')) - ->setValue(Application_Model_Preference::GetPublicise()); - if (Application_Model_Preference::GetSupportFeedback() == '0') { - $checkboxPublicise->setAttrib("disabled", "disabled"); - } - $this->addElement($checkboxPublicise); - - // checkbox for privacy policy - $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy"); - $checkboxPrivacy->setLabel( - sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'), - COMPANY_NAME, - $privacyPolicyAnchorOpen, - "")) - ->setDecorators(array('ViewHelper')); - $this->addElement($checkboxPrivacy); - - // submit button - $submit = new Zend_Form_Element_Submit("submit"); - $submit->class = 'btn right-floated'; - $submit->setIgnore(true) - ->setLabel(_("Save")) - ->setDecorators(array('ViewHelper')); - $this->addElement($submit); - } - - // overriding isValid function - public function isValid ($data) - { - $isValid = parent::isValid($data); - if (isset($data["Privacy"])) { - $checkPrivacy = $this->getElement('Privacy'); - if ($data["SupportFeedback"] == "1" && $data["Privacy"] != "1") { - $checkPrivacy->addError(_("You have to agree to privacy policy.")); - $isValid = false; - } - } - - return $isValid; - } -} diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml deleted file mode 100644 index 4f55061f9..000000000 --- a/airtime_mvc/application/views/scripts/form/support-setting.phtml +++ /dev/null @@ -1,147 +0,0 @@ -
-
-
-
- " - ."Click the box below and we'll make sure the features you use are constantly improving."), - PRODUCT_NAME)?> -
- - element->getElement('SupportFeedback')->hasErrors()) : ?> -
    - element->getElement('SupportFeedback')->getMessages() as $error): ?> -
    • - -
- -
-
-
- " - . COMPANY_SITE - . ""; - echo sprintf(_("Click the box below to promote your station on %s."), $whosUsingAnchor) - ?> -
- - element->getElement('Publicise')->hasErrors()) : ?> -
    - element->getElement('Publicise')->getMessages() as $error): ?> -
    • - -
- -
-
-
-

-
-
;"> -
- -
-
- element->getElement('stationName') ?> - element->getElement('stationName')->hasErrors()) : ?> -
    - element->getElement('stationName')->getMessages() as $error): ?> -
    • - -
- -
-
- - -
-
- element->getElement('Phone') ?> - element->getElement('Phone')->hasErrors()) : ?> -
    - element->getElement('Phone')->getMessages() as $error): ?> -
    • - -
- -
-
- - - - -
-
- element->getElement('Email') ?> - element->getElement('Email')->hasErrors()) : ?> -
    - element->getElement('Email')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('StationWebSite') ?> - element->getElement('StationWebSite')->hasErrors()) : ?> -
    - element->getElement('StationWebSite')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('Country') ?> - element->getElement('Country')->hasErrors()) : ?> -
    - element->getElement('Country')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('City') ?> - element->getElement('City')->hasErrors()) : ?> -
    - element->getElement('City')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('Description') ?> - element->getElement('Description')->hasErrors()) : ?> -
    - element->getElement('Description')->getMessages() as $error): ?> -
    • - -
- -
-
-
diff --git a/airtime_mvc/application/views/scripts/preference/support-setting.phtml b/airtime_mvc/application/views/scripts/preference/support-setting.phtml deleted file mode 100644 index cf5e725f7..000000000 --- a/airtime_mvc/application/views/scripts/preference/support-setting.phtml +++ /dev/null @@ -1,13 +0,0 @@ -
-

section_title?>

- -
enctype="multipart/form-data" id="support-feedback-form"> -
- statusMsg ?> - form ?> -
-
- form->getElement('submit')?> -
-
-
diff --git a/airtime_mvc/public/js/airtime/preferences/support-setting.js b/airtime_mvc/public/js/airtime/preferences/support-setting.js deleted file mode 100644 index 0e72daf9f..000000000 --- a/airtime_mvc/public/js/airtime/preferences/support-setting.js +++ /dev/null @@ -1,84 +0,0 @@ -function showErrorSections() { - - if($("soundcloud-settings .errors").length > 0) { - $("#soundcloud-settings").show(); - $(window).scrollTop($("soundcloud-settings .errors").position().top); - } - if($("#support-settings .errors").length > 0) { - $("#support-settings").show(); - $(window).scrollTop($("#support-settings .errors").position().top); - } -} - -$(document).ready(function() { - var form = $("form"); - - $("#SupportFeedback").click( function(){ - var pub = $("#Publicise"); - if( !$(this).is(':checked') ){ - pub.removeAttr("checked"); - pub.attr("disabled", true); - }else{ - pub.removeAttr("disabled"); - } - }); - - var promote = $("#Publicise"); - if(!$("#SupportFeedback").is(':checked')){ - promote.removeAttr("checked"); - promote.attr("disabled", true); - }else{ - promote.removeAttr("disabled"); - } - - promote.live('click', function(){ - if($(this).is(':checked')){ - $("#public-info").show(); - }else{ - $("#public-info").hide(); - } - }); - if( promote.is(":checked")){ - $("#public-info").show(); - } - - showErrorSections(); - - $('.toggle legend').click(function() { - $('.toggle').toggleClass('closed'); - return false; - }); - - $("#Logo").change(function(ev){ - var content, res, logoEl; - - content = $(this).val(); - res = content.match(/(jpg|jpeg|png|gif)$/gi); - logoEl = $("#Logo-element"); - - //not an accepted image extension. - if (!res) { - var ul, li; - - ul = logoEl.find('.errors'); - li = $("
  • ").append($.i18n._("Image must be one of jpg, jpeg, png, or gif")); - - //errors ul has already been created. - if (ul.length > 0) { - ul.empty() - .append(li); - } - else { - logoEl - .append('') - .find(".errors") - .append(li); - } - - $(this).val(""); - } - else { - logoEl.find(".errors").remove(); - } - }); -}); diff --git a/docs/manual/support-feedback/index.md b/docs/manual/support-feedback/index.md deleted file mode 100644 index b5285dbaa..000000000 --- a/docs/manual/support-feedback/index.md +++ /dev/null @@ -1,9 +0,0 @@ -If you did not already register Airtime when you installed it, as shown in the *Getting Started* chapter, you can click **Support Feedback** on the System menu to display Airtime's automated feedback options. Check the **Send support feedback** box in order to post technical details about your Airtime installation to Sourcefabric, over the Internet. These details help Sourcefabric diagnose any problem that you might be having with your Airtime system. - -You may also wish to send details of your station to Sourcefabric, so that your station has the opportunity to be promoted with other Airtime users on the [http://www.sourcefabric.org](http://www.sourcefabric.org/) website. This feature also helps Sourcefabric target its support services to the countries where they are needed most. Check the box **Promote my station on Sourcefabric.org** and fill in the details of your station. You can upload a station logo file (of up to 600 x 600 pixels) from your desktop computer by clicking the **Browse** button. - -![](static/Screenshot406-Support_feedback.png) - -Click on the **Show me what I am sending** link to expand a box which displays the technical data being returned to Sourcefabric. The data is collected according to the Sourcefabric privacy policy () which you are required to agree to before you can submit the information. If you have already checked the box to indicate your acceptance of the privacy policy, a link to the policy will be displayed instead. - -![](static/Screenshot545-Show_what_sending_250.png) diff --git a/docs/manual/support-feedback/static/Screenshot406-Support_feedback.png b/docs/manual/support-feedback/static/Screenshot406-Support_feedback.png deleted file mode 100644 index a7bc61d2d..000000000 Binary files a/docs/manual/support-feedback/static/Screenshot406-Support_feedback.png and /dev/null differ diff --git a/docs/manual/support-feedback/static/Screenshot545-Show_what_sending_250.png b/docs/manual/support-feedback/static/Screenshot545-Show_what_sending_250.png deleted file mode 100644 index 9cb49482b..000000000 Binary files a/docs/manual/support-feedback/static/Screenshot545-Show_what_sending_250.png and /dev/null differ diff --git a/mkdocs.yml b/mkdocs.yml index 4b1c3966a..dc9e97338 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -27,7 +27,6 @@ pages: - 'Users': manual/users/index.md - 'Media Folders': manual/media-folders/index.md - 'Streams': manual/stream-settings/index.md - - 'Support Feedback': manual/support-feedback/index.md - 'Status': manual/status/index.md - 'The Main Menus': - 'Now Playing': manual/now-playing/index.md