TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-23 17:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: backend (#1481)

Browse Source 
* fix: check ids in proto

* fix sign out

* improve displayed login name after user selection

* fix init user in login

* fix init password in login

Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
This commit is contained in:
Livio Amstutz
2021-03-26 16:29:26 +01:00
committed by GitHub
parent 31b542015e
commit c0b37924c8
5 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/ui/login/static/templates/init_password.html
View File

@@ -36,15 +36,17 @@
{{ template "error-message" .}}
<button type="submit" name="resend" value="true" class="lgn-button lgn-primary block" formnovalidate>{{t "Actions.Resend" }}</button>
<div class="lgn-actions lgn-reverse-order">
<!-- position element in header -->
<a class="lgn-icon-button lgn-left-action" href="{{ loginUrl }}">
<i class="lgn-icon-arrow-left-solid"></i>
</a>
<button type="submit" id="init-button" name="resend" value="false"
class="lgn-raised-button lgn-primary">{{t "Actions.Next"}}</button>
<span class="fill-space"></span>
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
</a>
<button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "Actions.Resend" }}</button>
</div>
</form>

16
internal/ui/login/static/templates/init_user.html
View File

@@ -21,9 +21,6 @@
required>
</div>
<button class="lgn-button lgn-primary block" type="submit" name="resend" value="true"
formnovalidate>{{t "Actions.Resend" }}</button>
{{ if not .PasswordSet }}
<div class="field">
<label class="lgn-label" for="password">{{t "InitUser.NewPassword"}}</label>
@@ -43,13 +40,18 @@
{{ template "error-message" .}}
<div class="lgn-actions">
<a class="lgn-stroked-button lgn-primary" href="{{ loginUrl }}">
{{t "Actions.Cancel"}}
<div class="lgn-actions lgn-reverse-order">
<!-- position element in header -->
<a class="lgn-icon-button lgn-left-action" href="{{ loginUrl }}">
<i class="lgn-icon-arrow-left-solid"></i>
</a>
<span class="fill-space"></span>
<button type="submit" id="init-button" name="resend" value="false"
class="lgn-primary lgn-raised-button">{{t "Actions.Next"}}</button>
<span class="fill-space"></span>
<button type="submit" name="resend" value="true" class="lgn-stroked-button" formnovalidate>{{t "Actions.Resend" }}</button>
</div>
</form>