From 869eb77ca4f2a5080834208f69da799f1070fe91 Mon Sep 17 00:00:00 2001 From: Paul Baranowski Date: Thu, 17 May 2012 17:33:50 -0400 Subject: [PATCH] CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place Fixed both of these issues. Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where the text was unstyled. Fixed issue with long connection URLS causing display problems in "Add Show" and in "Stream Prefs". Now a scrollbar will appear if the connection URL is too long. Fixed bug in Stream Prefs where zooming out caused the page to be formatted differently. Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and "Show Source Connection URL" wrapped on multiple lines. Fixed help text for Add Show -> Live Stream authication settings, the instructions were wrong and there were misspelled words. --- airtime_mvc/application/forms/AddShowLiveStream.php | 8 ++++---- .../views/scripts/form/add-show-live-stream.phtml | 2 +- .../application/views/scripts/form/add-show-when.phtml | 2 +- .../views/scripts/form/preferences_livestream.phtml | 8 ++++---- .../views/scripts/preference/stream-setting.phtml | 2 +- .../views/scripts/schedule/add-show-form.phtml | 2 +- airtime_mvc/public/css/styles.css | 10 ++++++++-- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php index ad4c66c4d..cc90cf6d6 100644 --- a/airtime_mvc/application/forms/AddShowLiveStream.php +++ b/airtime_mvc/application/forms/AddShowLiveStream.php @@ -6,17 +6,17 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm public function init() { - $description1 = "This follows the same security pattern for the shows: if no users are explicitly set for the show, then anyone with a valid airtime login can connect to the stream, otherwise if there are users assigned to the show, then only those users can connect."; + $description1 = "This follows the same security pattern for the shows: only users assigned to the show can connect."; $cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth"); - $cb_airtime_auth->setLabel("Use Airtime Authentication") + $cb_airtime_auth->setLabel("Use Airtime Authentication:") ->setDescription($description1) ->setRequired(false) ->setDecorators(array('ViewHelper')); $this->addElement($cb_airtime_auth); - $description2 = "Specifiy custom athentification which will work for only the show."; + $description2 = "Specify custom authentication which will work for only for this show."; $cb_custom_auth = new Zend_Form_Element_Checkbox("cb_custom_auth"); - $cb_custom_auth ->setLabel("Use Custom Authentication") + $cb_custom_auth ->setLabel("Use Custom Authentication:") ->setDescription($description2) ->setRequired(false) ->setDecorators(array('ViewHelper')); diff --git a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml index d20205976..6028cf399 100644 --- a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml +++ b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml @@ -60,7 +60,7 @@
- connection_url; ?> + connection_url; ?>
diff --git a/airtime_mvc/application/views/scripts/form/add-show-when.phtml b/airtime_mvc/application/views/scripts/form/add-show-when.phtml index 124aebee3..48a420758 100644 --- a/airtime_mvc/application/views/scripts/form/add-show-when.phtml +++ b/airtime_mvc/application/views/scripts/form/add-show-when.phtml @@ -56,7 +56,7 @@
- element->getElement('add_show_repeats')->getLabel() ?> +
element->getElement('add_show_repeats') ?> diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml index 8fbafee9f..ae3514cdf 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml @@ -72,11 +72,11 @@
-
- master_dj_connection_url ?> override   + master_dj_connection_url ?> override  
@@ -110,11 +110,11 @@
-
- live_dj_connection_url ?> override   + live_dj_connection_url ?> override  
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml index 5496c363a..156c3d342 100644 --- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml +++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml @@ -8,7 +8,7 @@
statusMsg;?> -
+
Global Settings
diff --git a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml index be1c5d694..c010c466b 100644 --- a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml +++ b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml @@ -17,7 +17,7 @@ repeats; ?>

Live Stream

-
+
live; ?>
isSaas()){?> diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index e93b18d27..d63df34e6 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -112,7 +112,7 @@ select { display:inline-block; zoom:1; display:inline; width:14px; height:14px; background:url(/css/images/icon_info.png) 0 0 no-repeat; - float:right; position:relative; top:2px; right:7px; + float:right; position:relative; top:4px; right:7px; left: 3px; line-height:16px !important; } .info-tooltip span { @@ -441,6 +441,12 @@ label { color:#5b5b5b; padding:0 16px 0 0; } +.static_text { + font-size:13px; + color:#3b3b3b; + padding:0 16px 0 0; + word-wrap: break-word; +} #library_quick_search { margin-bottom:16px; } @@ -2564,7 +2570,7 @@ dd .stream-status { } .stream-setting-global dt{ - width: 180px; + width: 195px; } .stream-setting-global dd{