mirror of
https://github.com/zitadel/zitadel.git
synced 2025-10-27 18:19:38 +00:00
feat: Custom text login (#1925)
* feat: default custom message text * feat: org custom message text * feat: org custom message text * feat: custom messages query side * feat: default messages * feat: message text user fields * feat: check for inactive user * feat: fix send password reset * feat: fix custom org text * feat: add variables to docs * feat: custom text tests * feat: fix notifications * feat: add custom text feature * feat: add custom text feature * feat: feature in custom message texts * feat: add custom text feature in frontend * feat: merge main * feat: feature tests * feat: change phone message in setup * fix: remove unused code, add event translation * fix: merge main and fix problems * fix: english translation file * fix: migration versions * fix: setup * fix: custom login text * feat: add all possible custom texts for login * feat: iam login texts * feat: org login texts * feat: protos * fix: custom text in admin api * fix: add success login text * fix: docs * fix: add custom login texts to management api * fix: add sub messages to custom login texts * fix: setup custom texts * feat: get org login texts * feat: get org login texts * feat: handler in adminapi * feat: handlers in auth and admin * feat: render login texts * feat: custom login text * feat: add all login text keys * feat: handle correct login texts * feat: custom login texts in command side * feat: custom login texts in command side * feat: fix yaml file * feat: merge master and add confirmation text * feat: fix html * feat: read default login texts * feat: get default text files * feat: get custom texts org * feat: tests * feat: change translator handling * fix translator from authReq * feat: change h1 on login screens * feat: add custom login text for remove * feat: add custom login text for remove * feat: cache translation files * feat: cache translation files * feat: zitadel user in env var * feat: add registration user description * feat: better func naming * feat: tests * feat: add mutex to read file * feat: add mutex to read file * fix mutex for accessing translation map * fix: translation key Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
@@ -2,13 +2,13 @@
|
||||
|
||||
<div class="lgn-head">
|
||||
{{if .Linking}}
|
||||
<h1>{{t "UserSelection.TitleLinking"}}</h1>
|
||||
<p>{{t "UserSelection.DescriptionLinking"}}{{if .OrgName}}
|
||||
{{t "UserSelection.MustBeMemberOfOrg" "OrgName" .OrgName}}{{end}}</p>
|
||||
<h1>{{t "SelectAccount.TitleLinking"}}</h1>
|
||||
<p>{{t "SelectAccount.DescriptionLinking"}}{{if .OrgName}}
|
||||
{{t "SelectAccount.MustBeMemberOfOrg" "OrgName" .OrgName}}{{end}}</p>
|
||||
{{else}}
|
||||
<h1>{{t "UserSelection.Title"}}</h1>
|
||||
<p>{{t "UserSelection.Description"}}{{if .OrgName}}
|
||||
{{t "UserSelection.MustBeMemberOfOrg" "OrgName" .OrgName}}
|
||||
<h1>{{t "SelectAccount.Title"}}</h1>
|
||||
<p>{{t "SelectAccount.Description"}}{{if .OrgName}}
|
||||
{{t "SelectAccount.MustBeMemberOfOrg" "OrgName" .OrgName}}
|
||||
{{end}}
|
||||
</p>
|
||||
{{end}}
|
||||
@@ -25,7 +25,7 @@
|
||||
{{ if .Users }}
|
||||
{{ $displayLoginNameSuffix := and .OrgID (not .DisplayLoginNameSuffix)}}
|
||||
{{ range $user := .Users }}
|
||||
{{ $sessionState := (printf "UserSelection.SessionState%v" $user.UserSessionState) }}
|
||||
{{ $sessionState := (printf "SelectAccount.SessionState%v" $user.UserSessionState) }}
|
||||
<button type="submit" name="userID" value="{{$user.UserID}}" class="lgn-account"
|
||||
{{if not $user.SelectionPossible}}disabled title="{{t "Errors.User.NotAllowedOrg"}}"{{end}}>
|
||||
<div class="left">
|
||||
@@ -54,7 +54,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="lgn-names">
|
||||
<p>{{t "UserSelection.OtherUser"}}</p>
|
||||
<p>{{t "SelectAccount.OtherUser"}}</p>
|
||||
</div>
|
||||
<span class="fill-space"></span>
|
||||
<i class="lgn-icon-angle-right-solid"></i>
|
||||
|
||||
Reference in New Issue
Block a user