This commit is contained in:
@lukin 2021-09-06 18:40:00 +07:00
parent 5dad1e2c7f
commit 60792959f3
4 changed files with 142 additions and 123 deletions

View file

@ -1,20 +1,21 @@
<#import "template.ftl" as layout>
<#import "components/button/primary.ftl" as buttonPrimary>
<@layout.registrationLayout; section>
<#if section = "header">
${msg("confirmLinkIdpTitle")}
<#elseif section = "form">
<form action="${url.loginAction}" method="post" class="m-0 space-y-4">
<div>
<@buttonPrimary.kw type="submit" name="submitAction" id="updateProfile" value="updateProfile">
${msg("confirmLinkIdpReviewProfile")}
</@buttonPrimary.kw>
</div>
<div>
<@buttonPrimary.kw type="submit" name="submitAction" id="linkAccount" value="linkAccount">
${msg("confirmLinkIdpContinue", idpDisplayName)}
</@buttonPrimary.kw>
</div>
</form>
</#if>
<#if section="header">
${msg("confirmLinkIdpTitle")}
<#elseif section="form">
<form action="${url.loginAction}" class="m-0 space-y-4" method="post">
<div>
<@buttonPrimary.kw name="submitAction" type="submit" value="updateProfile">
${msg("confirmLinkIdpReviewProfile")}
</@buttonPrimary.kw>
</div>
<div>
<@buttonPrimary.kw name="submitAction" type="submit" value="linkAccount">
${msg("confirmLinkIdpContinue", idpDisplayName)}
</@buttonPrimary.kw>
</div>
</form>
</#if>
</@layout.registrationLayout>

View file

@ -1,42 +1,53 @@
<#import "template.ftl" as layout>
<#import "components/button/primary.ftl" as buttonPrimary>
<#import "components/input/primary.ftl" as inputPrimary>
<@layout.registrationLayout displayMessage=!messagesPerField.existsError('password','password-confirm'); section>
<#if section = "header">
${msg("updatePasswordTitle")}
<#elseif section = "form">
<form class="m-0 space-y-4" action="${url.loginAction}" method="post">
<input type="text" id="username" name="username" value="${username}" autocomplete="username"
readonly="readonly" style="display:none;"/>
<input type="password" id="password" name="password" autocomplete="current-password" style="display:none;"/>
<div>
<@inputPrimary.kw
autocomplete="new-password"
invalid=["password", "password-confirm"]
message=false
autofocus=true
name="password-new"
type="password"
>
${msg("passwordNew")}
</@inputPrimary.kw>
</div>
<div>
<@inputPrimary.kw
autocomplete="new-password"
invalid=["password-confirm"]
name="password-confirm"
type="password"
>
${msg("passwordConfirm")}
</@inputPrimary.kw>
</div>
<div>
<@buttonPrimary.kw type="submit">
${msg("doSubmit")}
</@buttonPrimary.kw>
</div>
</form>
</#if>
</@layout.registrationLayout>
<@layout.registrationLayout
displayMessage=!messagesPerField.existsError("password", "password-confirm")
;
section
>
<#if section="header">
${msg("updatePasswordTitle")}
<#elseif section="form">
<form action="${url.loginAction}" class="m-0 space-y-4" method="post">
<input
autocomplete="username"
name="username"
type="hidden"
value="${username}"
>
<input autocomplete="current-password" name="password" type="hidden">
<div>
<@inputPrimary.kw
autocomplete="new-password"
autofocus=true
invalid=["password", "password-confirm"]
message=false
name="password-new"
type="password"
>
${msg("passwordNew")}
</@inputPrimary.kw>
</div>
<div>
<@inputPrimary.kw
autocomplete="new-password"
invalid=["password-confirm"]
name="password-confirm"
type="password"
>
${msg("passwordConfirm")}
</@inputPrimary.kw>
</div>
<#-- TODO isAppInitiatedAction -->
<div>
<@buttonPrimary.kw type="submit">
${msg("doSubmit")}
</@buttonPrimary.kw>
</div>
</form>
</#if>
</@layout.registrationLayout>

View file

