From 5ff965c7b74acbc99b9a0b6d1abb42563d9093c8 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Fri, 7 Feb 2014 17:23:13 +0000 Subject: [PATCH] Fixes to login forms --- .../main/resources/theme/login/base/error.ftl | 6 +- .../theme/login/base/login-config-totp.ftl | 24 +-- .../theme/login/base/login-update-profile.ftl | 7 - .../theme/login/base/login-verify-email.ftl | 2 +- .../main/resources/theme/login/base/login.ftl | 2 +- .../resources/theme/login/base/register.ftl | 2 +- .../resources/theme/login/base/template.ftl | 6 +- .../theme/login/rcue/resources/css/styles.css | 196 +++++++----------- .../login/rcue/resources/img/login-bkgrnd.png | Bin 0 -> 19546 bytes .../theme/login/rcue/theme.properties | 2 +- 10 files changed, 92 insertions(+), 155 deletions(-) create mode 100644 forms/common-themes/src/main/resources/theme/login/rcue/resources/img/login-bkgrnd.png diff --git a/forms/common-themes/src/main/resources/theme/login/base/error.ftl b/forms/common-themes/src/main/resources/theme/login/base/error.ftl index ca5a65dec1..3bdb322bcc 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/error.ftl +++ b/forms/common-themes/src/main/resources/theme/login/base/error.ftl @@ -1,6 +1,5 @@ -<#-- TODO: Only a placeholder, implementation needed --> <#import "template.ftl" as layout> -<@layout.registrationLayout; section> +<@layout.registrationLayout displayMessage=false; section> <#if section = "title"> ${rb.errorTitle} @@ -9,8 +8,7 @@ <#elseif section = "form">
-

${rb.errorGenericMsg}

-

${message.summary}

+

${message.summary}

\ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl index facbf26968..4a158d299d 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl +++ b/forms/common-themes/src/main/resources/theme/login/base/login-config-totp.ftl @@ -9,23 +9,23 @@ <#elseif section = "form">
  1. -

    1${rb.loginTotpStep1_1} ${rb.loginTotpStep1_2} ${rb.loginTotpStep1_3}

    +

    ${rb.loginTotpStep1_1} ${rb.loginTotpStep1_2} ${rb.loginTotpStep1_3}

    2. -
  2. -

    2${rb.loginTotpStep2}

    +
  3. +

    ${rb.loginTotpStep2}

    Figure: Barcode ${totp.totpSecretEncoded}
    4. -
  4. -

    3${rb.loginTotpStep3}

    -
    -
    - - -
    - -
    +
  5. +

    ${rb.loginTotpStep3}

+
+
+ + +
+ +
\ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl index ee77a9e2f6..cb1ed67b6e 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl +++ b/forms/common-themes/src/main/resources/theme/login/base/login-update-profile.ftl @@ -6,15 +6,8 @@ <#elseif section = "header"> ${rb.loginProfileTitle} - <#elseif section = "feedback"> -
-

${rb.loginProfileWarning}
${rb.loginProfileWarningFollow}

-
<#elseif section = "form">
-

All fields required

diff --git a/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl b/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl index e326e2a8cd..f687c6b5b7 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl +++ b/forms/common-themes/src/main/resources/theme/login/base/login-verify-email.ftl @@ -7,7 +7,7 @@ ${rb.emailVerifyTitle} <#elseif section = "form"> -
+

${rb.emailVerifyInstr}

diff --git a/forms/common-themes/src/main/resources/theme/login/base/login.ftl b/forms/common-themes/src/main/resources/theme/login/base/login.ftl index 1d769559db..87dbe95366 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/login.ftl +++ b/forms/common-themes/src/main/resources/theme/login/base/login.ftl @@ -9,7 +9,7 @@ <#elseif section = "form">
- +
diff --git a/forms/common-themes/src/main/resources/theme/login/base/register.ftl b/forms/common-themes/src/main/resources/theme/login/base/register.ftl index 2c8cc40ae1..63eef0b1fd 100755 --- a/forms/common-themes/src/main/resources/theme/login/base/register.ftl +++ b/forms/common-themes/src/main/resources/theme/login/base/register.ftl @@ -1,5 +1,5 @@ <#import "template.ftl" as layout> -<@layout.registrationLayout bodyClass="register" displaySeparator=true; section> +<@layout.registrationLayout displaySeparator=true; section> <#if section = "title"> ${rb.registerWith} ${realm.name} diff --git a/forms/common-themes/src/main/resources/theme/login/base/template.ftl b/forms/common-themes/src/main/resources/theme/login/base/template.ftl index e3d0e27726..88276f8431 100644 --- a/forms/common-themes/src/main/resources/theme/login/base/template.ftl +++ b/forms/common-themes/src/main/resources/theme/login/base/template.ftl @@ -1,4 +1,4 @@ -<#macro registrationLayout bodyClass="" displaySeparator=false displaySocial=false> +<#macro registrationLayout bodyClass="" displaySeparator=false displaySocial=false displayMessage=true> @@ -25,8 +25,8 @@
- <#if message?has_content> -