From c51fb8a04030035cdde8ed2fe70aad83aee871b9 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Mon, 22 Oct 2012 16:37:06 -0400
Subject: [PATCH] CC-4549: Tooltip for source username cannot be shared between
 input and output settings

-fixed
---
 .../scripts/form/preferences_livestream.phtml |  2 +-
 airtime_mvc/public/css/styles.css             |  3 ++-
 .../js/airtime/preferences/streamsetting.js   | 21 +++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
index 00221bf4e..e2dd5d7dc 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
@@ -49,7 +49,7 @@
         </dd>
         <dt id="master_username-label">
             <label class="optional" for="master_username"><?php echo $this->element->getElement('master_username')->getLabel() ?> :
-            <span class='stream_username_help_icon'></span>
+            <span class='master_username_help_icon'></span>
             </label>
         </dt>
         <dd id="master_username-element">
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 29d694d28..b14b77251 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -104,7 +104,8 @@ select {
         line-height:16px !important;
 }
 
-.airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon, .playlist_type_help_icon {
+.airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon,
+.playlist_type_help_icon, .master_username_help_icon {
         cursor: help;
         position: relative;
         display:inline-block; zoom:1;
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index 35f7b373e..b25e2d157 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -333,6 +333,27 @@ $(document).ready(function() {
     })
     
     $(".stream_username_help_icon").qtip({
+        content: {
+            text: "If your Icecast server expects a username of 'source', this field can be left blank."
+        },
+        hide: {
+            delay: 500,
+            fixed: true
+        },
+        style: {
+            border: {
+                width: 0,
+                radius: 4
+            },
+            classes: "ui-tooltip-dark ui-tooltip-rounded"
+        },
+        position: {
+            my: "left bottom",
+            at: "right center"
+        },
+    })
+    
+    $(".master_username_help_icon").qtip({
         content: {
             text: "If your live streaming client does not ask for a username, this field should be 'source'."
         },