@ -1,64 +1,71 @@
<#import "template.ftl" as layout>
<#import "components/button/primary.ftl" as buttonPrimary>
<#import "components/input/primary.ftl" as inputPrimary>
<@layout.registrationLayout displayMessage=!messagesPerField.existsError('username','email','firstName','lastName'); section>
<#if section = "header">
${msg("loginProfileTitle")}
<#elseif section = "form">
<form class="m-0 space-y-4" action="${url.loginAction}" method="post">
<#if user.editUsernameAllowed>
<div>
<@inputPrimary.kw
autocomplete="username"
autofocus=true
invalid=["username"]
name="username"
type="text"
value=(user.username)!''
>
${msg("username")}
</@inputPrimary.kw>
</div>
</#if>
<div>
<@inputPrimary.kw
autocomplete="email"
invalid=["email"]
name="email"
type="email"
value=(user.email)!''
>
${msg("email")}
</@inputPrimary.kw>
</div>
<div>
<@inputPrimary.kw
autocomplete="given-name"
invalid=["firstName"]
name="firstName"
type="text"
value=(user.firstName)!''
>
${msg("firstName")}
</@inputPrimary.kw>
</div>
<div>
<@inputPrimary.kw
autocomplete="family-name"
invalid=["lastName"]
name="lastName"
type="text"
value=(user.lastName)!''
>
${msg("lastName")}
</@inputPrimary.kw>
</div>
<div>
<@buttonPrimary.kw type="submit">
${msg("doSubmit")}
</@buttonPrimary.kw>
</div>
</form>
</#if>
<@layout.registrationLayout
displayMessage=!messagesPerField.existsError("email", "firstName", "lastName", "username")
;
section
>
<#if section="header">
${msg("loginProfileTitle")}
<#elseif section="form">
<form action="${url.loginAction}" class="m-0 space-y-4" method="post">
<#if user.editUsernameAllowed>
<div>
<@inputPrimary.kw
autocomplete="username"
autofocus=true
invalid=["username"]
name="username"
type="text"
value=(user.username)!''
>
${msg("username")}
</@inputPrimary.kw>
</div>
</#if>
<div>
<@inputPrimary.kw
autocomplete="email"
invalid=["email"]
name="email"
type="email"
value=(user.email)!''
>
${msg("email")}
</@inputPrimary.kw>
</div>
<div>
<@inputPrimary.kw
autocomplete="given-name"
invalid=["firstName"]
name="firstName"
type="text"
value=(user.firstName)!''
>
${msg("firstName")}
</@inputPrimary.kw>
</div>
<div>
<@inputPrimary.kw
autocomplete="family-name"
invalid=["lastName"]
name="lastName"
type="text"
value=(user.lastName)!''
>
${msg("lastName")}
</@inputPrimary.kw>
</div>
<#-- TODO isAppInitiatedAction -->
<div>
<@buttonPrimary.kw type="submit">
${msg("doSubmit")}
</@buttonPrimary.kw>
</div>
</form>
</#if>
</@layout.registrationLayout>

View file

@ -51,16 +51,16 @@
</@inputPrimary.kw>
</div>
<div class="flex items-center justify-between">
<#if realm.rememberMe && !usernameEditDisabled??>
<@checkboxPrimary.kw checked=login.rememberMe?? name="rememberMe">
${msg("rememberMe")}
</@checkboxPrimary.kw>
</#if>
<#if realm.resetPasswordAllowed>
<@linkPrimary.kw href=url.loginResetCredentialsUrl>
<span class="text-sm">${msg("doForgotPassword")}</span>
</@linkPrimary.kw>
</#if>
<#if realm.rememberMe && !usernameEditDisabled??>
<@checkboxPrimary.kw checked=login.rememberMe?? name="rememberMe">
${msg("rememberMe")}
</@checkboxPrimary.kw>
</#if>
<#if realm.resetPasswordAllowed>
<@linkPrimary.kw href=url.loginResetCredentialsUrl>
<span class="text-sm">${msg("doForgotPassword")}</span>
</@linkPrimary.kw>
</#if>
</div>
<div class="pt-4">
<@buttonPrimary.kw name="login" type="submit">