diff options
| author | delvh <leon@kske.dev> | 2023-03-14 04:34:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 11:34:09 +0800 |
| commit | 81fe5d61851c0e586af7d32c29171ceff9a571bb (patch) | |
| tree | 40ea13c9726cfca88a83800b323b428438cd90e9 /templates/repo/settings/options.tmpl | |
| parent | 605fd15ad6eda19dba8f5e8a8f2e595e34e6c6ee (diff) | |
| download | gitea-81fe5d61851c0e586af7d32c29171ceff9a571bb.tar.gz gitea-81fe5d61851c0e586af7d32c29171ceff9a571bb.zip | |
Convert `<div class="button">` to `<button class="button">` (#23337)
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>
Diffstat (limited to 'templates/repo/settings/options.tmpl')
| -rw-r--r-- | templates/repo/settings/options.tmpl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 030c77b881..be07aeb0ff 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -825,7 +825,7 @@ </div> <div class="text right actions"> - <div class="ui cancel button">{{.locale.Tr "settings.cancel"}}</div> + <button class="ui cancel button">{{.locale.Tr "settings.cancel"}}</button> <button class="ui red button">{{.locale.Tr "repo.settings.convert_confirm"}}</button> </div> </form> @@ -856,7 +856,7 @@ </div> <div class="text right actions"> - <div class="ui cancel button">{{.locale.Tr "settings.cancel"}}</div> + <button class="ui cancel button">{{.locale.Tr "settings.cancel"}}</button> <button class="ui red button">{{.locale.Tr "repo.settings.convert_fork_confirm"}}</button> </div> </form> @@ -892,7 +892,7 @@ </div> <div class="text right actions"> - <div class="ui cancel button">{{.locale.Tr "settings.cancel"}}</div> + <button class="ui cancel button">{{.locale.Tr "settings.cancel"}}</button> <button class="ui red button">{{.locale.Tr "repo.settings.transfer_perform"}}</button> </div> </form> @@ -926,7 +926,7 @@ </div> <div class="text right actions"> - <div class="ui cancel button">{{.locale.Tr "settings.cancel"}}</div> + <button class="ui cancel button">{{.locale.Tr "settings.cancel"}}</button> <button class="ui red button">{{.locale.Tr "repo.settings.confirm_delete"}}</button> </div> </form> @@ -958,7 +958,7 @@ </div> <div class="text right actions"> - <div class="ui cancel button">{{.locale.Tr "settings.cancel"}}</div> + <button class="ui cancel button">{{.locale.Tr "settings.cancel"}}</button> <button class="ui red button">{{.locale.Tr "repo.settings.confirm_wiki_delete"}}</button> </div> </form> @@ -988,10 +988,7 @@ {{.CsrfTokenHtml}} <input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}"> <input type="hidden" name="repo_id" value="{{.Repository.ID}}"> - <div class="center actions"> - <div class="ui basic cancel inverted button">{{.locale.Tr "settings.cancel"}}</div> - <button class="ui basic inverted yellow button">{{.locale.Tr "modal.yes"}}</button> - </div> + {{template "base/delete_modal_actions" .}} </form> </div> {{end}} |