troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-23 19:11:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Convert <div class="button"> to <button class="button"> (#23337)

Browse source 
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>
This commit is contained in:
delvh 2023-03-14 04:34:09 +01:00 committed by GitHub
parent 605fd15ad6
commit 81fe5d6185
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 173 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/img/svg/fontawesome-save.svg Normal file
View file

@ -0,0 +1 @@
<svg viewBox="0 0 448 512" class="svg fontawesome-save" width="16" height="16" aria-hidden="true"><path d="m434 130-84-84a48 48 0 0 0-33.9-14H48A48 48 0 0 0 0 80v352a48 48 0 0 0 48 48h352a48 48 0 0 0 48-48V163.9a48 48 0 0 0-14-34zM224 416a64 64 0 1 1 0-128 64 64 0 0 1 0 128zm96-304.5V212a12 12 0 0 1-12 12H76a12 12 0 0 1-12-12V108a12 12 0 0 1 12-12h228.5a12 12 0 0 1 8.5 3.5l3.5 3.5a12 12 0 0 1 3.5 8.5z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 413 B

2
templates/admin/auth/edit.tmpl
View file

@ -433,7 +433,7 @@
<div class="field"> <div class="field">
<button class="ui green button">{{.locale.Tr "admin.auths.update"}}</button> <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> </div>
</form> </form>
</div> </div>

8
templates/admin/emails/list.tmpl
View file

@ -78,7 +78,7 @@
{{.locale.Tr "admin.emails.change_email_header"}} {{.locale.Tr "admin.emails.change_email_header"}}
</div> </div>
<div class="content center"> <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"> <form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
@ -93,11 +93,9 @@
<input type="hidden" id="form-primary" name="primary" value="" required> <input type="hidden" id="form-primary" name="primary" value="" required>
<input type="hidden" id="form-activate" name="activate" value="" required> <input type="hidden" id="form-activate" name="activate" value="" required>
<div class="center actions"> <div class="center">
<div class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</div> {{template "base/delete_modal_actions" .}}
<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
</div> </div>
</form> </form>
</div> </div>
</div> </div>

18
templates/admin/notice.tmpl
View file

@ -23,7 +23,7 @@
<tr> <tr>
<td class="collapsing"> <td class="collapsing">
<div class="ui fitted checkbox" data-id="{{.ID}}"> <div class="ui fitted checkbox" data-id="{{.ID}}">
<input type="checkbox"> <label></label> <input type="checkbox">
</div> </div>
</td> </td>
<td>{{.ID}}</td> <td>{{.ID}}</td>
@ -39,13 +39,11 @@
<tr> <tr>
<th></th> <th></th>
<th colspan="5"> <th colspan="5">
<div class="ui right"> <form class="ui right" method="post" action="{{AppSubUrl}}/admin/notices/empty">
<form method="post" action="{{AppSubUrl}}/admin/notices/empty"> {{.CsrfTokenHtml}}
{{.CsrfTokenHtml}} <button type="submit" class="ui red small button">{{.locale.Tr "admin.notices.delete_all"}}</button>
<button type="submit" class="ui red small button">{{.locale.Tr "admin.notices.delete_all"}}</button> </form>
</form> <div class="ui floating upward dropdown small button">{{/* TODO: Make this dropdown accessible */}}
</div>
<div class="ui floating upward dropdown small button">
<span class="text">{{.locale.Tr "admin.notices.operations"}}</span> <span class="text">{{.locale.Tr "admin.notices.operations"}}</span>
<div class="menu"> <div class="menu">
<div class="item select action" data-action="select-all"> <div class="item select action" data-action="select-all">
@ -59,9 +57,9 @@
</div> </div>
</div> </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"}} {{.locale.Tr "admin.notices.delete_selected"}}
</div> </button>
</th> </th>
</tr> </tr>
</tfoot> </tfoot>

22
templates/admin/repo/unadopted.tmpl
View file

@ -43,16 +43,7 @@
<input type="hidden" name="action" value="adopt"> <input type="hidden" name="action" value="adopt">
<input type="hidden" name="q" value="{{$.Keyword}}"> <input type="hidden" name="q" value="{{$.Keyword}}">
<input type="hidden" name="page" value="{{$.CurrentPage}}"> <input type="hidden" name="page" value="{{$.CurrentPage}}">
<div class="actions"> {{template "base/delete_modal_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>
</form> </form>
</div> </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> <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="action" value="delete">
<input type="hidden" name="q" value="{{$.Keyword}}"> <input type="hidden" name="q" value="{{$.Keyword}}">
<input type="hidden" name="page" value="{{$.CurrentPage}}"> <input type="hidden" name="page" value="{{$.CurrentPage}}">
<div class="actions"> {{template "base/delete_modal_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>
</form> </form>
</div> </div>
</div> </div>

15
templates/admin/user/edit.tmpl
View file

@ -151,7 +151,7 @@
<div class="field"> <div class="field">
<button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button> <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> </div>
</form> </form>
</div> </div>
@ -189,7 +189,7 @@
<div class="field"> <div class="field">
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button> <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> </div>
</form> </form>
</div> </div>
@ -213,16 +213,7 @@
</div> </div>
<p class="help">{{.locale.Tr "admin.users.purge_help"}}</p> <p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_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>
</form> </form>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

8
templates/base/delete_modal_actions.tmpl
View file

@ -1,10 +1,10 @@
<div class="actions"> <div class="actions">
<div class="ui red basic inverted cancel button"> <button class="ui red basic inverted cancel button">
{{svg "octicon-x"}} {{svg "octicon-x"}}
{{.locale.Tr "modal.no"}} {{.locale.Tr "modal.no"}}
</div> </button>
<div class="ui green basic inverted ok button"> <button class="ui green basic inverted ok button">
{{svg "octicon-check"}} {{svg "octicon-check"}}
{{.locale.Tr "modal.yes"}} {{.locale.Tr "modal.yes"}}
</div> </button>
</div> </div>

4
templates/org/settings/delete.tmpl
View file

@ -19,9 +19,9 @@
<label for="org_name">{{.locale.Tr "org.org_name_holder"}}</label> <label for="org_name">{{.locale.Tr "org.org_name_holder"}}</label>
<input id="org_name" name="org_name" value="" autocomplete="off" autofocus required> <input id="org_name" name="org_name" value="" autocomplete="off" autofocus required>
</div> </div>
<div class="ui red button delete-button" data-type="form" data-form="#delete-form"> <button class="ui red button delete-button" data-type="form" data-form="#delete-form">
{{.locale.Tr "org.settings.confirm_delete_account"}} {{.locale.Tr "org.settings.confirm_delete_account"}}
</div> </button>
</form> </form>
</div> </div>
</div> </div>

2
templates/org/settings/labels.tmpl
View file

@ -11,7 +11,7 @@
</div> </div>
<div class="right floated three wide column"> <div class="right floated three wide column">
<div class="ui right"> <div class="ui right">
<div class="ui green new-label button">{{.locale.Tr "repo.issues.new_label"}}</div> <button class="ui green new-label button">{{.locale.Tr "repo.issues.new_label"}}</button>
</div> </div>
</div> </div>
</div> </div>

5
templates/package/settings.tmpl
View file

@ -57,10 +57,7 @@
<form class="ui form" action="{{.Link}}" method="post"> <form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="action" value="delete"> <input type="hidden" name="action" value="delete">
<div class="text right actions"> {{template "base/delete_modal_actions" .}}
<div class="ui cancel button">{{.locale.Tr "cancel"}}</div>
<button class="ui red button">{{.locale.Tr "ok"}}</button>
</div>
</form> </form>
</div> </div>
</div> </div>

11
templates/projects/list.tmpl
View file

@ -84,15 +84,6 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p> <p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.locale.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.locale.Tr "modal.yes"}}
</div>
</div>
</div> </div>
{{end}} {{end}}

21
templates/projects/view.tmpl
View file

@ -29,7 +29,7 @@
</div> </div>
<div class="text right actions"> <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 data-url="{{$.Link}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button> <button data-url="{{$.Link}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button>
</div> </div>
</form> </form>
@ -127,7 +127,7 @@
</div> </div>
<div class="text right actions"> <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 data-url="{{$.Link}}/{{.ID}}" class="ui primary button edit-column-button">{{$.locale.Tr "repo.projects.column.edit"}}</button> <button data-url="{{$.Link}}/{{.ID}}" class="ui primary button edit-column-button">{{$.locale.Tr "repo.projects.column.edit"}}</button>
</div> </div>
</form> </form>
@ -144,7 +144,7 @@
</label> </label>
</div> </div>
<div class="text right actions"> <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 primary button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button> <button class="ui primary button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
</div> </div>
</div> </div>
@ -158,8 +158,8 @@
{{$.locale.Tr "repo.projects.column.deletion_desc"}} {{$.locale.Tr "repo.projects.column.deletion_desc"}}
</label> </label>
</div> </div>
<div class="text right actions"> <div class="text right actions">{{/* TODO: convert to base/delete_modal_actions.tmpl */}}
<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 delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button> <button class="ui red button delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
</div> </div>
</div> </div>
@ -265,15 +265,6 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p> <p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.locale.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.locale.Tr "modal.yes"}}
</div>
</div>
</div> </div>
{{end}} {{end}}

2
templates/repo/branch/list.tmpl
View file

@ -176,7 +176,7 @@
</div> </div>
<div class="text right actions"> <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 green button">{{.locale.Tr "repo.branch.confirm_create_branch"}}</button> <button class="ui green button">{{.locale.Tr "repo.branch.confirm_create_branch"}}</button>
</div> </div>
</form> </form>

4
templates/repo/cite/cite_modal.tmpl
View file

@ -15,8 +15,8 @@
</div> </div>
</div> </div>
<div class="actions"> <div class="actions">
<div class="ui black deny button"> <button class="ui black cancel button">
{{.locale.Tr "cancel"}} {{.locale.Tr "cancel"}}
</div> </button>
</div> </div>
</div> </div>

4
templates/repo/commit_page.tmpl
View file

@ -96,7 +96,7 @@
</div> </div>
<div class="text right actions"> <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 green button">{{.locale.Tr "repo.branch.confirm_create_branch"}}</button> <button class="ui green button">{{.locale.Tr "repo.branch.confirm_create_branch"}}</button>
</div> </div>
</form> </form>
@ -121,7 +121,7 @@
</div> </div>
<div class="text right actions"> <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 green button">{{.locale.Tr "repo.tag.confirm_create_tag"}}</button> <button class="ui green button">{{.locale.Tr "repo.tag.confirm_create_tag"}}</button>
</div> </div>
</form> </form>

8
templates/repo/diff/box.tmpl
View file

@ -107,8 +107,8 @@
<div class="diff-file-header-actions gt-df gt-ac"> <div class="diff-file-header-actions gt-df gt-ac">
{{if $showFileViewToggle}} {{if $showFileViewToggle}}
<div class="ui compact icon buttons"> <div class="ui compact icon buttons">
<span class="ui tiny basic button tooltip file-view-toggle" data-toggle-selector="#diff-source-{{$file.NameHash}}" data-content="{{$.locale.Tr "repo.file_view_source"}}" data-position="bottom center">{{svg "octicon-code"}}</span> <button class="ui tiny basic button tooltip file-view-toggle" data-toggle-selector="#diff-source-{{$file.NameHash}}" data-content="{{$.locale.Tr "repo.file_view_source"}}" data-position="bottom center">{{svg "octicon-code"}}</button>
<span class="ui tiny basic button tooltip file-view-toggle active" data-toggle-selector="#diff-rendered-{{$file.NameHash}}" data-content="{{$.locale.Tr "repo.file_view_rendered"}}" data-position="bottom center">{{svg "octicon-file"}}</span> <button class="ui tiny basic button tooltip file-view-toggle active" data-toggle-selector="#diff-rendered-{{$file.NameHash}}" data-content="{{$.locale.Tr "repo.file_view_rendered"}}" data-position="bottom center">{{svg "octicon-file"}}</button>
</div> </div>
{{end}} {{end}}
{{if $file.IsProtected}} {{if $file.IsProtected}}
@ -200,8 +200,8 @@
{{$.locale.Tr "loading"}} {{$.locale.Tr "loading"}}
</div> </div>
<div class="text right edit buttons"> <div class="text right edit buttons">
<div class="ui basic primary cancel button" tabindex="3">{{.locale.Tr "repo.issues.cancel"}}</div> <button class="ui basic primary cancel button" tabindex="3">{{.locale.Tr "repo.issues.cancel"}}</button>
<div class="ui green save button" tabindex="2">{{.locale.Tr "repo.issues.save"}}</div> <button class="ui green save button" tabindex="2">{{.locale.Tr "repo.issues.save"}}</button>
</div> </div>
</div> </div>
</div> </div>

8
templates/repo/editor/edit.tmpl
View file

@ -65,14 +65,14 @@
<p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p> <p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p>
</div> </div>
<div class="actions"> <div class="actions">
<div class="ui red basic cancel inverted button"> <button class="ui red basic cancel inverted button">
<i class="remove icon"></i> <i class="remove icon"></i>
{{.locale.Tr "repo.editor.cancel"}} {{.locale.Tr "repo.editor.cancel"}}
</div> </button>
<div class="ui green basic ok inverted button"> <button class="ui green basic ok inverted button">
<i class="save icon"></i> <i class="save icon"></i>
{{.locale.Tr "repo.editor.commit_changes"}} {{.locale.Tr "repo.editor.commit_changes"}}
</div> </button>
</div> </div>
</div> </div>

12
templates/repo/editor/patch.tmpl
View file

@ -45,14 +45,14 @@
<p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p> <p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p>
</div> </div>
<div class="actions"> <div class="actions">
<div class="ui red basic cancel inverted button"> <button class="ui red basic inverted cancel button">
<i class="remove icon"></i> {{svg "octicon-x"}}
{{.locale.Tr "repo.editor.cancel"}} {{.locale.Tr "repo.editor.cancel"}}
</div> </button>
<div class="ui green basic ok inverted button"> <button class="ui green basic inverted ok button">
<i class="save icon"></i> {{svg "fontawesome-save"}}
{{.locale.Tr "repo.editor.commit_changes"}} {{.locale.Tr "repo.editor.commit_changes"}}
</div> </button>
</div> </div>
</div> </div>
</div> </div>

2
templates/repo/issue/labels.tmpl
View file

@ -6,7 +6,7 @@
{{template "repo/issue/navbar" .}} {{template "repo/issue/navbar" .}}
{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
<div class="ui right"> <div class="ui right">
<div class="ui green new-label button">{{.locale.Tr "repo.issues.new_label"}}</div> <button class="ui green new-label button">{{.locale.Tr "repo.issues.new_label"}}</button>
</div> </div>
{{end}} {{end}}
</div> </div>

21
templates/repo/issue/labels/edit_delete_label.tmpl
View file

@ -6,16 +6,7 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "repo.issues.label_deletion_desc"}}</p> <p>{{.locale.Tr "repo.issues.label_deletion_desc"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.locale.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.locale.Tr "modal.yes"}}
</div>
</div>
</div> </div>
<div class="ui small edit-label modal"> <div class="ui small edit-label modal">
@ -61,11 +52,13 @@
</form> </form>
</div> </div>
<div class="actions"> <div class="actions">
<div class="ui secondary small basic cancel button"> <button class="ui secondary small basic cancel button">
{{svg "octicon-x"}}
{{.locale.Tr "cancel"}} {{.locale.Tr "cancel"}}
</div> </button>
<div class="ui primary small approve button"> <button class="ui primary small approve button">
<i class="save icon"></i>
{{.locale.Tr "save"}} {{.locale.Tr "save"}}
</div> </button>
</div> </div>
</div> </div>

11
templates/repo/issue/labels/label_new.tmpl
View file

@ -36,12 +36,15 @@
</div> </div>
</form> </form>
</div> </div>
<div class="actions"> <div class="actions">
<div class="ui secondary small basic cancel button"> <button class="ui red basic inverted cancel button">
{{svg "octicon-x"}}
{{.locale.Tr "cancel"}} {{.locale.Tr "cancel"}}
</div> </button>
<div class="ui primary small approve button"> <button class="ui green basic inverted ok button">
{{svg "octicon-check"}}
{{.locale.Tr "repo.issues.create_label"}} {{.locale.Tr "repo.issues.create_label"}}
</div> </button>
</div> </div>
</div> </div>

4
templates/repo/issue/list.tmpl
View file

@ -213,9 +213,9 @@
{{if not .Repository.IsArchived}} {{if not .Repository.IsArchived}}
<!-- Action Button --> <!-- Action Button -->
{{if .IsShowClosed}} {{if .IsShowClosed}}
<div class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_open"}}</div> <button class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_open"}}</button>
{{else}} {{else}}
<div class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_close"}}</div> <button class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_close"}}</button>
{{end}} {{end}}
<!-- Labels --> <!-- Labels -->
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item"> <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item">

