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

Merge pull request #95 from vrockai/KEYCLOAK-144

Browse source 
Fixes for several form UI issues
This commit is contained in:
stianst 2013-11-08 08:35:16 -08:00
commit f3c52247c8
8 changed files with 22 additions and 11 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;
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;

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>
<@layout.registrationLayout bodyClass="reset"; section>
<@layout.registrationLayout bodyClass="reset" isSeparator=true forceSeparator=true; section>
<#if section = "title">
${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>
<@layout.registrationLayout bodyClass=""; section>
<@layout.registrationLayout bodyClass="" isSeparator=false forceSeparator=true; section>
<#if section = "title">
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>
<@layout.registrationLayout bodyClass="email"; section>
<@layout.registrationLayout bodyClass="email" isSeparator=false forceSeparator=true; section>
<#if section = "title">
Email verification

10
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">
<html xmlns="http://www.w3.org/1999/xhtml">
@ -7,6 +7,7 @@
<title>
<#nested "title">
</title>
<link rel="icon" href="${template.formsPath}/theme/${template.theme}/img/favicon.ico">
<link href="${template.themeConfig.styles}" rel="stylesheet" />
<style type="text/css">
body.rcue-login-register {
@ -35,7 +36,12 @@
</h2>
<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">
<#if !isErrorPage && message?has_content>
<#if message.error>

10
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">
<html xmlns="http://www.w3.org/1999/xhtml">
@ -7,6 +7,7 @@
<title>
<#nested "title">
</title>
<link rel="icon" href="${template.formsPath}/theme/${template.theme}/img/favicon.ico">
<link href="${template.themeConfig.styles}" rel="stylesheet" />
<style type="text/css">
body.rcue-login-register {
@ -28,7 +29,12 @@
</h2>
<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">
<h3>Application login area</h3>
<#if message?has_content && message.error>

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

@ -4,8 +4,7 @@
<head>
<meta charset="utf-8">
<title>Edit Account - <#nested "title"></title>
<!-- TODO replace with actual logo once
<link rel="icon" href="img/favicon.ico">
<link rel="icon" href="${template.formsPath}/theme/${template.theme}/img/favicon.ico">
<!-- Frameworks -->
<link rel="stylesheet" href="${template.formsPath}/theme/${template.theme}/css/reset.css">

2
testsuite/integration/src/main/java/org/keycloak/testutils/KeycloakServer.java
View file

@ -261,7 +261,7 @@ public class KeycloakServer {
di.setDeploymentName("Keycloak");
di.setResourceManager(new KeycloakResourceManager(config.getResourcesHome()));
Set<String> allowed = new HashSet<String>(Arrays.asList(new String[]{"js", "css", "png", "jpg", "gif", "html", "svg"}));
Set<String> allowed = new HashSet<String>(Arrays.asList(new String[]{"js", "css", "png", "jpg", "gif", "html", "svg", "ico"}));
di.setDefaultServletConfig(new DefaultServletConfig(false, allowed));
di.addWelcomePage("index.html");