From 3ac50b0183d28477890f1d4fe76a5fe550dd4c10 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 3 Oct 2011 15:25:55 -0400
Subject: [PATCH] CC-2904: Space missing between two boxes on "Playlist
 Builder"

- fixed
- extra change: bug on flag name change
---
 airtime_mvc/application/models/Preference.php |  3 ++
 .../scripts/form/stream-setting-form.phtml    | 30 +++++++++----------
 .../scripts/preference/stream-setting.phtml   |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index b565cdfb1..fb361501f 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -432,6 +432,9 @@ class Application_Model_Preference
     }
 
     public static function GetEnableStreamConf(){
+        if(self::GetValue("enable_stream_conf") == Null){
+            return "true";
+        }
         return self::GetValue("enable_stream_conf");
     }
 
diff --git a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
index 5d36c5dfc..8c2777d61 100644
--- a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
+++ b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
@@ -64,10 +64,10 @@
                     Additional Options
                 </legend>
                 <dl class="zend_form">
-                <dt id="outputUser-label" class="block-display">
+                <dt id="outputUser-label">
                     <label for="outputUser"><?php echo $this->element->getElement('user')->getLabel()?> :</label>
                 </dt>
-                <dd id="outputUser-element" class="block-display">
+                <dd id="outputUser-element">
                     <?php echo $this->element->getElement('user')?>
                     <?php if($this->element->getElement('user')->hasErrors()) : ?>
                         <ul class='errors'>
@@ -77,10 +77,10 @@
                         </ul>
                     <?php endif; ?>
                 </dd>
-                <dt id="outputPassword-label" class="block-display">
+                <dt id="outputPassword-label">
                     <label class="optional" for="outputPassword"><?php echo $this->element->getElement('pass')->getLabel()?> :</label>
                 </dt>
-                <dd id="outputPassword-element" class="block-display clearfix">
+                <dd id="outputPassword-element" class="clearfix">
                     <?php echo $this->element->getElement('pass')?>
                     <?php if($this->element->getElement('pass')->hasErrors()) : ?>
                         <ul class='errors'>
@@ -93,10 +93,10 @@
                 <dt class="block-display info-block">
                     The following info will be displayed to listeners in their media player:
                 </dt>
-                <dt id="stationDescription-label" class="block-display">
+                <dt id="stationDescription-label">
                     <label for="stationDescription"><?php echo $this->element->getElement('description')->getLabel()?> :</label>
                 </dt>
-                <dd id="stationDescription-element" class="block-display clearfix">
+                <dd id="stationDescription-element" class="clearfix">
                     <?php echo $this->element->getElement('description')?>
                     <?php if($this->element->getElement('description')->hasErrors()) : ?>
                         <ul class='errors'>
@@ -106,10 +106,10 @@
                         </ul>
                     <?php endif; ?>
                 </dd>
-                <dt id="stationURL-label" class="block-display">
+                <dt id="stationURL-label">
                     <label for="stationURL"><?php echo $this->element->getElement('url')->getLabel()?> :</label>
                 </dt>
-                <dd id="stationURL-element" class="block-display clearfix">
+                <dd id="stationURL-element" class="clearfix">
                     <?php echo $this->element->getElement('url')?>
                     <span class="info-text-small">(Your radio station website)</span>
                     <?php if($this->element->getElement('url')->hasErrors()) : ?>
@@ -120,10 +120,10 @@
                         </ul>
                     <?php endif; ?>
                 </dd>
-                <dt id="outputGenre-label" class="block-display">
+                <dt id="outputGenre-label">
                     <label for="outputGenre"><?php echo $this->element->getElement('genre')->getLabel()?> :</label>
                 </dt>
-                <dd id="outputGenre-element" class="block-display">
+                <dd id="outputGenre-element">
                     <?php echo $this->element->getElement('genre')?>
                     <?php if($this->element->getElement('genre')->hasErrors()) : ?>
                         <ul class='errors'>
@@ -133,10 +133,10 @@
                         </ul>
                     <?php endif; ?>
                 </dd>
-                <dt id="outputMountpoint-label" class="block-display">
+                <dt id="outputMountpoint-label">
                     <label for="outputMountpoint"><?php echo $this->element->getElement('mount')->getLabel()?> :</label>
                 </dt>
-                <dd id="outputMountpoint-element" class="block-display">
+                <dd id="outputMountpoint-element">
                     <?php echo $this->element->getElement('mount')?>
                     <?php if($this->element->getElement('mount')->hasErrors()) : ?>
                         <ul class='errors'>
@@ -148,11 +148,11 @@
                 </dd>
                 </dl>
             </fieldset>
-            <dt id="outputStreamURL-label" class="block-display">
+            <dt id="outputStreamURL-label">
                 <label for="outputStreamURL">Stream URL: </label>
             </dt>
-            <dd id="outputStreamURL-element" class="block-display">
-                <p id="stream_url"></p>
+            <dd id="outputStreamURL-element">
+                <span id="stream_url"></span>
             </dd>
             </dl>
         </fieldset>
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
index aa413857b..b86bbc855 100644
--- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
+++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
@@ -1,5 +1,5 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong stream-config">
-    <h2 style="float:left">Stream Settings</h2>
+    <h2 <?php if($this->enable_stream_conf == "true"){?>style="float:left"<?php }?>>Stream Settings</h2>
     <?php if($this->enable_stream_conf == "true"){?>
     <form method="post" action="/Preference/stream-setting" enctype="application/x-www-form-urlencoded">
     <div class="button-bar bottom" id="submit-element" style="float:right">