4
templates/repo/issue/milestone_issues.tmpl
View file

@ -149,9 +149,9 @@
<div class="ui secondary filter stackable menu"> <div class="ui secondary filter stackable menu">
<!-- Action Button --> <!-- Action Button -->
{{if .IsShowClosed}} {{if .IsShowClosed}}
<div class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_open"}}</div> <button class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_open"}}</button>
{{else}} {{else}}
<div class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_close"}}</div> <button class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_close"}}</button>
{{end}} {{end}}
<!-- Labels --> <!-- Labels -->
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item"> <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item">

11
templates/repo/issue/milestones.tmpl
View file

@ -124,16 +124,7 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "repo.milestones.deletion_desc"}}</p> <p>{{.locale.Tr "repo.milestones.deletion_desc"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.locale.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.locale.Tr "modal.yes"}}
</div>
</div>
</div> </div>
{{end}} {{end}}
{{template "base/footer" .}} {{template "base/footer" .}}

20
templates/repo/issue/view_content.tmpl
View file

@ -112,13 +112,13 @@
<div class="text right"> <div class="text right">
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}}
{{if .Issue.IsClosed}} {{if .Issue.IsClosed}}
<div id="status-button" class="ui green basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen"> <button id="status-button" class="ui green basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen">
{{.locale.Tr "repo.issues.reopen_issue"}} {{.locale.Tr "repo.issues.reopen_issue"}}
</div> </button>
{{else}} {{else}}
<div id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close"> <button id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
{{.locale.Tr "repo.issues.close_issue"}} {{.locale.Tr "repo.issues.close_issue"}}
</div> </button>
{{end}} {{end}}
{{end}} {{end}}
<button class="ui green button loading-button" tabindex="5"> <button class="ui green button loading-button" tabindex="5">
@ -163,13 +163,13 @@
<div class="text right"> <div class="text right">
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}}
{{if .Issue.IsClosed}} {{if .Issue.IsClosed}}
<div id="status-button" class="ui green basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen"> <button id="status-button" class="ui green basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen">
{{.locale.Tr "repo.issues.reopen_issue"}} {{.locale.Tr "repo.issues.reopen_issue"}}
</div> </button>
{{else}} {{else}}
<div id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close"> <button id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.close_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
{{.locale.Tr "repo.issues.close_issue"}} {{.locale.Tr "repo.issues.close_issue"}}
</div> </button>
{{end}} {{end}}
{{end}} {{end}}
<button class="ui green button loading-button" tabindex="5"> <button class="ui green button loading-button" tabindex="5">
@ -215,8 +215,8 @@
{{end}} {{end}}
<div class="field footer"> <div class="field footer">
<div class="text right edit"> <div class="text right edit">
<div class="ui basic secondary cancel button" tabindex="3">{{.locale.Tr "repo.issues.cancel"}}</div> <button class="ui basic secondary cancel button" tabindex="3">{{.locale.Tr "repo.issues.cancel"}}</button>
<div class="ui primary save button" tabindex="2">{{.locale.Tr "repo.issues.save"}}</div> <button class="ui primary save button" tabindex="2">{{.locale.Tr "repo.issues.save"}}</button>
</div> </div>
</div> </div>
</div> </div>

