From 5d741d84ee115b0a90c1817a61ec1bb7954a7430 Mon Sep 17 00:00:00 2001
From: Yuchen Wang <yuchen@naomi-DX4840.(none)>
Date: Wed, 9 Nov 2011 16:03:32 -0500
Subject: [PATCH] CC-3001: Preferences->"Submit" button renamed to "Save", and
 should be at the top and the bottom of the screen

Changed all other buttons that says "Submit" to "Save.
Also added some CSS stuff so that the "Save" button at the top of Preference page
have some space between itself and the form below.
---
 airtime_mvc/application/forms/AddUser.php          | 2 +-
 airtime_mvc/application/forms/AdvancedSearch.php   | 2 +-
 airtime_mvc/application/forms/EditAudioMD.php      | 2 +-
 airtime_mvc/application/forms/PlaylistMetadata.php | 2 +-
 airtime_mvc/application/forms/SupportSettings.php  | 2 +-
 airtime_mvc/public/css/styles.css                  | 4 ++++
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/forms/AddUser.php b/airtime_mvc/application/forms/AddUser.php
index 43b76495c..1f00f7865 100644
--- a/airtime_mvc/application/forms/AddUser.php
+++ b/airtime_mvc/application/forms/AddUser.php
@@ -81,7 +81,7 @@ class Application_Form_AddUser extends Zend_Form
         $submit = new Zend_Form_Element_Submit('submit');
         $submit->setAttrib('class', 'ui-button ui-state-default right-floated');
         $submit->setIgnore(true);
-        $submit->setLabel('Submit');
+        $submit->setLabel('Save');
         $this->addElement($submit);
     }
     
diff --git a/airtime_mvc/application/forms/AdvancedSearch.php b/airtime_mvc/application/forms/AdvancedSearch.php
index ff074718b..4c15795b7 100644
--- a/airtime_mvc/application/forms/AdvancedSearch.php
+++ b/airtime_mvc/application/forms/AdvancedSearch.php
@@ -16,7 +16,7 @@ class Application_Form_AdvancedSearch extends Zend_Form
 		// Add the submit button
         $this->addElement('button', 'search_submit', array(
             'ignore'   => true,
-            'label'    => 'Submit',
+            'label'    => 'Save',
 			'order'    => '-1'
         ));
 		$this->getElement('search_submit')->removeDecorator('DtDdWrapper');
diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 423ef1025..a4968644f 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -134,7 +134,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         $this->addElement('submit', 'submit', array(
             'ignore'   => true,
             'class'    => 'ui-button ui-state-default',
-            'label'    => 'Submit',
+            'label'    => 'Save',
             'decorators' => array(
                 'ViewHelper'
             )
diff --git a/airtime_mvc/application/forms/PlaylistMetadata.php b/airtime_mvc/application/forms/PlaylistMetadata.php
index 15de97699..d53a4ddab 100644
--- a/airtime_mvc/application/forms/PlaylistMetadata.php
+++ b/airtime_mvc/application/forms/PlaylistMetadata.php
@@ -24,7 +24,7 @@ class Application_Form_PlaylistMetadata extends Zend_Form{
 
          // Add the comment element
         $this->addElement('button', 'new_playlist_submit', array(
-            'label'      => 'Submit',
+            'label'      => 'Save',
             'ignore'   => true
 		));
     }
diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php
index f0956cdf7..ab97000e7 100644
--- a/airtime_mvc/application/forms/SupportSettings.php
+++ b/airtime_mvc/application/forms/SupportSettings.php
@@ -151,7 +151,7 @@ class Application_Form_SupportSettings extends Zend_Form
         $submit = new Zend_Form_Element_Submit("submit");
         $submit->class = 'ui-button ui-state-default right-floated';
         $submit->setIgnore(true)
-                ->setLabel("Submit")
+                ->setLabel("Save")
                 ->setDecorators(array('ViewHelper'));
         $this->addElement($submit);
     }
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 297cc30f3..9671cf476 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1618,6 +1618,10 @@ div.success{
     width: 500px;
 }
 
+.preferences .padded {
+    margin-top: 5px; /* Firefox needs this */
+}
+
 dt.block-display, dd.block-display {
     display: block;
     float: none;