Details
diff --git a/forms/src/main/resources/META-INF/resources/forms/error.ftl b/forms/src/main/resources/META-INF/resources/forms/error.ftl
index 3dd69c9..2b28cb7 100644
--- a/forms/src/main/resources/META-INF/resources/forms/error.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/error.ftl
@@ -1 +1 @@
-template not found
\ No newline at end of file
+<#include "./theme/" + template.theme + "/error.ftl">
\ No newline at end of file
diff --git a/forms/src/main/resources/META-INF/resources/forms/login-oauth-grant.ftl b/forms/src/main/resources/META-INF/resources/forms/login-oauth-grant.ftl
new file mode 100644
index 0000000..667109f
--- /dev/null
+++ b/forms/src/main/resources/META-INF/resources/forms/login-oauth-grant.ftl
@@ -0,0 +1 @@
+<#include "./theme/" + template.theme + "/login-oauth-grant.ftl">
\ No newline at end of file
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 88784e0..073ff39 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
@@ -294,6 +294,48 @@ a.zocial:before {
.rcue-login-register.reset .feedback {
left: 35.7em;
}
+
+.rcue-login-register.oauth .form-actions {
+ margin-bottom: 0;
+ margin-top: 2em;
+}
+
+.rcue-login-register .background-area .content-area {
+ width: 50em;
+}
+.rcue-login-register .background-area .content-area ul {
+ border-bottom: 1px solid #34393C;
+ margin-bottom: 2em;
+}
+.rcue-login-register .background-area .content-area ul li {
+ border-top: 1px solid #34393C;
+ padding: 2em;
+}
+.rcue-login-register .background-area .content-area ul li span:first-child {
+ font-size: 1.3em;
+}
+.rcue-login-register .background-area .content-area ul li span.icon-info {
+ float: right;
+ margin-top: 0.5em;
+}
+.rcue-login-register .background-area .content-area p.terms {
+ color: #999999;
+ font-size: 1.1em;
+ line-height: 1.3em;
+}
+
+.rcue-login-register .background-area p.instruction.instruction.second {
+ color: #999999;
+}
+.rcue-login-register .background-area p.instruction + .instruction.second {
+ margin-top: -1.23077em;
+}
+
+.rcue-login-register .background-area a.link-right {
+ float: right;
+ font-size: 1.3em;
+}
+
.rcue-login-register.reset .form-area {
background-image: none;
}
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/error.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/error.ftl
new file mode 100755
index 0000000..a7f1f5b
--- /dev/null
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/error.ftl
@@ -0,0 +1,24 @@
+<#-- TODO: Only a placeholder, implementation needed -->
+<#import "template-login-action.ftl" as layout>
+<@layout.registrationLayout bodyClass="reset"; section>
+ <#if section = "title">
+
+ We're sorry...
+
+ <#elseif section = "header">
+
+ We're <strong>sorry</strong> ...
+
+ <#elseif section = "form">
+
+ <p class="instruction">Something happened and we could not process your request.</p>
+ <p class="instruction second">Please make sure the URL you entered is correct.</p>
+ <a href="saas-login.html" class="link-right">Go to the homepage »</a>
+
+ <#elseif section = "info" >
+
+ <div id="info">
+ </div>
+
+ </#if>
+</@layout.registrationLayout>
\ No newline at end of file
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
index 24c4cce..863118e 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
@@ -24,6 +24,7 @@
</#list>
<div class="aside-btn">
+ <p>Forgot <a href="${url.passwordResetUrl}">Password</a>?</p>
</div>
<input class="btn-primary" type="submit" value="Log In"/>
@@ -36,8 +37,6 @@
<#if realm.registrationAllowed>
<p>${rb.getString('noAccount')} <a href="${url.registrationUrl}">${rb.getString('register')}</a>.</p>
</#if>
-
- <a href="${url.passwordResetUrl}">Reset password</a>
</div>
</#if>
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login-oauth-grant.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-oauth-grant.ftl
new file mode 100755
index 0000000..c115777
--- /dev/null
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login-oauth-grant.ftl
@@ -0,0 +1,36 @@
+<#-- TODO: Only a placeholder, implementation needed -->
+<#import "template-login-action.ftl" as layout>
+<@layout.registrationLayout bodyClass="reset oauth"; section>
+ <#if section = "title">
+
+ OAuth Grant
+
+ <#elseif section = "header">
+
+ <strong>Keycloak</strong> Central Login
+
+ <#elseif section = "form">
+ <div class="content-area">
+ <p class="instruction">This application requests access to:</p>
+ <ul>
+ <li>
+ <span>View basic information about your account</span>
+ </li>
+ <li>
+ <span>View your email address</span>
+ </li>
+ </ul>
+ <p class="terms">Keycloak Central Login and Google will use this information in accordance with their respective terms of service and privacy policies.</p>
+ <div class="form-actions">
+ <button class="primary" type="submit">Accept</button>
+ <button type="submit">Cancel</button>
+ </div>
+ </div>
+
+ <#elseif section = "info" >
+
+ <div id="info">
+ </div>
+
+ </#if>
+</@layout.registrationLayout>
\ No newline at end of file
diff --git a/forms/src/main/resources/org/keycloak/forms/messages.properties b/forms/src/main/resources/org/keycloak/forms/messages.properties
index 4ce9a69..ce6667a 100644
--- a/forms/src/main/resources/org/keycloak/forms/messages.properties
+++ b/forms/src/main/resources/org/keycloak/forms/messages.properties
@@ -1,7 +1,7 @@
logIn=Log in
logInTo=Log in to
logInWith=Log in with
-noAccount=No account?
+noAccount=New user?
register=Register
registerWith=Register with
allRequired=All fields are required
@@ -18,7 +18,7 @@ password=Password
passwordConfirm=Confirm Password
passwordNew=New Password
-authenticatorCode=Authenticator Code
+authenticatorCode=One-time-password
clientCertificate=Client Certificate
invalidUser=Invalid username or password
diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
index 7abbbdb..1d9c949 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
@@ -47,7 +47,7 @@ public class LoginPage extends Page {
@FindBy(linkText = "Register")
private WebElement registerLink;
- @FindBy(linkText = "Reset password")
+ @FindBy(linkText = "Password")
private WebElement resetPasswordLink;
@FindBy(id = "loginError")
