From 7ec067eadf98fcfe9ed3bd0fb387e318ebd6dbde Mon Sep 17 00:00:00 2001 From: vrockai Date: Fri, 8 Nov 2013 16:50:06 +0100 Subject: [PATCH] KEYCLOAK-132,136,139 fix for form UI separator issues --- .../resources/forms/theme/default/css/login-register.css | 2 +- .../forms/theme/default/login-update-password.ftl | 2 +- .../forms/theme/default/login-update-profile.ftl | 2 +- .../resources/forms/theme/default/login-verify-email.ftl | 2 +- .../forms/theme/default/template-login-action.ftl | 9 +++++++-- .../resources/forms/theme/default/template-login.ftl | 9 +++++++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css index bc25029b9a..75447de59f 100644 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css @@ -71,7 +71,7 @@ body { width: auto; position: relative; } -.rcue-login-register .background-area .separator .section, +.rcue-login-register .background-area .section, .rcue-login-register .background-area .social .section { padding-top: 1.5em; padding-bottom: 1.5em; diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl index 74142e0a31..f940600b2e 100755 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl @@ -1,5 +1,5 @@ <#import "template-login-action.ftl" as layout> -<@layout.registrationLayout bodyClass="reset"; section> +<@layout.registrationLayout bodyClass="reset" isSeparator=true forceSeparator=true; section> <#if section = "title"> ${rb.getString('emailUpdateHeader')} diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl index 32bdd23c48..ca707a566b 100755 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl @@ -1,5 +1,5 @@ <#import "template-login-action.ftl" as layout> -<@layout.registrationLayout bodyClass=""; section> +<@layout.registrationLayout bodyClass="" isSeparator=false forceSeparator=true; section> <#if section = "title"> Update Account Information diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl index 0832666004..cc83a85ea1 100755 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl @@ -1,5 +1,5 @@ <#import "template-login-action.ftl" as layout> -<@layout.registrationLayout bodyClass="email"; section> +<@layout.registrationLayout bodyClass="email" isSeparator=false forceSeparator=true; section> <#if section = "title"> Email verification diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl index 1c54428d68..823972cc3c 100644 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl @@ -1,4 +1,4 @@ -<#macro registrationLayout bodyClass isErrorPage=false> +<#macro registrationLayout bodyClass isErrorPage=false isSeparator=false forceSeparator=false> @@ -36,7 +36,12 @@
-
+ <#if !forceSeparator && realm?has_content> + <#assign drawSeparator = realm.registrationAllowed> + <#else> + <#assign drawSeparator = isSeparator> + +
<#if !isErrorPage && message?has_content> <#if message.error> diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl index 5fbc2f8280..dfd4480d57 100644 --- a/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl +++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl @@ -1,4 +1,4 @@ -<#macro registrationLayout bodyClass> +<#macro registrationLayout bodyClass isSeparator=false forceSeparator=false> @@ -29,7 +29,12 @@
-
+ <#if !forceSeparator && realm?has_content> + <#assign drawSeparator = realm.registrationAllowed> + <#else> + <#assign drawSeparator = isSeparator> + +

Application login area

<#if message?has_content && message.error>