keycloak-uncached

Merge remote-tracking branch 'upstream/master'

1/13/2014 4:04:18 PM

Bill Burke

Commit: c751d8b

Tree: 5ad61d5

Parents: 4b6ebc3
2e40e63

Changes

admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/img/favicon.ico 0(+0 -0)

forms/src/main/java/org/keycloak/service/FormServiceImpl.java 1(+1 -0)

forms/src/main/resources/META-INF/resources/forms/theme/default/img/favicon.ico 0(+0 -0)

forms/src/main/resources/META-INF/resources/forms/theme/default/img/keycloak-logo.png 0(+0 -0)

forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl 2(+1 -1)

forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl 2(+1 -1)

Details

admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/img/favicon.ico 0(+0 -0)

diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/img/favicon.ico b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/img/favicon.ico
index cbb6124..8864f00 100644
Binary files a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/img/favicon.ico and b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/img/favicon.ico differ

forms/src/main/java/org/keycloak/service/FormServiceImpl.java 1(+1 -0)

diff --git a/forms/src/main/java/org/keycloak/service/FormServiceImpl.java b/forms/src/main/java/org/keycloak/service/FormServiceImpl.java
index 01ca837..33d36ea 100755
--- a/forms/src/main/java/org/keycloak/service/FormServiceImpl.java
+++ b/forms/src/main/java/org/keycloak/service/FormServiceImpl.java
@@ -59,6 +59,7 @@ public class FormServiceImpl implements FormService {
 
     public FormServiceImpl(){
         commandMap.put(Pages.LOGIN, new CommandLogin());
+        commandMap.put(Pages.ERROR, new CommandLogin());
         commandMap.put(Pages.REGISTER, new CommandRegister());
         commandMap.put(Pages.ACCOUNT, new CommandCommon());
         commandMap.put(Pages.LOGIN_UPDATE_PROFILE, new CommandCommon());

forms/src/main/resources/META-INF/resources/forms/theme/default/img/favicon.ico 0(+0 -0)

diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/img/favicon.ico b/forms/src/main/resources/META-INF/resources/forms/theme/default/img/favicon.ico
index cbb6124..8864f00 100644
Binary files a/forms/src/main/resources/META-INF/resources/forms/theme/default/img/favicon.ico and b/forms/src/main/resources/META-INF/resources/forms/theme/default/img/favicon.ico differ

forms/src/main/resources/META-INF/resources/forms/theme/default/img/keycloak-logo.png 0(+0 -0)

diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/img/keycloak-logo.png b/forms/src/main/resources/META-INF/resources/forms/theme/default/img/keycloak-logo.png
index f3886aa..4e87207 100644
Binary files a/forms/src/main/resources/META-INF/resources/forms/theme/default/img/keycloak-logo.png and b/forms/src/main/resources/META-INF/resources/forms/theme/default/img/keycloak-logo.png differ

forms/src/main/resources/META-INF/resources/forms/theme/default/template-login.ftl 2(+1 -1)

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 1a20b3a..50ac51a 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
@@ -19,7 +19,7 @@
 <body class="rcue-login-register ${bodyClass}">
     <#if (template.themeConfig.logo)?has_content>
         <h1>
-            <a href="${url.loginUrl}" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Red Hat Logo" /></a>
+            <a href="${url.loginUrl}" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Keycloak" /></a>
         </h1>
     </#if>

forms/src/main/resources/META-INF/resources/forms/theme/default/template-login-action.ftl 2(+1 -1)

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 977f1cd..bfacefd 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
@@ -26,7 +26,7 @@
     </div>
     <#if (template.themeConfig.logo)?has_content>
         <h1>
-            <a href="${url.loginUrl}" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Red Hat Logo" /></a>
+            <a href="${url.loginUrl}" title="Go to the login page"><img src="${template.themeConfig.logo}" alt="Keycloak" /></a>
         </h1>
     </#if>