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

This commit is contained in:
James 2013-01-03 18:00:33 -05:00
commit 5d76bb2d17
9 changed files with 84 additions and 12 deletions

View file

@ -29,6 +29,7 @@ class Application_Form_EditUser extends Zend_Form
$login->setLabel(_('Username:'));
$login->setValue($userData["login"]);
$login->setAttrib('class', 'input_text');
$login->setAttrib('readonly', 'readonly');
$login->setRequired(true);
$login->addValidator($notEmptyValidator);
$login->addFilter('StringTrim');
@ -96,6 +97,12 @@ class Application_Form_EditUser extends Zend_Form
$jabber->setDecorators(array('viewHelper'));
$this->addElement($jabber);
$locale = new Zend_Form_Element_Select("cu_locale");
$locale->setLabel(_("Language"));
$locale->setMultiOptions(Application_Model_Locale::getLocales());
$locale->setValue(Application_Model_Preference::GetUserLocale($currentUser->getId()));
$locale->setDecorators(array('ViewHelper'));
$this->addElement($locale);
/*
$saveBtn = new Zend_Form_Element_Button('cu_save_user');
$saveBtn->setAttrib('class', 'btn btn-small right-floated');