diff --git a/account/index.ftl b/account/index.ftl index 69f1c6c..b8722bf 100644 --- a/account/index.ftl +++ b/account/index.ftl @@ -45,7 +45,8 @@ isLinkedAccountsEnabled : ${realm.identityFederationEnabled?c}, isEventsEnabled : ${isEventsEnabled?c}, isMyResourcesEnabled : ${(realm.userManagedAccessAllowed && isAuthorizationEnabled)?c}, - isTotpConfigured : ${isTotpConfigured?c} + isTotpConfigured : ${isTotpConfigured?c}, + deleteAccountAllowed : ${deleteAccountAllowed?c} } var availableLocales = []; @@ -109,20 +110,20 @@ - - + + @@ -278,3 +278,4 @@ + diff --git a/login/denied-auth.ftl b/login/denied-auth.ftl new file mode 100644 index 0000000..76b0218 --- /dev/null +++ b/login/denied-auth.ftl @@ -0,0 +1,12 @@ +<@layout.registrationLayout displayMessage=false; section> + <#if section = "header"> + Access denied + <#elseif section = "form"> +
+

${description}

+ <#if client?? && client.baseUrl?has_content> +

${kcSanitize(msg("backToApplication"))?no_esc}

+ +
+ + diff --git a/login/register.ftl b/login/register.ftl index d157910..1f903ad 100644 --- a/login/register.ftl +++ b/login/register.ftl @@ -1,73 +1,120 @@ <#import "template.ftl" as layout> -<@layout.registrationLayout; section> +<@layout.registrationLayout displayMessage=!messagesPerField.existsError('firstName','lastName','email','username','password','password-confirm'); section> <#if section = "header"> ${msg("registerTitle")} <#elseif section = "form">
-
+
- + + + <#if messagesPerField.existsError('firstName')> + + ${kcSanitize(messagesPerField.get('firstName'))?no_esc} + +
-
+
- + + + <#if messagesPerField.existsError('lastName')> + + ${kcSanitize(messagesPerField.get('lastName'))?no_esc} + +
-
+
- + + + <#if messagesPerField.existsError('email')> + + ${kcSanitize(messagesPerField.get('email'))?no_esc} + +
- <#if !realm.registrationEmailAsUsername> -
-
- -
-
- + <#if !realm.registrationEmailAsUsername> +
+
+ +
+
+ + + <#if messagesPerField.existsError('username')> + + ${kcSanitize(messagesPerField.get('username'))?no_esc} + + +
-
- + <#if passwordRequired??> -
-
- -
-
- -
-
+
+
+ +
+
+ -
-
- -
-
- + <#if messagesPerField.existsError('password')> + + ${kcSanitize(messagesPerField.get('password'))?no_esc} + + +
-
- - <#if recaptchaRequired??> -
-
-
+
+
+ +
+
+ + + <#if messagesPerField.existsError('password-confirm')> + + ${kcSanitize(messagesPerField.get('password-confirm'))?no_esc} + + +
-
<#if captchaRequired??> @@ -82,6 +129,14 @@
+ <#if recaptchaRequired??> +
+
+
+
+
+ +
diff --git a/login/webauthn-authenticate.ftl b/login/webauthn-authenticate.ftl deleted file mode 100644 index 886342a..0000000 --- a/login/webauthn-authenticate.ftl +++ /dev/null @@ -1,113 +0,0 @@ - <#import "template.ftl" as layout> - <@layout.registrationLayout showAnotherWayIfPresent=false; section> - <#if section = "title"> - title - <#elseif section = "header"> - ${kcSanitize(msg("webauthn-login-title"))?no_esc} - <#elseif section = "form"> - - -
- - - - - - -
- - - <#if authenticators??> -
- <#list authenticators.authenticators as authenticator> - - -
- - - - - - <#elseif section = "info"> - - -