TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-03-01 03:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add ids to buttons (#2186)

Browse Source 
* fix: add ids to buttons

* fix: add ids to buttons

* fix:  fix name

* fix: button fixes
This commit is contained in:
Fabi 2021-08-13 12:10:48 +02:00 committed by GitHub
parent cdfdc69341
commit 677836f6f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/ui/login/handler/external_login_handler.go
View File

@ -32,8 +32,8 @@ type externalIDPCallbackData struct {
} }
type externalNotFoundOptionFormData struct { type externalNotFoundOptionFormData struct {
Link bool `schema:"link"` Link bool `schema:"linkbutton"`
AutoRegister bool `schema:"autoregister"` AutoRegister bool `schema:"autoregisterbutton"`
ResetLinking bool `schema:"resetlinking"` ResetLinking bool `schema:"resetlinking"`
TermsConfirm bool `schema:"terms-confirm"` TermsConfirm bool `schema:"terms-confirm"`
} }

4
internal/ui/login/handler/renderer.go
View File

@ -188,8 +188,8 @@ func CreateRenderer(pathPrefix string, staticDir http.FileSystem, staticStorage
"changeUsernameUrl": func() string { "changeUsernameUrl": func() string {
return path.Join(r.pathPrefix, EndpointChangeUsername) return path.Join(r.pathPrefix, EndpointChangeUsername)
}, },
"externalNotFoundOptionUrl": func() string { "externalNotFoundOptionUrl": func(action string) string {
return path.Join(r.pathPrefix, EndpointExternalNotFoundOption) return path.Join(r.pathPrefix, EndpointExternalNotFoundOption+"?"+action+"=true")
}, },
"selectedLanguage": func(l string) bool { "selectedLanguage": func(l string) bool {
return false return false

13
internal/ui/login/static/resources/scripts/external_not_found_check.js
View File

@ -1,5 +1,10 @@
let button1 = document.getElementById("link-button"); let buttons1 = document.getElementsByName("linkbutton");
disableSubmit(undefined, button1);
let button2 = document.getElementById("auto-register-button"); for (let i = 0; i < buttons1.length; i++) {
disableSubmit(undefined, button2); disableSubmit(undefined, buttons1[i]);
}
let buttons2 = document.getElementsByName("autoregisterbutton");
for (let i = 0; i < buttons2.length; i++) {
disableSubmit(undefined, buttons2[i]);
}

14
internal/ui/login/static/templates/external_not_found_option.html
View File

@ -7,7 +7,7 @@
</div> </div>
<form action="{{ externalNotFoundOptionUrl }}" method="POST"> <form action="{{ externalNotFoundOptionUrl "none" }}" method="POST">
{{ .CSRF }} {{ .CSRF }}
@ -18,9 +18,9 @@
<div class="lgn-field"> <div class="lgn-field">
<label class="lgn-label">{{t "ExternalNotFoundOption.TosAndPrivacyLabel"}}</label> <label class="lgn-label">{{t "ExternalNotFoundOption.TosAndPrivacyLabel"}}</label>
<div class="lgn-checkbox"> <div class="lgn-checkbox">
<input type="checkbox" id="register-term-confirmation" <input type="checkbox" id="terms-confirm"
name="register-term-confirmation" required> name="terms-confirm" required>
<label for="register-term-confirmation"> <label for="terms-confirm">
{{t "ExternalNotFoundOption.TosConfirm"}} {{t "ExternalNotFoundOption.TosConfirm"}}
{{ if .TOSLink }} {{ if .TOSLink }}
<a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer"> <a class="tos-link" target="_blank" href="{{ .TOSLink }}" rel="noopener noreferrer">
@ -49,16 +49,14 @@
<i class="lgn-icon-arrow-left-solid"></i> <i class="lgn-icon-arrow-left-solid"></i>
</button> </button>
<button class="lgn-raised-button lgn-primary" name="link" value="true"> <button type="submit" formaction="{{ externalNotFoundOptionUrl "linkbutton"}}" class="lgn-raised-button lgn-primary" name="linkbutton" value="true">
{{t "ExternalNotFoundOption.LinkButtonText"}} {{t "ExternalNotFoundOption.LinkButtonText"}}
</button> </button>
<span class="fill-space"></span> <span class="fill-space"></span>
<button class="lgn-raised-button lgn-primary" name="autoregister" value="true"> <button type="submit" formaction="{{ externalNotFoundOptionUrl "autoregisterbutton"}}" class="lgn-raised-button lgn-primary" name="autoregisterbutton" value="true">
{{t "ExternalNotFoundOption.AutoRegisterButtonText"}} {{t "ExternalNotFoundOption.AutoRegisterButtonText"}}
</button> </button>
</div> </div>
{{template "error-message" .}}
</form> </form>
<script src="{{ resourceUrl "scripts/form_submit.js" }}"></script> <script src="{{ resourceUrl "scripts/form_submit.js" }}"></script>