mirror of
https://github.com/lukin/keywind.git
synced 2025-01-10 18:06:23 +00:00
Prettier
This commit is contained in:
parent
5dad1e2c7f
commit
60792959f3
4 changed files with 142 additions and 123 deletions
|
@ -1,17 +1,18 @@
|
||||||
<#import "template.ftl" as layout>
|
<#import "template.ftl" as layout>
|
||||||
<#import "components/button/primary.ftl" as buttonPrimary>
|
<#import "components/button/primary.ftl" as buttonPrimary>
|
||||||
|
|
||||||
<@layout.registrationLayout; section>
|
<@layout.registrationLayout; section>
|
||||||
<#if section = "header">
|
<#if section="header">
|
||||||
${msg("confirmLinkIdpTitle")}
|
${msg("confirmLinkIdpTitle")}
|
||||||
<#elseif section = "form">
|
<#elseif section="form">
|
||||||
<form action="${url.loginAction}" method="post" class="m-0 space-y-4">
|
<form action="${url.loginAction}" class="m-0 space-y-4" method="post">
|
||||||
<div>
|
<div>
|
||||||
<@buttonPrimary.kw type="submit" name="submitAction" id="updateProfile" value="updateProfile">
|
<@buttonPrimary.kw name="submitAction" type="submit" value="updateProfile">
|
||||||
${msg("confirmLinkIdpReviewProfile")}
|
${msg("confirmLinkIdpReviewProfile")}
|
||||||
</@buttonPrimary.kw>
|
</@buttonPrimary.kw>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<@buttonPrimary.kw type="submit" name="submitAction" id="linkAccount" value="linkAccount">
|
<@buttonPrimary.kw name="submitAction" type="submit" value="linkAccount">
|
||||||
${msg("confirmLinkIdpContinue", idpDisplayName)}
|
${msg("confirmLinkIdpContinue", idpDisplayName)}
|
||||||
</@buttonPrimary.kw>
|
</@buttonPrimary.kw>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,21 +1,29 @@
|
||||||
<#import "template.ftl" as layout>
|
<#import "template.ftl" as layout>
|
||||||
<#import "components/button/primary.ftl" as buttonPrimary>
|
<#import "components/button/primary.ftl" as buttonPrimary>
|
||||||
<#import "components/input/primary.ftl" as inputPrimary>
|
<#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;"/>
|
|
||||||
|
|
||||||
|
<@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>
|
<div>
|
||||||
<@inputPrimary.kw
|
<@inputPrimary.kw
|
||||||
autocomplete="new-password"
|
autocomplete="new-password"
|
||||||
|
autofocus=true
|
||||||
invalid=["password", "password-confirm"]
|
invalid=["password", "password-confirm"]
|
||||||
message=false
|
message=false
|
||||||
autofocus=true
|
|
||||||
name="password-new"
|
name="password-new"
|
||||||
type="password"
|
type="password"
|
||||||
>
|
>
|
||||||
|
@ -32,6 +40,9 @@
|
||||||
${msg("passwordConfirm")}
|
${msg("passwordConfirm")}
|
||||||
</@inputPrimary.kw>
|
</@inputPrimary.kw>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<#-- TODO isAppInitiatedAction -->
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<@buttonPrimary.kw type="submit">
|
<@buttonPrimary.kw type="submit">
|
||||||
${msg("doSubmit")}
|
${msg("doSubmit")}
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
<#import "template.ftl" as layout>
|
<#import "template.ftl" as layout>
|
||||||
<#import "components/button/primary.ftl" as buttonPrimary>
|
<#import "components/button/primary.ftl" as buttonPrimary>
|
||||||
<#import "components/input/primary.ftl" as inputPrimary>
|
<#import "components/input/primary.ftl" as inputPrimary>
|
||||||
<@layout.registrationLayout displayMessage=!messagesPerField.existsError('username','email','firstName','lastName'); section>
|
|
||||||
<#if section = "header">
|
<@layout.registrationLayout
|
||||||
|
displayMessage=!messagesPerField.existsError("email", "firstName", "lastName", "username")
|
||||||
|
;
|
||||||
|
section
|
||||||
|
>
|
||||||
|
<#if section="header">
|
||||||
${msg("loginProfileTitle")}
|
${msg("loginProfileTitle")}
|
||||||
<#elseif section = "form">
|
<#elseif section="form">
|
||||||
<form class="m-0 space-y-4" action="${url.loginAction}" method="post">
|
<form action="${url.loginAction}" class="m-0 space-y-4" method="post">
|
||||||
<#if user.editUsernameAllowed>
|
<#if user.editUsernameAllowed>
|
||||||
<div>
|
<div>
|
||||||
<@inputPrimary.kw
|
<@inputPrimary.kw
|
||||||
|
@ -54,6 +59,8 @@
|
||||||
</@inputPrimary.kw>
|
</@inputPrimary.kw>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<#-- TODO isAppInitiatedAction -->
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<@buttonPrimary.kw type="submit">
|
<@buttonPrimary.kw type="submit">
|
||||||
${msg("doSubmit")}
|
${msg("doSubmit")}
|
||||||
|
|
Loading…
Reference in a new issue