From d32d8d3a0d3d98ef35c1db4b46e5e30aaf2940dc Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 30 Jun 2020 20:24:38 +0200 Subject: [PATCH] moved error message --- lam/templates/login.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lam/templates/login.php b/lam/templates/login.php index f074ee81..9f94a2be 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -406,16 +406,6 @@ function display_LoginPage($licenseValidator, $error_message, $errorDetails = nu // login button $row->add(new htmlSpacer(null, '20px'), 12); $row->add(new htmlButton('checklogin', _("Login")), 12); - // error message - if (!empty($error_message)) { - $row->add(new \htmlSpacer(null, '5px'), 12); - $message = new htmlStatusMessage('ERROR', $error_message, $errorDetails); - $row->add($message, 12); - } - if (!empty($extraMessage)) { - $extraMessage = new htmlStatusMessage('INFO', $extraMessage); - $row->add($extraMessage, 12); - } parseHtml(null, $row, array(), false, $tabindex, 'user'); ?> @@ -426,6 +416,20 @@ function display_LoginPage($licenseValidator, $error_message, $errorDetails = nu + add(new \htmlSpacer(null, '5px'), 12); + $message = new htmlStatusMessage('ERROR', $error_message, $errorDetails); + $row->add($message, 12); + } + if (!empty($extraMessage)) { + $extraMessage = new htmlStatusMessage('INFO', $extraMessage); + $row->add($extraMessage, 12); + } + parseHtml(null, $row, array(), false, $tabindex, 'user'); + ?>