libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-132,136,139 fix for form UI separator issues

Browse source
This commit is contained in:
vrockai 2013-11-08 16:50:06 +01:00
parent 2c9fcc2324
commit 7ec067eadf
6 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
View file

@ -71,7 +71,7 @@ body {
width: auto; width: auto;
position: relative; position: relative;
} }
.rcue-login-register .background-area .separator .section, .rcue-login-register .background-area .section,
.rcue-login-register .background-area .social .section { .rcue-login-register .background-area .social .section {
padding-top: 1.5em; padding-top: 1.5em;
padding-bottom: 1.5em; padding-bottom: 1.5em;

2
forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-password.ftl
View file

@ -1,5 +1,5 @@
<#import "template-login-action.ftl" as layout> <#import "template-login-action.ftl" as layout>
<@layout.registrationLayout bodyClass="reset"; section> <@layout.registrationLayout bodyClass="reset" isSeparator=true forceSeparator=true; section>
<#if section = "title"> <#if section = "title">
${rb.getString('emailUpdateHeader')} ${rb.getString('emailUpdateHeader')}

2
forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
View file

@ -1,5 +1,5 @@
<#import "template-login-action.ftl" as layout> <#import "template-login-action.ftl" as layout>
<@layout.registrationLayout bodyClass=""; section> <@layout.registrationLayout bodyClass="" isSeparator=false forceSeparator=true; section>
<#if section = "title"> <#if section = "title">
Update Account Information Update Account Information

2
forms/src/main/resources/META-INF/resources/forms/theme/default/login-verify-email.ftl
View file

@ -1,5 +1,5 @@
<#import "template-login-action.ftl" as layout> <#import "template-login-action.ftl" as layout>
<@layout.registrationLayout bodyClass="email"; section> <@layout.registrationLayout bodyClass="email" isSeparator=false forceSeparator=true; section>
<#if section = "title"> <#if section = "title">
Email verification Email verification

9
forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl
View file

@ -1,4 +1,4 @@
<#macro registrationLayout bodyClass isErrorPage=false> <#macro registrationLayout bodyClass isErrorPage=false isSeparator=false forceSeparator=false>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
@ -36,7 +36,12 @@
</h2> </h2>
<div class="background-area"> <div class="background-area">
<div class="form-area clearfix"> <#if !forceSeparator && realm?has_content>
<#assign drawSeparator = realm.registrationAllowed>
<#else>
<#assign drawSeparator = isSeparator>
</#if>
<div class="form-area clearfix ${(drawSeparator)?string('separator','')}">
<div class="section app-form"> <div class="section app-form">
<#if !isErrorPage && message?has_content> <#if !isErrorPage && message?has_content>
<#if message.error> <#if message.error>

9
forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl
View file

@ -1,4 +1,4 @@
<#macro registrationLayout bodyClass> <#macro registrationLayout bodyClass isSeparator=false forceSeparator=false>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
@ -29,7 +29,12 @@
</h2> </h2>
<div class="background-area"> <div class="background-area">
<div class="form-area ${(realm.social)?string('social','')} clearfix"> <#if !forceSeparator && realm?has_content>
<#assign drawSeparator = realm.registrationAllowed>
<#else>
<#assign drawSeparator = isSeparator>
</#if>
<div class="form-area ${(realm.social && bodyClass != "register")?string('social','')} ${(drawSeparator)?string('separator','')} clearfix">
<div class="section app-form"> <div class="section app-form">
<h3>Application login area</h3> <h3>Application login area</h3>
<#if message?has_content && message.error> <#if message?has_content && message.error>