5
templates/repo/issue/view_content/comments_delete_time.tmpl
View file

@ -7,10 +7,7 @@
{{.ctxData.CsrfTokenHtml}} {{.ctxData.CsrfTokenHtml}}
</form> </form>
<div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div> <div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red approve button">{{.ctxData.locale.Tr "repo.issues.context.delete"}}</div>
<div class="ui cancel button">{{.ctxData.locale.Tr "repo.issues.add_time_cancel"}}</div>
</div>
</div> </div>
<button class="ui icon button compact mini issue-delete-time tooltip" data-id="{{.comment.Time.ID}}" data-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}" data-position="top right"> <button class="ui icon button compact mini issue-delete-time tooltip" data-id="{{.comment.Time.ID}}" data-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}" data-position="top right">
{{svg "octicon-trash"}} {{svg "octicon-trash"}}

2
templates/repo/issue/view_content/pull.tmpl
View file

@ -58,7 +58,7 @@
<input id="message" name="message"> <input id="message" name="message">
</div> </div>
<div class="text right actions"> <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" type="submit">{{$.locale.Tr "ok"}}</button> <button class="ui red button" type="submit">{{$.locale.Tr "ok"}}</button>
</div> </div>
</form> </form>

16
templates/repo/issue/view_content/sidebar.tmpl
View file

