Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/forms/Preferences.php

@@ -24,7 +24,7 @@ class Application_Form_Preferences extends Zend_Form
         $this->addElement('submit', 'submit', array(
             'class'    => 'ui-button ui-state-default right-floated',
             'ignore'   => true,
-            'label'    => 'Submit',
+            'label'    => 'Save',
             'decorators' => array(
                 'ViewHelper'
             )

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

@@ -1,7 +1,15 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
-<h2>Preferences</h2>
+<h2 style="float:left">Preferences</h2>
+<form method="post" action="/Preference/index" enctype="application/x-www-form-urlencoded">
+    
+    <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
         echo $this->statusMsg;
         echo $this->form;
     ?>
+</form>
 </div>

airtime_mvc/public/js/airtime/library/library.js

@@ -323,7 +323,8 @@ function createDataTable(data) {
         "oLanguage": {
             "sSearch": ""
         },
-        "iDisplayLength": getNumEntriesPreference(data)
+        "iDisplayLength": getNumEntriesPreference(data),
+        "bStateSave": true
 	});
 	dTable.fnSetFilteringDelay(350);