Moved the Station Logo field to GeneralPreferences, and stopped using

AJAX on the general prefs form

airtime_mvc/application/views/scripts/form/preferences.phtml

@@ -1,7 +1,7 @@
 <form method="<?php echo $this->element->getMethod() ?>" enctype="multipart/form-data">
     <?php echo $this->element->getElement('csrf') ?>
+
     <?php echo $this->element->getSubform('preferences_general') ?>
-    
     <h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span><?php echo _("Email / Mail Server Settings"); ?></h3>
     <div class="collapsible-content" id="email-server-settings">
         <?php echo $this->element->getSubform('preferences_email_server') ?>
@@ -12,5 +12,7 @@
     <div class="collapsible-content" id="soundcloud-settings">
         <?php echo $this->element->getSubform('preferences_soundcloud') ?>
     </div>
+    <br>
+    <?php echo $this->element->submit->render() ?>
 
 </form>

airtime_mvc/application/views/scripts/form/preferences_general.phtml

@@ -5,6 +5,10 @@
 
         <?php echo $this->element->getElement('stationDescription')->render() ?>
 
+        <?php echo $this->element->getElement('stationLogo')->render() ?>
+
+        <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
+
         <?php echo $this->element->getElement('locale')->render() ?>
 
         <?php echo $this->element->getElement('timezone')->render() ?>

airtime_mvc/application/views/scripts/form/support-setting.phtml

@@ -143,26 +143,6 @@
                 </ul>
             <?php endif; ?>
         </dd>
-        <dt id="Logo-label" class="block-display">
-            <label class="optional" for="Description"><?php echo $this->element->getElement('Logo')->getLabel() ?></label>
-        </dt>
-        <dd id="Logo-element" class="block-display clearfix">
-            <?php if($this->element->getView()->logoImg){?>
-            <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
-            <?php }?>
-            
-            <?php echo $this->element->getElement('Logo') ?>
-            <div class="info-text">
-                <p><?php echo _("Note: Anything larger than 600x600 will be resized.")?></p>
-            </div>
-            <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
-                <ul class='errors'>
-                    <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?>
-        </dd>
     </dl>
     <div id="show_what_sending" style="display: block;">
         <fieldset class="display_field toggle closed">

airtime_mvc/application/views/scripts/preference/index.phtml

@@ -1,16 +1,15 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
 <h2 style="float:left"><?php echo _("Preferences") ?></h2>
 <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
-<form method="post" id="pref_form" enctype="application/x-www-form-urlencoded">
-    
-    <button name="pref_save" id="pref_save" type="button" class="btn right-floated"><?php echo _("Save") ?></button>
+<form method="post" id="pref_form" enctype="multipart/form-data">
+
+    <?php echo $this->form->getElement('submit')->render() ?>
     <div style="clear:both"></div>
-    
+
     <?php
         echo $this->statusMsg;
         echo $this->form;
     ?>
     <br />
-    <button name="pref_save" id="pref_save" type="button" class="btn right-floated"><?php echo _("Save") ?></button>
 </form>
 </div>