@ -346,8 +346,8 @@
</form> </form>
</div> </div>
<div class="actions"> <div class="actions">
<div class="ui green approve button">{{.locale.Tr "repo.issues.add_time_short"}}</div> <button class="ui green approve button">{{.locale.Tr "repo.issues.add_time_short"}}</button>
<div class="ui red cancel button">{{.locale.Tr "repo.issues.add_time_cancel"}}</div> <button class="ui red cancel button">{{.locale.Tr "repo.issues.add_time_cancel"}}</button>
</div> </div>
</div> </div>
<button class="ui fluid button green tooltip issue-add-time gt-mt-3" data-content='{{.locale.Tr "repo.issues.add_time"}}' data-position="top center">{{.locale.Tr "repo.issues.add_time_short"}}</button> <button class="ui fluid button green tooltip issue-add-time gt-mt-3" data-content='{{.locale.Tr "repo.issues.add_time"}}' data-position="top center">{{.locale.Tr "repo.issues.add_time_short"}}</button>
@ -532,14 +532,14 @@
{{end}}</p> {{end}}</p>
</div> </div>
<div class="actions"> <div class="actions">
<div class="ui red cancel inverted button"> <button class="ui red cancel inverted button">
{{svg "octicon-x"}} {{svg "octicon-x"}}
{{.locale.Tr "repo.issues.dependency.cancel"}} {{.locale.Tr "repo.issues.dependency.cancel"}}
</div> </button>
<div class="ui green ok inverted button"> <button class="ui green ok inverted button">
{{svg "octicon-check"}} {{svg "octicon-check"}}
{{.locale.Tr "repo.issues.dependency.remove"}} {{.locale.Tr "repo.issues.dependency.remove"}}
</div> </button>
</div> </div>
</div> </div>
{{end}} {{end}}
@ -619,7 +619,7 @@
{{end}} {{end}}
<div class="text right actions"> <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"> <button class="ui red button">
{{if .Issue.IsLocked}} {{if .Issue.IsLocked}}
{{.locale.Tr "repo.issues.unlock_confirm"}} {{.locale.Tr "repo.issues.unlock_confirm"}}
@ -655,7 +655,7 @@
<form action="{{.Issue.Link}}/delete" method="post"> <form action="{{.Issue.Link}}/delete" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="center actions"> <div class="center actions">
<div class="ui basic cancel inverted button">{{.locale.Tr "settings.cancel"}}</div> <button class="ui basic cancel inverted button">{{.locale.Tr "settings.cancel"}}</button>
<button class="ui basic red inverted button">{{.locale.Tr "modal.yes"}}</button> <button class="ui basic red inverted button">{{.locale.Tr "modal.yes"}}</button>
</div> </div>
</form> </form>

