summaryrefslogtreecommitdiffstats
path: root/templates/admin
diff options
context:
space:
mode:
authordelvh <leon@kske.dev>2023-03-14 04:34:09 +0100
committerGitHub <noreply@github.com>2023-03-14 11:34:09 +0800
commit81fe5d61851c0e586af7d32c29171ceff9a571bb (patch)
tree40ea13c9726cfca88a83800b323b428438cd90e9 /templates/admin
parent605fd15ad6eda19dba8f5e8a8f2e595e34e6c6ee (diff)
downloadgitea-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/admin')
-rw-r--r--templates/admin/auth/edit.tmpl2
-rw-r--r--templates/admin/emails/list.tmpl8
-rw-r--r--templates/admin/notice.tmpl18
-rw-r--r--templates/admin/repo/unadopted.tmpl22
-rw-r--r--templates/admin/user/edit.tmpl15
5 files changed, 17 insertions, 48 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index d64ee188af..c798be02ff 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -433,7 +433,7 @@
<div class="field">
<button class="ui green button">{{.locale.Tr "admin.auths.update"}}</button>
- <div class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{.locale.Tr "admin.auths.delete"}}</div>
+ <button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{.locale.Tr "admin.auths.delete"}}</button>
</div>
</form>
</div>
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 091f5011f9..d8fa986cff 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -78,7 +78,7 @@
{{.locale.Tr "admin.emails.change_email_header"}}
</div>
<div class="content center">
- <p>{{.locale.Tr "admin.emails.change_email_text"}}</p>
+ <p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
{{$.CsrfTokenHtml}}
@@ -93,11 +93,9 @@
<input type="hidden" id="form-primary" name="primary" value="" required>
<input type="hidden" id="form-activate" name="activate" value="" required>
- <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 class="center">
+ {{template "base/delete_modal_actions" .}}
</div>
-
</form>
</div>
</div>
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index a2c7ca2f6a..34bd83a214 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -23,7 +23,7 @@
<tr>
<td class="collapsing">
<div class="ui fitted checkbox" data-id="{{.ID}}">
- <input type="checkbox"> <label></label>
+ <input type="checkbox">
</div>
</td>
<td>{{.ID}}</td>
@@ -39,13 +39,11 @@
<tr>
<th></th>
<th colspan="5">
- <div class="ui right">
- <form method="post" action="{{AppSubUrl}}/admin/notices/empty">
- {{.CsrfTokenHtml}}
- <button type="submit" class="ui red small button">{{.locale.Tr "admin.notices.delete_all"}}</button>
- </form>
- </div>
- <div class="ui floating upward dropdown small button">
+ <form class="ui right" method="post" action="{{AppSubUrl}}/admin/notices/empty">
+ {{.CsrfTokenHtml}}
+ <button type="submit" class="ui red small button">{{.locale.Tr "admin.notices.delete_all"}}</button>
+ </form>
+ <div class="ui floating upward dropdown small button">{{/* TODO: Make this dropdown accessible */}}
<span class="text">{{.locale.Tr "admin.notices.operations"}}</span>
<div class="menu">
<div class="item select action" data-action="select-all">
@@ -59,9 +57,9 @@
</div>
</div>
</div>
- <div class="ui small teal button" id="delete-selection" data-link="{{.Link}}/delete" data-redirect="{{.Link}}?page={{.Page.Paginater.Current}}">
+ <button class="ui small teal button" id="delete-selection" data-link="{{.Link}}/delete" data-redirect="{{.Link}}?page={{.Page.Paginater.Current}}">
{{.locale.Tr "admin.notices.delete_selected"}}
- </div>
+ </button>
</th>
</tr>
</tfoot>
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 2629056d1d..7ff41d503a 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -43,16 +43,7 @@
<input type="hidden" name="action" value="adopt">
<input type="hidden" name="q" value="{{$.Keyword}}">
<input type="hidden" name="page" value="{{$.CurrentPage}}">
- <div class="actions">
- <div class="ui red basic inverted cancel button">
- {{svg "octicon-trash" 16 "gt-mr-2"}}
- {{$.locale.Tr "modal.no"}}
- </div>
- <button class="ui green basic inverted ok button">
- {{svg "octicon-check" 16 "gt-mr-2"}}
- {{$.locale.Tr "modal.yes"}}
- </button>
- </div>
+ {{template "base/delete_modal_actions" .}}
</form>
</div>
<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
@@ -70,16 +61,7 @@
<input type="hidden" name="action" value="delete">
<input type="hidden" name="q" value="{{$.Keyword}}">
<input type="hidden" name="page" value="{{$.CurrentPage}}">
- <div class="actions">
- <div class="ui red basic inverted cancel button">
- {{svg "octicon-trash" 16 "gt-mr-2"}}
- {{$.locale.Tr "modal.no"}}
- </div>
- <button class="ui green basic inverted ok button">
- {{svg "octicon-check" 16 "gt-mr-2"}}
- {{$.locale.Tr "modal.yes"}}
- </button>
- </div>
+ {{template "base/delete_modal_actions" .}}
</form>
</div>
</div>
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 5dd1f531fd..73017e1b13 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -151,7 +151,7 @@
<div class="field">
<button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button>
- <div class="ui red button show-modal" data-modal="#delete-user-modal">{{.locale.Tr "admin.users.delete_account"}}</div>
+ <button class="ui red button show-modal" data-modal="#delete-user-modal">{{.locale.Tr "admin.users.delete_account"}}</button>
</div>
</form>
</div>
@@ -189,7 +189,7 @@
<div class="field">
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
- <a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
+ <a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>{{/* TODO: Convert links without href to buttons for a11y */}}
</div>
</form>
</div>
@@ -213,16 +213,7 @@
</div>
<p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
</div>
- <div class="actions">
- <div class="ui red basic inverted cancel button">
- {{svg "octicon-x"}}
- {{.locale.Tr "modal.no"}}
- </div>
- <button class="ui green basic inverted ok button">
- {{svg "octicon-check"}}
- {{.locale.Tr "modal.yes"}}
- </button>
- </div>
+ {{template "base/delete_modal_actions" .}}
</form>
</div>
{{template "base/footer" .}}