mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-29 11:20:42 +00:00
81fe5d6185
This improves a lot of accessibility shortcomings. Every possible instance of `<div class="button">` matching the command `ag '<[^ab].*?class=.*?[" ]button[ "]' templates/ | grep -v 'dropdown'` has been converted when possible. divs with the `dropdown` class and their children were omitted as 1. more analysis must be conducted whether the dropdowns still work as intended when they are a `button` instead of a `div`. 2. most dropdowns have `div`s as children. The HTML standard disallows `div`s inside `button`s. 3. When a dropdown child that's part of the displayed text content is converted to a `button`, the dropdown can be focused twice Further changes include that all "gitea-managed" buttons with JS code received an `e.preventDefault()` so that they don't accidentally submit an underlying form, which would execute instead of cancel the action. Lastly, some minor issues were fixed as well during the refactoring. ## Future improvements As mentioned in https://github.com/go-gitea/gitea/pull/23337#discussion_r1127277391, `<a>`s without `href` attribute are not focusable. They should later on be converted to `<button>`s. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
35 lines
1.5 KiB
Handlebars
35 lines
1.5 KiB
Handlebars
<h4 class="ui top attached header">
|
|
{{.locale.Tr "settings.twofa"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<p>{{.locale.Tr "settings.twofa_desc"}}</p>
|
|
{{if .TOTPEnrolled}}
|
|
<p>{{$.locale.Tr "settings.twofa_is_enrolled" | Str2html}}</p>
|
|
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/regenerate_scratch" method="post" enctype="multipart/form-data">
|
|
{{.CsrfTokenHtml}}
|
|
<p>{{.locale.Tr "settings.regenerate_scratch_token_desc"}}</p>
|
|
<button class="ui primary button">{{$.locale.Tr "settings.twofa_scratch_token_regenerate"}}</button>
|
|
</form>
|
|
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form">
|
|
{{.CsrfTokenHtml}}
|
|
<p>{{.locale.Tr "settings.twofa_disable_note"}}</p>
|
|
<button class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{$.locale.Tr "settings.twofa_disable"}}</button>
|
|
</form>
|
|
{{else}}
|
|
<p>{{.locale.Tr "settings.twofa_not_enrolled"}}</p>
|
|
<div class="inline field">
|
|
<a class="ui green button" href="{{AppSubUrl}}/user/settings/security/two_factor/enroll">{{$.locale.Tr "settings.twofa_enroll"}}</a>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
|
|
<div class="ui small basic delete modal" id="disable-twofa">
|
|
<div class="ui icon header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "settings.twofa_disable"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
|
|
</div>
|
|
{{template "base/delete_modal_actions" .}}
|
|
</div>
|