4
templates/repo/issue/view_content/update_branch_by_merge.tmpl
View file

@ -19,8 +19,8 @@
<div class="ui dropdown icon button no-text"> <div class="ui dropdown icon button no-text">
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="menu"> <div class="menu">
<div class="item active selected" data-do="{{.Link}}/update">{{$.locale.Tr "repo.pulls.update_branch"}}</div> <a class="item active selected" data-do="{{.Link}}/update">{{$.locale.Tr "repo.pulls.update_branch"}}</a>
<div class="item" data-do="{{.Link}}/update?style=rebase">{{$.locale.Tr "repo.pulls.update_branch_rebase"}}</div> <a class="item" data-do="{{.Link}}/update?style=rebase">{{$.locale.Tr "repo.pulls.update_branch_rebase"}}</a>
</div> </div>
</div> </div>
</div> </div>

4
templates/repo/issue/view_title.tmpl
View file

@ -1,9 +1,7 @@
<div class="sixteen wide column title"> <div class="sixteen wide column title">
<div class="issue-title" id="issue-title-wrapper"> <div class="issue-title" id="issue-title-wrapper">
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
<div class="edit-button"> <button id="edit-title" class="ui basic button secondary edit-button not-in-edit">{{.locale.Tr "repo.issues.edit"}}</button>
<button id="edit-title" class="ui basic button secondary not-in-edit">{{.locale.Tr "repo.issues.edit"}}</button>
</div>
{{end}} {{end}}
<h1> <h1>
<span id="issue-title">{{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}}</span> <span id="issue-title">{{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}}</span>

2
templates/repo/migrate/migrating.tmpl
View file

@ -72,7 +72,7 @@
</div> </div>
<div class="text right actions"> <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> <button class="ui red button">{{.locale.Tr "repo.settings.confirm_delete"}}</button>
</div> </div>
</form> </form>

11
templates/repo/projects/list.tmpl
View file

@ -86,16 +86,7 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p> <p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.locale.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.locale.Tr "modal.yes"}}
</div>
</div>
</div> </div>
{{end}} {{end}}
{{template "base/footer" .}} {{template "base/footer" .}}

21
templates/repo/projects/view.tmpl
View file

@ -33,7 +33,7 @@
</div> </div>
<div class="text right actions"> <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 data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button> <button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button>
</div> </div>
</form> </form>
@ -131,7 +131,7 @@
</div> </div>
<div class="text right actions"> <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 data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" class="ui primary button">{{$.locale.Tr "repo.projects.column.edit"}}</button> <button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" class="ui primary button">{{$.locale.Tr "repo.projects.column.edit"}}</button>
</div> </div>
</form> </form>
@ -148,7 +148,7 @@
</label> </label>
</div> </div>
<div class="text right actions"> <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 primary button set-default-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button> <button class="ui primary button set-default-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
</div> </div>
</div> </div>
@ -162,8 +162,8 @@
{{$.locale.Tr "repo.projects.column.deletion_desc"}} {{$.locale.Tr "repo.projects.column.deletion_desc"}}
</label> </label>
</div> </div>
<div class="text right actions"> <div class="text right actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl? */}}
<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 delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button> <button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
</div> </div>
</div> </div>
@ -276,16 +276,7 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p> <p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.locale.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.locale.Tr "modal.yes"}}
</div>
</div>
</div> </div>
{{end}} {{end}}

6
templates/repo/release/new.tmpl
View file

@ -114,7 +114,7 @@
{{$.locale.Tr "repo.release.delete_release"}} {{$.locale.Tr "repo.release.delete_release"}}
</a> </a>
{{if .IsDraft}} {{if .IsDraft}}
<input class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}"/> <button class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
<button class="ui primary button"> <button class="ui primary button">
{{.locale.Tr "repo.release.publish"}} {{.locale.Tr "repo.release.publish"}}
</button> </button>
@ -125,9 +125,9 @@
{{end}} {{end}}
{{else}} {{else}}
{{if not .tag_name}} {{if not .tag_name}}
<input class="ui grey button" type="submit" name="tag_only" value="{{.locale.Tr "repo.release.add_tag"}}"/> <button class="ui grey button" type="submit" name="tag_only" value="{{.locale.Tr "repo.release.add_tag"}}">{{.locale.Tr "repo.release.add_tag"}}</button>
{{end}} {{end}}
<input class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}"/> <button class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
<button class="ui primary button"> <button class="ui primary button">
{{.locale.Tr "repo.release.publish"}} {{.locale.Tr "repo.release.publish"}}
</button> </button>

15
templates/repo/settings/deploy_keys.tmpl
View file

@ -8,9 +8,9 @@
{{.locale.Tr "repo.settings.deploy_keys"}} {{.locale.Tr "repo.settings.deploy_keys"}}
<div class="ui right"> <div class="ui right">
{{if not .DisableSSH}} {{if not .DisableSSH}}
<div class="ui primary tiny show-panel button" data-panel="#add-deploy-key-panel">{{.locale.Tr "repo.settings.add_deploy_key"}}</div> <button class="ui primary tiny show-panel button" data-panel="#add-deploy-key-panel">{{.locale.Tr "repo.settings.add_deploy_key"}}</button>
{{else}} {{else}}
<div class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</div> <button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button>
{{end}} {{end}}
</div> </div>
</h4> </h4>
@ -85,15 +85,6 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p> <p>{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.locale.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.locale.Tr "modal.yes"}}
</div>
</div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

