From b98c0f3c856595214746a97f4b52816d46a918d5 Mon Sep 17 00:00:00 2001 From: Paul Baranowski Date: Mon, 4 Apr 2011 13:50:51 -0400 Subject: [PATCH] Tweaks to UI labels for consistency and clarity. --- application/forms/AddShowRR.php | 4 ++-- application/forms/AddShowRepeats.php | 10 +++++----- application/forms/AddShowStyle.php | 2 +- application/forms/AddShowWhat.php | 4 ++-- application/forms/AddShowWhen.php | 14 +++++++------- application/forms/AddShowWho.php | 2 +- application/forms/GeneralPreferences.php | 2 +- application/forms/SoundcloudPreferences.php | 2 +- application/views/scripts/form/preferences.phtml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/application/forms/AddShowRR.php b/application/forms/AddShowRR.php index 7ae1ec5b0..84b387b25 100644 --- a/application/forms/AddShowRR.php +++ b/application/forms/AddShowRR.php @@ -7,13 +7,13 @@ class Application_Form_AddShowRR extends Zend_Form_SubForm { // Add record element $this->addElement('checkbox', 'add_show_record', array( - 'label' => 'Record', + 'label' => 'Record?', 'required' => false, )); // Add record element $this->addElement('checkbox', 'add_show_rebroadcast', array( - 'label' => 'Rebroadcast', + 'label' => 'Rebroadcast?', 'required' => false, )); } diff --git a/application/forms/AddShowRepeats.php b/application/forms/AddShowRepeats.php index 9e363257e..36d9a3f7e 100644 --- a/application/forms/AddShowRepeats.php +++ b/application/forms/AddShowRepeats.php @@ -14,7 +14,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm "0" => "weekly", "1" => "bi-weekly", "2" => "monthly" - ), + ), )); // Add days checkboxes @@ -45,18 +45,18 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm 'validators' => array( 'NotEmpty', array('date', false, array('YYYY-MM-DD')) - ) + ) )); // Add no end element $this->addElement('checkbox', 'add_show_no_end', array( - 'label' => 'no end', + 'label' => 'No End?', 'required' => false, )); } public function checkReliantFields($formData) { - + $start_timestamp = $formData['add_show_start_date']; $end_timestamp = $formData['add_show_end_date']; @@ -67,7 +67,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm $this->getElement('add_show_end_date')->setErrors(array('End date must be after start date')); return false; } - + return true; } diff --git a/application/forms/AddShowStyle.php b/application/forms/AddShowStyle.php index b7000505f..7e0d5ae6c 100644 --- a/application/forms/AddShowStyle.php +++ b/application/forms/AddShowStyle.php @@ -21,7 +21,7 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm // Add show color input $this->addElement('text', 'add_show_color', array( - 'label' => 'Text Colour', + 'label' => 'Text Colour:', 'class' => 'input_text', 'filters' => array('StringTrim') )); diff --git a/application/forms/AddShowWhat.php b/application/forms/AddShowWhat.php index 2a252d8c1..7a3b35371 100644 --- a/application/forms/AddShowWhat.php +++ b/application/forms/AddShowWhat.php @@ -16,7 +16,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm // Add URL element $this->addElement('text', 'add_show_url', array( - 'label' => 'Website:', + 'label' => 'URL:', 'class' => 'input_text', 'required' => false, 'filters' => array('StringTrim'), @@ -29,7 +29,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm 'class' => 'input_text', 'required' => false, 'filters' => array('StringTrim') - )); + )); // Add the description element $this->addElement('textarea', 'add_show_description', array( diff --git a/application/forms/AddShowWhen.php b/application/forms/AddShowWhen.php index 5795145dc..389b12989 100644 --- a/application/forms/AddShowWhen.php +++ b/application/forms/AddShowWhen.php @@ -19,7 +19,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm 'validators' => array( 'NotEmpty', array('date', false, array('YYYY-MM-DD')) - ) + ) )); // Add start time element @@ -33,7 +33,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm 'NotEmpty', array('date', false, array('HH:mm')), array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered')) - ) + ) )); // Add duration element @@ -45,22 +45,22 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm 'filters' => array('StringTrim'), 'validators' => array( 'NotEmpty', - array('regex', false, - array('/^\d+:[0-5][0-9]$/', + array('regex', false, + array('/^\d+:[0-5][0-9]$/', 'messages' => 'enter a duration: HH:mm')) ) )); // Add repeats element $this->addElement('checkbox', 'add_show_repeats', array( - 'label' => 'repeats', + 'label' => 'Repeats?', 'required' => false, )); } public function checkReliantFields($formData) { - + $valid = true; $now_timestamp = date("Y-m-d H:i:s"); @@ -78,7 +78,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm $this->getElement('add_show_duration')->setErrors(array('Cannot have duration 00:00')); $valid = false; } - + return $valid; } diff --git a/application/forms/AddShowWho.php b/application/forms/AddShowWho.php index 7c5a48fce..f7fa04b4f 100644 --- a/application/forms/AddShowWho.php +++ b/application/forms/AddShowWho.php @@ -7,7 +7,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm { // Add hosts autocomplete $this->addElement('text', 'add_show_hosts_autocomplete', array( - 'label' => 'Type a Host:', + 'label' => 'Search Users:', 'class' => 'input_text ui-autocomplete-input', 'required' => false )); diff --git a/application/forms/GeneralPreferences.php b/application/forms/GeneralPreferences.php index 4f3630f90..8bc3bdaca 100644 --- a/application/forms/GeneralPreferences.php +++ b/application/forms/GeneralPreferences.php @@ -52,7 +52,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm $this->addElement($stream_format); $third_party_api = new Zend_Form_Element_Radio('thirdPartyApi'); - $third_party_api->setLabel('Allow Remote Websites To Access Show Schedule Info'); + $third_party_api->setLabel('Allow Remote Websites To Access "Schedule" Info?
(Enable this on to make frontend widgets work.)'); $third_party_api->setMultiOptions(array("Disabled", "Enabled")); $third_party_api->setValue(Application_Model_Preference::GetAllow3rdPartyApi()); diff --git a/application/forms/SoundcloudPreferences.php b/application/forms/SoundcloudPreferences.php index d4c485713..8639c675b 100644 --- a/application/forms/SoundcloudPreferences.php +++ b/application/forms/SoundcloudPreferences.php @@ -45,7 +45,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm // Add the description element $this->addElement('textarea', 'SoundCloudTags', array( - 'label' => 'space separated SoundCloud Tags', + 'label' => 'SoundCloud Tags: (separate tags with spaces)', 'required' => false, 'class' => 'input_text_area', 'value' => Application_Model_Preference::GetSoundCloudTags(), diff --git a/application/views/scripts/form/preferences.phtml b/application/views/scripts/form/preferences.phtml index c9844209d..88c87e5a6 100644 --- a/application/views/scripts/form/preferences.phtml +++ b/application/views/scripts/form/preferences.phtml @@ -2,7 +2,7 @@ element->getSubform('preferences_general') ?> -

SoundCloud settings

+

SoundCloud Settings