From 2e49ffdebefb4d6a25e86ffbe8cc2c06fd49b852 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 29 Sep 2011 12:10:25 -0400
Subject: [PATCH] CC-2898: Put "Save" button at top of stream settings

- fixed
- extra fix: removed incorrect description text for mount point field
---
 .../views/scripts/form/stream-setting-form.phtml          | 1 -
 .../views/scripts/preference/stream-setting.phtml         | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

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 fc4cf9fbd..5d36c5dfc 100644
--- a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
+++ b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
@@ -138,7 +138,6 @@
                 </dt>
                 <dd id="outputMountpoint-element" class="block-display">
                     <?php echo $this->element->getElement('mount')?>
-                    <span class="info-text-small">(Your radio station website)</span>
                     <?php if($this->element->getElement('mount')->hasErrors()) : ?>
                         <ul class='errors'>
                             <?php foreach($this->element->getElement('mount')->getMessages() as $error): ?>
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
index 675022f03..5c161ffea 100644
--- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
+++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
@@ -1,5 +1,11 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong stream-config">
-    <h2>Stream Settings</h2>
+    <h2 style="float:left">Stream Settings</h2>
+    <?php if($this->disable_stream_conf != "true"){?>
+    <div class="button-bar bottom" id="submit-element" style="float:right">
+        <input type="submit" class="ui-button ui-state-default right-floated" value="Save" id="Save" name="Save" />
+    </div>
+    <div style="clear:both"></div>
+    <?php }?>
 <?php echo $this->statusMsg;?>
     <form method="post" action="/Preference/stream-setting" enctype="application/x-www-form-urlencoded">
     <fieldset class="padded">