4
templates/repo/settings/lfs.tmpl
View file

@ -50,8 +50,8 @@
</p> </p>
<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post"> <form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
<div class="center actions"> <div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}}
<div class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</div> <button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button> <button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
</div> </div>
</form> </form>

4
templates/repo/settings/lfs_pointers.tmpl
View file

@ -49,9 +49,9 @@
{{ShortSha .Oid}} {{ShortSha .Oid}}
</a> </a>
{{else}} {{else}}
<span class="ui detail icon button brown disabled truncate"> <button class="ui detail icon button brown disabled truncate">
{{ShortSha .Oid}} {{ShortSha .Oid}}
</span> </button>
{{end}} {{end}}
</span> </span>
</td> </td>

15
templates/repo/settings/options.tmpl
View file

@ -825,7 +825,7 @@
</div> </div>
<div class="text right actions"> <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> <button class="ui red button">{{.locale.Tr "repo.settings.convert_confirm"}}</button>
</div> </div>
</form> </form>
@ -856,7 +856,7 @@
</div> </div>
<div class="text right actions"> <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> <button class="ui red button">{{.locale.Tr "repo.settings.convert_fork_confirm"}}</button>
</div> </div>
</form> </form>
@ -892,7 +892,7 @@
</div> </div>
<div class="text right actions"> <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> <button class="ui red button">{{.locale.Tr "repo.settings.transfer_perform"}}</button>
</div> </div>
</form> </form>
@ -926,7 +926,7 @@
</div> </div>
<div class="text right actions"> <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> <button class="ui red button">{{.locale.Tr "repo.settings.confirm_delete"}}</button>
</div> </div>
</form> </form>
@ -958,7 +958,7 @@
</div> </div>
<div class="text right actions"> <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> <button class="ui red button">{{.locale.Tr "repo.settings.confirm_wiki_delete"}}</button>
</div> </div>
</form> </form>
@ -988,10 +988,7 @@
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}"> <input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}">
<input type="hidden" name="repo_id" value="{{.Repository.ID}}"> <input type="hidden" name="repo_id" value="{{.Repository.ID}}">
<div class="center actions"> {{template "base/delete_modal_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>
</form> </form>
</div> </div>
{{end}} {{end}}

11
templates/repo/settings/webhook/delete_modal.tmpl
View file

@ -6,14 +6,5 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "repo.settings.webhook_deletion_desc"}}</p> <p>{{.locale.Tr "repo.settings.webhook_deletion_desc"}}</p>
</div> </div>
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.locale.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.locale.Tr "modal.yes"}}
</div>
</div>
</div> </div>

4
templates/repo/unicode_escape_prompt.tmpl
View file

@ -1,7 +1,7 @@
{{if .EscapeStatus}} {{if .EscapeStatus}}
{{if .EscapeStatus.HasInvisible}} {{if .EscapeStatus.HasInvisible}}
<div class="ui error message unicode-escape-prompt gt-tl"> <div class="ui error message unicode-escape-prompt gt-tl">
<span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span> <button class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</button>
<div class="header"> <div class="header">
{{$.root.locale.Tr "repo.invisible_runes_header"}} {{$.root.locale.Tr "repo.invisible_runes_header"}}
</div> </div>
@ -12,7 +12,7 @@
</div> </div>
{{else if .EscapeStatus.HasAmbiguous}} {{else if .EscapeStatus.HasAmbiguous}}
<div class="ui warning message unicode-escape-prompt gt-tl"> <div class="ui warning message unicode-escape-prompt gt-tl">
<span class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</span> <button class="close icon hide-panel button" data-panel-closest=".message">{{svg "octicon-x" 16 "close inside"}}</button>
<div class="header"> <div class="header">
{{$.root.locale.Tr "repo.ambiguous_runes_header"}} {{$.root.locale.Tr "repo.ambiguous_runes_header"}}
</div> </div>

4
templates/shared/actions/runner_list.tmpl
View file

@ -20,9 +20,9 @@
</div> </div>
<div class="ui input"> <div class="ui input">
<input type="text" value="{{.RegistrationToken}}"> <input type="text" value="{{.RegistrationToken}}">
<div class="ui basic label button" data-clipboard-text="{{.RegistrationToken}}"> <button class="ui basic label button" aria-label="{{.locale.Tr "copy"}}" data-clipboard-text="{{.RegistrationToken}}">
{{svg "octicon-copy" 14}} {{svg "octicon-copy" 14}}
</div> </button>
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<div class="item"> <div class="item">

2
templates/shared/secrets/add_list.tmpl
View file

@ -1,7 +1,7 @@
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{.locale.Tr "secrets.secrets"}} {{.locale.Tr "secrets.secrets"}}
<div class="ui right"> <div class="ui right">
<div class="ui primary tiny show-panel button" data-panel="#add-secret-panel">{{.locale.Tr "secrets.creation"}}</div> <button class="ui primary tiny show-panel button" data-panel="#add-secret-panel">{{.locale.Tr "secrets.creation"}}</button>
</div> </div>
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">

2
templates/user/auth/grant.tmpl
View file

@ -23,7 +23,7 @@
<input type="hidden" name="scope" value="{{.Scope}}"> <input type="hidden" name="scope" value="{{.Scope}}">
<input type="hidden" name="nonce" value="{{.Nonce}}"> <input type="hidden" name="nonce" value="{{.Nonce}}">
<input type="hidden" name="redirect_uri" value="{{.RedirectURI}}"> <input type="hidden" name="redirect_uri" value="{{.RedirectURI}}">
<input type="submit" id="authorize-app" value="{{.locale.Tr "auth.authorize_application"}}" class="ui red inline button"/> <button type="submit" id="authorize-app" value="{{.locale.Tr "auth.authorize_application"}}" class="ui red inline button">{{.locale.Tr "auth.authorize_application"}}</button>
<a href="{{.RedirectURI}}" class="ui basic primary inline button">Cancel</a> <a href="{{.RedirectURI}}" class="ui basic primary inline button">Cancel</a>
</form> </form>
</div> </div>

