From 8e97213d498861b3e9f8360492da38102bd792a3 Mon Sep 17 00:00:00 2001 From: alenaPoletaeva Date: Mon, 14 Jun 2021 15:52:25 +0300 Subject: [PATCH] juice_14_06_21 --- juice/login/login-reset-password.ftl | 14 +- juice/login/login.ftl | 185 ++++++++++++++------------- juice/login/messages_de.properties | 35 ----- juice/login/messages_en.properties | 33 ----- juice/login/register.ftl | 18 +-- juice/login/resources/css/styles.css | 16 ++- juice/login/resources/img/juice.svg | 9 -- 7 files changed, 124 insertions(+), 186 deletions(-) delete mode 100644 juice/login/messages_de.properties delete mode 100644 juice/login/messages_en.properties delete mode 100644 juice/login/resources/img/juice.svg diff --git a/juice/login/login-reset-password.ftl b/juice/login/login-reset-password.ftl index 6705aa3..bfa429b 100644 --- a/juice/login/login-reset-password.ftl +++ b/juice/login/login-reset-password.ftl @@ -39,17 +39,19 @@
+ +
+ +
<#if client?? && client.baseUrl?has_content> ${kcSanitize(msg("backToLogin"))?no_esc}
-
-
- ${msg("haveAccount")} ${msg("signInHere")} -
-
diff --git a/juice/login/login.ftl b/juice/login/login.ftl index 13dd17b..17bf3f9 100644 --- a/juice/login/login.ftl +++ b/juice/login/login.ftl @@ -25,110 +25,113 @@
${msg("loginAccountTitle")}
<#elseif section = "form">
-
- <#if realm.password> -
-
+
+ <#if realm.password> + +
- <#if usernameEditDisabled??> - - <#else> - - <#if messagesPerField.existsError('username','password')> -
- ${kcSanitize(messagesPerField.getFirstError('username','password'))?no_esc} -
- - - - -
- -
+ <#if usernameEditDisabled??> + + <#else> + + <#if messagesPerField.existsError('username','password')> +
+ ${kcSanitize(messagesPerField.getFirstError('username','password'))?no_esc} +
+ + - - -
+ +
-
- value="${auth.selectedCredential}"/> - -
+ - - - <#if realm.internationalizationEnabled && locale.supported?size gt 1> - <#if locale.current="Deutsch"> -