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

Removed empty include templates from forms, and use templates from theme directly

Browse source
This commit is contained in:
Stian Thorgersen 2013-11-12 15:26:26 +00:00
parent 5916eaad13
commit 794976792a
17 changed files with 16 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
forms/src/main/java/org/keycloak/service/FormServiceImpl.java
View file

@ -104,7 +104,7 @@ public class FormServiceImpl implements FormService {
Configuration cfg = new Configuration(); Configuration cfg = new Configuration();
try { try {
cfg.setClassForTemplateLoading(FormServiceImpl.class,"/META-INF/resources"); cfg.setClassForTemplateLoading(FormServiceImpl.class,"/META-INF/resources/forms/theme/default");
Template template = cfg.getTemplate(temp); Template template = cfg.getTemplate(temp);
template.process(input, out); template.process(input, out);

1
forms/src/main/resources/META-INF/resources/forms/access.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/access.ftl">

1
forms/src/main/resources/META-INF/resources/forms/account.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/account.ftl">

1
forms/src/main/resources/META-INF/resources/forms/error.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/error.ftl">

1
forms/src/main/resources/META-INF/resources/forms/login-config-totp.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/login-config-totp.ftl">

1
forms/src/main/resources/META-INF/resources/forms/login-oauth-grant.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/login-oauth-grant.ftl">

1
forms/src/main/resources/META-INF/resources/forms/login-reset-password.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/login-reset-password.ftl">

1
forms/src/main/resources/META-INF/resources/forms/login-totp.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/login-totp.ftl">

1
forms/src/main/resources/META-INF/resources/forms/login-update-password.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/login-update-password.ftl">

1
forms/src/main/resources/META-INF/resources/forms/login-update-profile.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/login-update-profile.ftl">

1
forms/src/main/resources/META-INF/resources/forms/login-verify-email.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/login-verify-email.ftl">

1
forms/src/main/resources/META-INF/resources/forms/login.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/login.ftl">

1
forms/src/main/resources/META-INF/resources/forms/password.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/password.ftl">

1
forms/src/main/resources/META-INF/resources/forms/register.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/register.ftl">

1
forms/src/main/resources/META-INF/resources/forms/social.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/social.ftl">

1
forms/src/main/resources/META-INF/resources/forms/totp.ftl
View file

@ -1 +0,0 @@
<#include "./theme/" + template.theme + "/totp.ftl">

30
services/src/main/java/org/keycloak/services/resources/flows/Pages.java
View file

@ -26,34 +26,34 @@ package org.keycloak.services.resources.flows;
*/ */
public class Pages { public class Pages {
public final static String ACCESS = "/forms/access.ftl"; public final static String ACCESS = "access.ftl";
public final static String ACCOUNT = "/forms/account.ftl"; public final static String ACCOUNT = "account.ftl";
public final static String LOGIN = "/forms/login.ftl"; public final static String LOGIN = "login.ftl";
public final static String LOGIN_TOTP = "/forms/login-totp.ftl"; public final static String LOGIN_TOTP = "login-totp.ftl";
public final static String LOGIN_CONFIG_TOTP = "/forms/login-config-totp.ftl"; public final static String LOGIN_CONFIG_TOTP = "login-config-totp.ftl";
public final static String LOGIN_VERIFY_EMAIL = "/forms/login-verify-email.ftl"; public final static String LOGIN_VERIFY_EMAIL = "login-verify-email.ftl";
public final static String OAUTH_GRANT = "/forms/login-oauth-grant.ftl"; public final static String OAUTH_GRANT = "login-oauth-grant.ftl";
public final static String PASSWORD = "/forms/password.ftl"; public final static String PASSWORD = "password.ftl";
public final static String LOGIN_RESET_PASSWORD = "/forms/login-reset-password.ftl"; public final static String LOGIN_RESET_PASSWORD = "login-reset-password.ftl";
public final static String LOGIN_UPDATE_PASSWORD = "/forms/login-update-password.ftl"; public final static String LOGIN_UPDATE_PASSWORD = "login-update-password.ftl";
public final static String REGISTER = "/forms/register.ftl"; public final static String REGISTER = "register.ftl";
public final static String ERROR = "/forms/error.ftl"; public final static String ERROR = "error.ftl";
public final static String SOCIAL = "/forms/social.ftl"; public final static String SOCIAL = "social.ftl";
public final static String TOTP = "/forms/totp.ftl"; public final static String TOTP = "totp.ftl";
public final static String LOGIN_UPDATE_PROFILE = "/forms/login-update-profile.ftl"; public final static String LOGIN_UPDATE_PROFILE = "login-update-profile.ftl";
} }