2
templates/user/auth/webauthn_error.tmpl
View file

@ -17,6 +17,6 @@
</div> </div>
<div class="actions"> <div class="actions">
<button onclick="window.location.reload()" class="success ui button gt-hidden webauthn_error_timeout">{{.locale.Tr "webauthn_reload"}}</button> <button onclick="window.location.reload()" class="success ui button gt-hidden webauthn_error_timeout">{{.locale.Tr "webauthn_reload"}}</button>
<div class="ui cancel button">{{.locale.Tr "cancel"}}</div> <button class="ui cancel button">{{.locale.Tr "cancel"}}</button>
</div> </div>
</div> </div>

4
templates/user/settings/account.tmpl
View file

@ -151,9 +151,9 @@
<input id="password-confirmation" name="password" type="password" autocomplete="off" required> <input id="password-confirmation" name="password" type="password" autocomplete="off" required>
</div> </div>
<div class="field"> <div class="field">
<div class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form"> <button class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form">
{{.locale.Tr "settings.confirm_delete_account"}} {{.locale.Tr "settings.confirm_delete_account"}}
</div> </button>
<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a> <a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
</div> </div>
</form> </form>

15
templates/user/settings/applications.tmpl
View file

@ -276,15 +276,16 @@
<div class="content"> <div class="content">
<p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p> <p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p>
</div> </div>
<div class="actions">
<div class="ui cancel button"> <div class="actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl */}}
<i class="remove icon"></i> <button class="ui green basic inverted cancel button">
{{svg "octicon-x"}}
{{.locale.Tr "settings.access_token_deletion_cancel_action"}} {{.locale.Tr "settings.access_token_deletion_cancel_action"}}
</div> </button>
<div class="ui red basic inverted ok button"> <button class="ui red basic inverted ok button">
<i class="checkmark icon"></i> {{svg "octicon-check"}}
{{.locale.Tr "settings.access_token_deletion_confirm_action"}} {{.locale.Tr "settings.access_token_deletion_confirm_action"}}
</div> </button>
</div> </div>
</div> </div>

2
templates/user/settings/keys_gpg.tmpl
View file

@ -1,7 +1,7 @@
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{.locale.Tr "settings.manage_gpg_keys"}} {{.locale.Tr "settings.manage_gpg_keys"}}
<div class="ui right"> <div class="ui right">
<div class="ui primary tiny show-panel button" data-panel="#add-gpg-key-panel">{{.locale.Tr "settings.add_key"}}</div> <button class="ui primary tiny show-panel button" data-panel="#add-gpg-key-panel">{{.locale.Tr "settings.add_key"}}</button>
</div> </div>
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">

4
templates/user/settings/keys_principal.tmpl
View file

@ -3,9 +3,9 @@
{{.locale.Tr "settings.manage_ssh_principals"}} {{.locale.Tr "settings.manage_ssh_principals"}}
<div class="ui right"> <div class="ui right">
{{if not .DisableSSH}} {{if not .DisableSSH}}
<div class="ui primary tiny show-panel button" data-panel="#add-ssh-principal-panel">{{.locale.Tr "settings.add_new_principal"}}</div> <button class="ui primary tiny show-panel button" data-panel="#add-ssh-principal-panel">{{.locale.Tr "settings.add_new_principal"}}</button>
{{else}} {{else}}
<div class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</div> <button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button>
{{end}} {{end}}
</div> </div>
</h4> </h4>

6
templates/user/settings/keys_ssh.tmpl
View file

@ -2,11 +2,11 @@
{{.locale.Tr "settings.manage_ssh_keys"}} {{.locale.Tr "settings.manage_ssh_keys"}}
<div class="ui right"> <div class="ui right">
{{if not .DisableSSH}} {{if not .DisableSSH}}
<div id="add-ssh-button" class="ui primary tiny show-panel button" data-panel="#add-ssh-key-panel"> <button id="add-ssh-button" class="ui primary tiny show-panel button" data-panel="#add-ssh-key-panel">
{{.locale.Tr "settings.add_key"}} {{.locale.Tr "settings.add_key"}}
</div> </button>
{{else}} {{else}}
<div class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</div> <button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button>
{{end}} {{end}}
</div> </div>
</h4> </h4>

22
templates/user/settings/repos.tmpl
View file

@ -50,16 +50,7 @@
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
<input type="hidden" name="id" value="{{$dir}}"> <input type="hidden" name="id" value="{{$dir}}">
<input type="hidden" name="action" value="adopt"> <input type="hidden" name="action" value="adopt">
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{$.locale.Tr "modal.no"}}
</div>
<button class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{$.locale.Tr "modal.yes"}}
</button>
</div>
</form> </form>
</div> </div>
{{end}} {{end}}
@ -77,16 +68,7 @@
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
<input type="hidden" name="id" value="{{$dir}}"> <input type="hidden" name="id" value="{{$dir}}">
<input type="hidden" name="action" value="delete"> <input type="hidden" name="action" value="delete">
<div class="actions"> {{template "base/delete_modal_actions" .}}
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{$.locale.Tr "modal.no"}}
</div>
<button class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{$.locale.Tr "modal.yes"}}
</button>
</div>
</form> </form>
</div> </div>
{{end}} {{end}}

2
templates/user/settings/security/twofa.tmpl
View file

@ -13,7 +13,7 @@
<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form"> <form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<p>{{.locale.Tr "settings.twofa_disable_note"}}</p> <p>{{.locale.Tr "settings.twofa_disable_note"}}</p>
<div class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{$.locale.Tr "settings.twofa_disable"}}</div> <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> </form>
{{else}} {{else}}
<p>{{.locale.Tr "settings.twofa_not_enrolled"}}</p> <p>{{.locale.Tr "settings.twofa_not_enrolled"}}</p>

