diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index 609f92ef2..76f66e4c7 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -77,7 +77,7 @@ "authChain":"سلسلة إثبات الهوية", "authChoice":"اختيار إثبات الهوية", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"FindUser plugin parameter", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"الوحدات المسموح بها", "authChoiceParam":"معايير URL", "authOnly":"إثبات الهوية فقط", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/de.json b/lemonldap-ng-manager/site/htdocs/static/languages/de.json index fc13414ac..5e717a7ca 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json @@ -77,7 +77,7 @@ "authChain":"Authentication chain", "authChoice":"Authentication choice", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"FindUser plugin parameter", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"Allowed modules", "authChoiceParam":"URL parameter", "authOnly":"Authentication only", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json index 0bd6c1056..0477c7a76 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json @@ -77,7 +77,7 @@ "authChain":"Authentication chain", "authChoice":"Authentication choice", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"FindUser plugin parameter", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"Allowed modules", "authChoiceParam":"URL parameter", "authOnly":"Authentication only", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/es.json b/lemonldap-ng-manager/site/htdocs/static/languages/es.json index 93fd8a50c..0e1f47c3e 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json @@ -77,7 +77,7 @@ "authChain":"Cadena de autentificación", "authChoice":"Opción de autentificación", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"FindUser plugin parameter", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"Módulos permitidos", "authChoiceParam":"Parámetro URL", "authOnly":"Sólo autentificación", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index f0d507f72..7a8f2ec6e 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -77,7 +77,7 @@ "authChain":"Chaîne d'authentification", "authChoice":"Choix d'authentification", "authChoiceAuthBasic":"Choix à utiliser pour l'authentification par mot de passe", -"authChoiceFindUser":"Paramètre de recherche de compte", +"authChoiceFindUser":"Choix à utiliser pour la recherche de compte", "authChoiceModules":"Modules autorisés", "authChoiceParam":"Paramètre de l'URL", "authOnly":"Authentification seulement", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index fd5d48c58..dd636cd8c 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -77,7 +77,7 @@ "authChain":"Catena di autenticazione", "authChoice":"Scelta di autenticazione", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"FindUser plugin parameter", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"Moduli consentiti", "authChoiceParam":"Parametri URL", "authOnly":"Solo autenticazione", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json index 7c4032ee0..0b7a95bb7 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json @@ -77,7 +77,7 @@ "authChain":"Łańcuch uwierzytelnienia", "authChoice":"Wybór uwierzytelnienia", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"Parametr wtyczki FindUser", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"Dozwolone moduły", "authChoiceParam":"Parametr adresu URL", "authOnly":"Tylko uwierzytelnianie", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json index 16bb6e3b0..be9a78661 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json @@ -77,7 +77,7 @@ "authChain":"Doğrulama zinciri", "authChoice":"Kimlik doğrulama tercihi", "authChoiceAuthBasic":"Parola doğrulaması için kullanılan seçim", -"authChoiceFindUser":"FindUser eklenti parametresi", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"İzin verilen modüller", "authChoiceParam":"URL parametresi", "authOnly":"Yalnızca kimlik doğrulama", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index 57196120f..b5258ec56 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -77,7 +77,7 @@ "authChain":"Chuỗi xác thực", "authChoice":"Lựa chọn xác thực", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"FindUser plugin parameter", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"Các mô-đun được phép", "authChoiceParam":"Tham số URL", "authOnly":"Chỉ xác thực", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json index 9a3fcb9e2..080d6b06a 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json @@ -77,7 +77,7 @@ "authChain":"认证chain", "authChoice":"认证方式选择", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"FindUser plugin parameter", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"允许的模块", "authChoiceParam":"URL 参数", "authOnly":"Authentication only", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json index 2578998fe..e3b1fdd28 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json @@ -77,7 +77,7 @@ "authChain":"驗證鏈", "authChoice":"驗證選擇", "authChoiceAuthBasic":"Choice used for password authentication", -"authChoiceFindUser":"FindUser plugin parameter", +"authChoiceFindUser":"Choice used for searching user account", "authChoiceModules":"已允許的模組", "authChoiceParam":"URL 參數", "authOnly":"僅驗證", 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 63b3d4c74..9a4b3cd72 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm @@ -484,12 +484,13 @@ sub display { $self->loadedModules->{ "Lemonldap::NG::Portal::Plugins::FindUser"}; my $fields = []; + my $slogin; if ( $plugin && $self->conf->{findUser} && $self->conf->{impersonationRule} && $self->conf->{findUserSearchingAttributes} ) { - $login = $req->data->{findUser}; + $slogin = $req->data->{findUser}; $fields = $plugin->buildForm(); } @@ -508,7 +509,7 @@ sub display { DISPLAY_YUBIKEY_FORM => 0, DISPLAY_FINDUSER => scalar @$fields, FIELDS => $fields, - SPOOFID => $login + SPOOFID => $slogin ); } @@ -542,7 +543,7 @@ sub display { ( $displayType eq "logo" ? $self->conf->{portal} : 0 ), MSG => $req->info(), FIELDS => $fields, - SPOOFID => $login + SPOOFID => $slogin ); } } diff --git a/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.css b/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.css index 21cffb5e5..aec322fa4 100644 --- a/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.css +++ b/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.css @@ -57,6 +57,10 @@ div.actions a { margin-top: 10px; } +div.actions button { + margin-top: 10px; +} + .buttons { text-align: center; margin: 10px 0 0 0; diff --git a/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.min.css b/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.min.css index 860b78b71..6fb5ebfa4 100644 --- a/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.min.css +++ b/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.min.css @@ -1 +1 @@ -html,body{height:100%;background:radial-gradient(circle at 50% 0,#fff 0,#ddd 100%) no-repeat scroll 0 0 #ddd}#wrap{min-height:100%;height:auto;margin:0 auto -80px;padding:20px 0 80px}#footer{height:80px;background-color:#fff;background-color:rgba(255,255,255,0.9);text-align:center;padding-top:10px;overflow:hidden}#header img{background-color:#fff;background-color:rgba(255,255,255,0.8);margin-bottom:20px}.card,.navbar-light{background-color:#fff;background-color:rgba(255,255,255,0.9);background-image:none}.login,.password{text-align:center;padding:20px}div.form{margin:0 auto;max-width:330px}div.actions{margin:10px 0 0 0}div.actions a{margin-top:10px}.buttons{text-align:center;margin:10px 0 0 0;cursor:pointer}.btn{white-space:normal}.btn span.fa{padding-right:8px}li.ui-state-active{background-color:#fafafa;background-color:rgba(250,250,250,0.9)}#appslist,#password,#loginHistory,#logout,#oidcConsents{margin-top:20px}div.category{margin:10px 0;cursor:grab}div.application{margin:5px 0;overflow:hidden}div.application a,div.application a:hover{text-decoration:none}p.notifCheck label{margin-left:5px;margin-top:3px;display:inline-block}img.langicon{cursor:pointer}button.idploop{max-width:300px}button.idploop img{max-height:30px}div.oidc_consent_message>ul{text-align:left;list-style:circle}@media(min-width:768px){div.application{height:80px}div.application h4.appname{margin:0}#wrap{margin:0 auto -60px}#footer{height:60px}}.hiddenFrame{border:0;display:hidden;margin:0}.noborder{border:0}.max{width:100%}.link{cursor:pointer}.nodecor:hover,.nodecor:active,.nodecor:focus{text-decoration:none}.fa.icon-blue{color:blue}.progress-bar-animated{width:100%}input.key{font-family:'password';width:100px}@font-face{font-family:'password';src:url(/static/common/fonts/password.ttf)}.info.table caption{color:black;text-align:center;caption-side:bottom}div.input-group>p.form-control{height:auto}div.input-group>p.form-control>label{display:revert;user-select:none;cursor:pointer} \ No newline at end of file +html,body{height:100%;background:radial-gradient(circle at 50% 0,#fff 0,#ddd 100%) no-repeat scroll 0 0 #ddd}#wrap{min-height:100%;height:auto;margin:0 auto -80px;padding:20px 0 80px}#footer{height:80px;background-color:#fff;background-color:rgba(255,255,255,0.9);text-align:center;padding-top:10px;overflow:hidden}#header img{background-color:#fff;background-color:rgba(255,255,255,0.8);margin-bottom:20px}.card,.navbar-light{background-color:#fff;background-color:rgba(255,255,255,0.9);background-image:none}.login,.password{text-align:center;padding:20px}div.form{margin:0 auto;max-width:330px}div.actions{margin:10px 0 0 0}div.actions a{margin-top:10px}div.actions button{margin-top:10px}.buttons{text-align:center;margin:10px 0 0 0;cursor:pointer}.btn{white-space:normal}.btn span.fa{padding-right:8px}li.ui-state-active{background-color:#fafafa;background-color:rgba(250,250,250,0.9)}#appslist,#password,#loginHistory,#logout,#oidcConsents{margin-top:20px}div.category{margin:10px 0;cursor:grab}div.application{margin:5px 0;overflow:hidden}div.application a,div.application a:hover{text-decoration:none}p.notifCheck label{margin-left:5px;margin-top:3px;display:inline-block}img.langicon{cursor:pointer}button.idploop{max-width:300px}button.idploop img{max-height:30px}div.oidc_consent_message>ul{text-align:left;list-style:circle}@media(min-width:768px){div.application{height:80px}div.application h4.appname{margin:0}#wrap{margin:0 auto -60px}#footer{height:60px}}.hiddenFrame{border:0;display:hidden;margin:0}.noborder{border:0}.max{width:100%}.link{cursor:pointer}.nodecor:hover,.nodecor:active,.nodecor:focus{text-decoration:none}.fa.icon-blue{color:blue}.progress-bar-animated{width:100%}input.key{font-family:'password';width:100px}@font-face{font-family:'password';src:url(/static/common/fonts/password.ttf)}.info.table caption{color:black;text-align:center;caption-side:bottom}div.input-group>p.form-control{height:auto}div.input-group>p.form-control>label{display:revert;user-select:none;cursor:pointer} \ No newline at end of file