WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved module selection password dialog below password input fields

This commit is contained in:
Roland Gruber 2010-10-22 18:01:39 +00:00
parent 249fcd5541
commit b28e4f9c46
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lam/lib/modules.inc
View File

@ -1266,17 +1266,10 @@ class accountContainer {
*/ */
private function printPasswordPromt($errors) { private function printPasswordPromt($errors) {
$this->printPageHeader(); $this->printPageHeader();
echo "<div class=\"" . $this->type . "list-bright\">\n"; echo "<div class=\"" . $this->type . "list-bright smallPaddingContent\">\n";
$container = new htmlTable(); $container = new htmlTable();
// title // title
$container->addElement(new htmlSpacer(null, '5px'), true); $container->addElement(new htmlSubTitle(_("Set password")), true);
$titleContainer = new htmlTable();
$titleContainer->colspan = 3;
$titleContainer->addElement(new htmlSpacer('5px', null));
$titleContainer->addElement(new htmlOutputText(_("Set password")));
$titleContainer->addElement(new htmlHelpLink('404'), true);
$container->addElement($titleContainer, true);
$container->addElement(new htmlSpacer(null, '20px'), true);
// error messages // error messages
for ($i = 0; $i < sizeof($errors); $i++) { for ($i = 0; $i < sizeof($errors); $i++) {
$text = ''; $text = '';
@ -1287,6 +1280,17 @@ class accountContainer {
$message->colspan = 3; $message->colspan = 3;
$container->addElement($message, true); $container->addElement($message, true);
} }
// password fields
$container->addElement(new htmlOutputText(_('Password')));
$pwdInput1 = new htmlInputField('newPassword1');
$pwdInput1->setIsPassword(true);
$container->addElement($pwdInput1);
$container->addElement(new htmlHelpLink('404'), true);
$container->addElement(new htmlOutputText(_('Repeat password')));
$pwdInput2 = new htmlInputField('newPassword2');
$pwdInput2->setIsPassword(true);
$container->addElement($pwdInput2, true);
$container->addElement(new htmlSpacer(null, '10px'), true);
// password modules // password modules
$moduleContainer = new htmlTable(); $moduleContainer = new htmlTable();
foreach ($this->module as $name => $module) { foreach ($this->module as $name => $module) {
@ -1303,16 +1307,6 @@ class accountContainer {
$moduleContainer->colspan = 5; $moduleContainer->colspan = 5;
$container->addElement($moduleContainer, true); $container->addElement($moduleContainer, true);
$container->addElement(new htmlSpacer(null, '10px'), true); $container->addElement(new htmlSpacer(null, '10px'), true);
// password fields
$container->addElement(new htmlOutputText(_('Password')));
$pwdInput1 = new htmlInputField('newPassword1');
$pwdInput1->setIsPassword(true);
$container->addElement($pwdInput1, true);
$container->addElement(new htmlOutputText(_('Repeat password')));
$pwdInput2 = new htmlInputField('newPassword2');
$pwdInput2->setIsPassword(true);
$container->addElement($pwdInput2, true);
$container->addElement(new htmlSpacer(null, '10px'), true);
// buttons // buttons
$buttonContainer = new htmlTable(); $buttonContainer = new htmlTable();
$buttonContainer->colspan = 3; $buttonContainer->colspan = 3;