Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin Konecny 2011-11-08 12:18:52 -05:00
parent 0eaf4c257b 04bcc28b5e
commit 2a9c2183e8
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/forms/Preferences.php
View File

@ -11,7 +11,7 @@ class Application_Form_Preferences extends Zend_Form
$this->setDecorators(array( $this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/preferences.phtml')) array('ViewScript', array('viewScript' => 'form/preferences.phtml'))
)); ));
$general_pref = new Application_Form_GeneralPreferences(); $general_pref = new Application_Form_GeneralPreferences();
$this->addSubForm($general_pref, 'preferences_general'); $this->addSubForm($general_pref, 'preferences_general');
@ -24,7 +24,7 @@ class Application_Form_Preferences extends Zend_Form
$this->addElement('submit', 'submit', array( $this->addElement('submit', 'submit', array(
'class' => 'ui-button ui-state-default right-floated', 'class' => 'ui-button ui-state-default right-floated',
'ignore' => true, 'ignore' => true,
'label' => 'Submit', 'label' => 'Save',
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
) )

18
airtime_mvc/application/views/scripts/preference/index.phtml
View File

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

3
airtime_mvc/public/js/airtime/library/library.js
View File

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