From 2a5f0239740deca83cd017123e17b28117928a89 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 12 Jan 2013 16:33:42 +0000 Subject: [PATCH] meta HTML --- lam/templates/config/mainlogin.php | 81 +++++++++++++---------------- lam/templates/config/profmanage.php | 29 ++++++----- 2 files changed, 53 insertions(+), 57 deletions(-) diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index 2a17ad28..777dbb76 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2003 - 2010 Roland Gruber + Copyright (C) 2003 - 2013 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -133,50 +133,41 @@ echo $_SESSION['header'];
- - - - - - - - - - -\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } -?> - - - - - - - - - - - +
 
" . $message . "
 
- - -   - - -
 
+
+ addElement($caption, true); + $table->addElement($spacer, true); + // print message if login was incorrect or no config profiles are present + if (isset($message)) { // $message is set by confmain.php (requires conflogin.php then) + $messageField = new htmlStatusMessage('ERROR', $message); + $table->addElement($messageField, true); + $table->addElement($spacer, true); + } + // password field + $gap = new htmlSpacer('1px', null); + $passwordGroup = new htmlGroup(); + $passwordGroup->alignment = htmlElement::ALIGN_CENTER; + $passwordGroup->addElement(new htmlOutputText(_('Master password'))); + $passwordGroup->addElement($gap); + $passwordField = new htmlInputField('passwd'); + $passwordField->setFieldSize(15); + $passwordField->setIsPassword(true); + $passwordGroup->addElement($passwordField); + $passwordGroup->addElement($gap); + $passwordGroup->addElement(new htmlButton('submit', _("Ok"))); + $passwordGroup->addElement($gap); + $passwordGroup->addElement(new htmlHelpLink('236')); + $table->addElement($passwordGroup, true); + + + $tabindex = 1; + parseHtml(null, $table, array(), false, $tabindex, 'user'); + ?> +
diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php index cfbc3bb7..b873057c 100644 --- a/lam/templates/config/profmanage.php +++ b/lam/templates/config/profmanage.php @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2003 - 2012 Roland Gruber + Copyright (C) 2003 - 2013 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -227,15 +227,6 @@ if (!isset($cfg->default)) {
- - -
setOnClick("jQuery('#action').val('setdefault');showConfi $container->addElement($defaultProfileButton, true); $container->addElement($topicSpacer, true); -parseHtml('', $container, array(), false, $tabindex, 'user'); +$container->addElement(new htmlHiddenInput('action', 'none'), true); + +$dialogDivContent = new htmlTable(); +$dialogDivContent->addElement(new htmlOutputText(_("Master password"))); +$masterPassword = new htmlInputField('passwd'); +$masterPassword->setIsPassword(true); +$dialogDivContent->addElement($masterPassword); +$dialogDivContent->addElement(new htmlHelpLink('236')); +$dialogDiv = new htmlDiv('passwordDialogDiv', $dialogDivContent); +$dialogDiv->setCSSClasses(array('hidden')); +$container->addElement($dialogDiv, true); + +$mainDiv = new htmlDiv('mainDiv', $container); +$mainDiv->setCSSClasses(array('filled', 'ui-corner-all')); + +parseHtml('', $mainDiv, array(), false, $tabindex, 'user'); ?> -