3
web_src/js/features/admin/common.js
View file

@ -198,7 +198,8 @@ export function initAdminCommon() {
break; break;
} }
}); });
$('#delete-selection').on('click', function () { $('#delete-selection').on('click', function (e) {
e.preventDefault();
const $this = $(this); const $this = $(this);
$this.addClass('loading disabled'); $this.addClass('loading disabled');
const ids = []; const ids = [];

28
web_src/js/features/common-global.js
View file

@ -202,7 +202,8 @@ export function initGlobalDropzone() {
} }
export function initGlobalLinkActions() { export function initGlobalLinkActions() {
function showDeletePopup() { function showDeletePopup(e) {
e.preventDefault();
const $this = $(this); const $this = $(this);
const dataArray = $this.data(); const dataArray = $this.data();
let filter = ''; let filter = '';
@ -243,10 +244,10 @@ export function initGlobalLinkActions() {
}); });
} }
}).modal('show'); }).modal('show');
return false;
} }
function showAddAllPopup() { function showAddAllPopup(e) {
e.preventDefault();
const $this = $(this); const $this = $(this);
let filter = ''; let filter = '';
if ($this.attr('id')) { if ($this.attr('id')) {
@ -272,7 +273,6 @@ export function initGlobalLinkActions() {
}); });
} }
}).modal('show'); }).modal('show');
return false;
} }
function linkAction(e) { function linkAction(e) {
@ -318,13 +318,21 @@ export function initGlobalLinkActions() {
} }
export function initGlobalButtons() { export function initGlobalButtons() {
$('.show-panel.button').on('click', function () { // There are many "cancel button" elements in modal dialogs, Fomantic UI expects they are button-like elements but never submit a form.
// However, Gitea misuses the modal dialog and put the cancel buttons inside forms, so we must prevent the form submission.
// There are a few cancel buttons in non-modal forms, and there are some dynamically created forms (eg: the "Edit Issue Content")
$(document).on('click', 'form .ui.cancel.button', (e) => {
e.preventDefault();
});
$('.show-panel.button').on('click', function (e) {
e.preventDefault();
showElem($(this).data('panel')); showElem($(this).data('panel'));
}); });
$('.hide-panel.button').on('click', function (event) { $('.hide-panel.button').on('click', function (e) {
// a `.hide-panel.button` can hide a panel, by `data-panel="selector"` or `data-panel-closest="selector"` // a `.hide-panel.button` can hide a panel, by `data-panel="selector"` or `data-panel-closest="selector"`
event.preventDefault(); e.preventDefault();
let sel = $(this).attr('data-panel'); let sel = $(this).attr('data-panel');
if (sel) { if (sel) {
hideElem($(sel)); hideElem($(sel));
@ -339,7 +347,8 @@ export function initGlobalButtons() {
alert('Nothing to hide'); alert('Nothing to hide');
}); });
$('.show-modal').on('click', function () { $('.show-modal').on('click', function (e) {
e.preventDefault();
const modalDiv = $($(this).attr('data-modal')); const modalDiv = $($(this).attr('data-modal'));
for (const attrib of this.attributes) { for (const attrib of this.attributes) {
if (!attrib.name.startsWith('data-modal-')) { if (!attrib.name.startsWith('data-modal-')) {
@ -360,7 +369,8 @@ export function initGlobalButtons() {
} }
}); });
$('.delete-post.button').on('click', function () { $('.delete-post.button').on('click', function (e) {
e.preventDefault();
const $this = $(this); const $this = $(this);
$.post($this.attr('data-request-url'), { $.post($this.attr('data-request-url'), {
_csrf: csrfToken _csrf: csrfToken

1
web_src/js/features/common-issue.js
View file

@ -34,6 +34,7 @@ export function initCommonIssue() {
}); });
$('.issue-action').on('click', async function (e) { $('.issue-action').on('click', async function (e) {
e.preventDefault();
let action = this.getAttribute('data-action'); let action = this.getAttribute('data-action');
let elementId = this.getAttribute('data-element-id'); let elementId = this.getAttribute('data-element-id');
const url = this.getAttribute('data-url'); const url = this.getAttribute('data-url');

3
web_src/js/features/repo-issue.js
View file

@ -230,7 +230,8 @@ export function initRepoIssueStatusButton() {
const value = easyMDE?.value() || $(this).val(); const value = easyMDE?.value() || $(this).val();
$statusButton.text($statusButton.data(value.length === 0 ? 'status' : 'status-and-comment')); $statusButton.text($statusButton.data(value.length === 0 ? 'status' : 'status-and-comment'));
}); });
$statusButton.on('click', () => { $statusButton.on('click', (e) => {
e.preventDefault();
$('#status').val($statusButton.data('status-val')); $('#status').val($statusButton.data('status-val'));
$('#comment-form').trigger('submit'); $('#comment-form').trigger('submit');
}); });

3
web_src/js/features/repo-legacy.js
View file

@ -412,7 +412,8 @@ async function onEditContent(event) {
$saveButton.trigger('click'); $saveButton.trigger('click');
}); });
$editContentZone.find('.cancel.button').on('click', () => { $editContentZone.find('.cancel.button').on('click', (e) => {
e.preventDefault();
showElem($renderContent); showElem($renderContent);
hideElem($editContentZone); hideElem($editContentZone);
if (dz) { if (dz) {

1
web_src/svg/fontawesome-save.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 448 512"><path d="m434 130-84-84a48 48 0 0 0-33.9-14H48A48 48 0 0 0 0 80v352a48 48 0 0 0 48 48h352a48 48 0 0 0 48-48V163.9a48 48 0 0 0-14-34zM224 416a64 64 0 1 1 0-128 64 64 0 0 1 0 128zm96-304.5V212a12 12 0 0 1-12 12H76a12 12 0 0 1-12-12V108a12 12 0 0 1 12-12h228.5a12 12 0 0 1 8.5 3.5l3.5 3.5a12 12 0 0 1 3.5 8.5z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 402 B