diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Kerberos.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Kerberos.pm index 4a34310ff..4af9a1f40 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Kerberos.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/Kerberos.pm @@ -114,6 +114,7 @@ sub extractFormInfo { #$self->p->setHiddenFormValue( $req, kerberos => 0, '', 0 ); eval( $self->InitCmd ); die 'Unable to launch init commmand ' . $self->{InitCmd} if ($@); + $req->data->{waitingMessage} = 1; return PE_FIRSTACCESS; } } diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SSL.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SSL.pm index 6b20a6aae..49c854708 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SSL.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/SSL.pm @@ -51,6 +51,7 @@ sub extractFormInfo { $req->data->{customScript} .= $self->{AjaxInitScript}; $self->logger->debug( "Send init/script -> " . $req->data->{customScript} ); + $req->data->{waitingMessage} = 1; return PE_FIRSTACCESS; } else { diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm index 8b8e369a4..b700252ff 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm @@ -113,7 +113,7 @@ sub display { && $req->data->{login}, ASK_LOGINS => $req->param('checkLogins') || 0, CONFIRMKEY => $self->stamp(), - LIST => $req->data->{list} || [], + LIST => $req->data->{list} || [], REMEMBER => $req->data->{confirmRemember}, ( $req->data->{customScript} @@ -420,6 +420,10 @@ sub display { } + if ( $req->data->{waitingMessage} ) { + $templateParams{WAITING_MESSAGE} = 1; + } + $self->logger->debug("Skin returned: $skinfile"); return ( $skinfile, \%templateParams ); } diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json index e6dee4a11..34f604f98 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json @@ -242,6 +242,7 @@ "verify":"التحقق", "VHnotFound":"Virtual Host not found", "wait":"انتظر", +"waitingmessage":"Authentication in progress, please wait", "warning":"تحذير", "welcomeOnPortal":"مرحبا بك على بوابة إثبات الهوية الآمنة.", "yesResendMail":"نعم، أعد إرسال البريد", @@ -258,4 +259,4 @@ "yourPhone":"رقم هاتفك", "yourProfile":"ملفك الشخصي", "yourTotpKey":"Your TOTP key" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/de.json b/lemonldap-ng-portal/site/htdocs/static/languages/de.json index e06a80125..d8b11571c 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/de.json @@ -242,6 +242,7 @@ "verify":"Verify", "VHnotFound":"Virtual Host not found", "wait":"Warten", +"waitingmessage":"Authentication in progress, please wait", "warning":"Warnung", "welcomeOnPortal":"Willkommen in Ihrem gesicherten Authentifizierungsportal.", "yesResendMail":"Ja, Mail erneut senden.", @@ -258,4 +259,4 @@ "yourPhone":"Ihre Telefonnummer", "yourProfile":"Ihr Profil", "yourTotpKey":"Your TOTP key" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/en.json b/lemonldap-ng-portal/site/htdocs/static/languages/en.json index 5daab952c..bb31c18e5 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/en.json @@ -242,6 +242,7 @@ "verify": "Verify", "VHnotFound":"Virtual Host not found", "wait":"Wait", +"waitingmessage":"Authentication in progress, please wait", "warning":"Warning", "welcomeOnPortal":"Welcome on your secured authentication portal.", "yesResendMail":"Yes, resend the mail", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/es.json b/lemonldap-ng-portal/site/htdocs/static/languages/es.json index 4686387ea..93e392116 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/es.json @@ -242,6 +242,7 @@ "verify":"Verify", "VHnotFound":"Virtual Host not found", "wait":"Wait", +"waitingmessage":"Authentication in progress, please wait", "warning":"Warning", "welcomeOnPortal":"Welcome on your secured authentication portal.", "yesResendMail":"Yes, resend the mail", @@ -258,4 +259,4 @@ "yourPhone":"Your phone number", "yourProfile":"Your profile", "yourTotpKey":"Your TOTP key" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json index ed15d518f..f56809bfc 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json @@ -242,6 +242,7 @@ "verify": "Vérifier", "VHnotFound":"Hôte virtuel erroné ou inexistant", "wait":"Attendre", +"waitingmessage":"Authentification en cours, merci de patienter", "warning":"Attention", "welcomeOnPortal":"Bienvenue sur votre portail d'authentification sécurisée.", "yesResendMail":"Oui, renvoyer le mail", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/it.json b/lemonldap-ng-portal/site/htdocs/static/languages/it.json index e55260ed0..f373c5c41 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/it.json @@ -242,6 +242,7 @@ "verify":"Verifica", "VHnotFound":"Virtual Host not found", "wait":"Attendere", +"waitingmessage":"Authentication in progress, please wait", "warning":"Avvertimento", "welcomeOnPortal":"Benvenuto sul tuo portale di autenticazione protetta.", "yesResendMail":"Sì, rinvia e-mail", @@ -258,4 +259,4 @@ "yourPhone":"Numero di telefono", "yourProfile":"Il tuo profilo", "yourTotpKey":"La tua chiave TOTP" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json index 98ea027d1..1449221e4 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json @@ -242,6 +242,7 @@ "verify":"Verify", "VHnotFound":"Virtual Host not found", "wait":"Wait", +"waitingmessage":"Authentication in progress, please wait", "warning":"Warning", "welcomeOnPortal":"Welcome on your secured authentication portal.", "yesResendMail":"Yes, resend the mail", @@ -258,4 +259,4 @@ "yourPhone":"Your phone number", "yourProfile":"Your profile", "yourTotpKey":"Your TOTP key" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json index f44d19db7..8ddc38dfc 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json @@ -242,6 +242,7 @@ "verify":"Verify", "VHnotFound":"Virtual Host not found", "wait":"Wait", +"waitingmessage":"Authentication in progress, please wait", "warning":"Warning", "welcomeOnPortal":"Welcome on your secured authentication portal.", "yesResendMail":"Yes, resend the mail", @@ -258,4 +259,4 @@ "yourPhone":"Your phone number", "yourProfile":"Your profile", "yourTotpKey":"Your TOTP key" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json index ad4bbd449..0eb00f7a1 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json @@ -242,6 +242,7 @@ "verify":"Verify", "VHnotFound":"Virtual Host not found", "wait":"Wait", +"waitingmessage":"Authentication in progress, please wait", "warning":"Warning", "welcomeOnPortal":"Welcome on your secured authentication portal.", "yesResendMail":"Yes, resend the mail", @@ -258,4 +259,4 @@ "yourPhone":"Your phone number", "yourProfile":"Your profile", "yourTotpKey":"Your TOTP key" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json index ec15ba845..799f4205f 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json @@ -242,6 +242,7 @@ "verify":"Xác minh", "VHnotFound":"Virtual Host not found", "wait":"Hãy đợi", +"waitingmessage":"Authentication in progress, please wait", "warning":"Cảnh báo", "welcomeOnPortal":"Chào mừng bạn đến với cổng thông tin xác thực được bảo mật của bạn.", "yesResendMail":"Có, gửi lại thư", @@ -258,4 +259,4 @@ "yourPhone":"Số điện thoại của bạn", "yourProfile":"Profile của bạn", "yourTotpKey":"Your TOTP key" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/zh.json b/lemonldap-ng-portal/site/htdocs/static/languages/zh.json index e24e023f6..be3cc00ff 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/zh.json @@ -242,6 +242,7 @@ "verify":"验证", "VHnotFound":"Virtual Host not found", "wait":"等待", +"waitingmessage":"Authentication in progress, please wait", "warning":"警告", "welcomeOnPortal":"欢迎来到您的加密认证 portal", "yesResendMail":"好的,重新发送邮件", @@ -258,4 +259,4 @@ "yourPhone":"您的电话号码", "yourProfile":"您的档案", "yourTotpKey":"Your TOTP key" -} \ No newline at end of file +} diff --git a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl index 3b3b654d2..b9b9e6997 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl @@ -1,3 +1,10 @@ + +" /> + + + +
+
@@ -24,9 +31,6 @@
- - " /> - @@ -36,6 +40,7 @@ Connect
+