Skip to content

Commit 63ee678

Browse files
wxiaoguangwxiaoguang
authored
Refactor "delete-button" to "link-action" (#34962)
1 parent c050826 commit 63ee678

File tree

11 files changed

+61
-96
lines changed

11 files changed

+61
-96
lines changed

‎templates/admin/auth/edit.tmpl‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,10 @@
408408

409409
<div class="field">
410410
<button class="ui primary button">{{ctx.Locale.Tr "admin.auths.update"}}</button>
411-
<button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{ctx.Locale.Tr "admin.auths.delete"}}</button>
411+
<button class="ui red button link-action" data-url="{{$.Link}}/delete?id={{.Source.ID}}"
412+
data-modal-confirm-header="{{ctx.Locale.Tr "admin.auths.delete_auth_title"}}"
413+
data-modal-confirm-content="{{ctx.Locale.Tr "admin.auths.delete_auth_desc"}}"
414+
>{{ctx.Locale.Tr "admin.auths.delete"}}</button>
412415
</div>
413416
</form>
414417
</div>
@@ -424,16 +427,4 @@
424427
<p class="oauth2">{{ctx.Locale.Tr "admin.auths.tips.oauth2.general.tip"}} <b id="oauth2-callback-url"></b></p>
425428
</div>
426429
</div>
427-
428-
<div class="ui g-modal-confirm delete modal">
429-
<div class="header">
430-
{{svg "octicon-trash"}}
431-
{{ctx.Locale.Tr "admin.auths.delete_auth_title"}}
432-
</div>
433-
<div class="content">
434-
<p>{{ctx.Locale.Tr "admin.auths.delete_auth_desc"}}</p>
435-
</div>
436-
{{template "base/modal_actions_confirm" .}}
437-
</div>
438-
439430
{{template "admin/layout_footer" .}}

‎templates/admin/packages/list.tmpl‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@
7272
</td>
7373
<td>{{FileSize .CalculateBlobSize}}</td>
7474
<td>{{DateUtils.AbsoluteShort .Version.CreatedUnix}}</td>
75-
<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
75+
<td>
76+
<a class="text red show-modal" href data-modal="#admin-package-delete-modal"
77+
data-modal-form.action="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}&id={{.Version.ID}}"
78+
data-modal-package-name="{{.Package.Name}}" data-modal-package-version="{{.Version.Version}}"
79+
>{{svg "octicon-trash"}}</a>
80+
</td>
7681
</tr>
7782
{{else}}
7883
<tr><td class="tw-text-center" colspan="10">{{ctx.Locale.Tr "no_results_found"}}</td></tr>
@@ -84,15 +89,13 @@
8489
{{template "base/paginate" .}}
8590
</div>
8691

87-
<div class="ui g-modal-confirm delete modal">
88-
<div class="header">
89-
{{svg "octicon-trash"}}
90-
{{ctx.Locale.Tr "packages.settings.delete"}}
91-
</div>
92+
<form class="ui small modal form-fetch-action" method="post" id="admin-package-delete-modal">
93+
{{.CsrfTokenHtml}}
94+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "packages.settings.delete"}}</div>
9295
<div class="content">
93-
{{ctx.Locale.Tr "packages.settings.delete.notice" (HTMLFormat `<span class="%s"></span>` "name") (HTMLFormat `<span class="%s"></span>` "dataVersion")}}
96+
{{ctx.Locale.Tr "packages.settings.delete.notice" (HTMLFormat `<span class="%s"></span>` "package-name") (HTMLFormat `<span class="%s"></span>` "package-version")}}
9497
</div>
9598
{{template "base/modal_actions_confirm" .}}
96-
</div>
99+
</form>
97100

98101
{{template "admin/layout_footer" .}}

‎templates/admin/repo/list.tmpl‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@
8484
<td>{{FileSize .LFSSize}}</td>
8585
<td>{{DateUtils.AbsoluteShort .UpdatedUnix}}</td>
8686
<td>{{DateUtils.AbsoluteShort .CreatedUnix}}</td>
87-
<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
87+
<td>
88+
<a class="text red show-modal" href data-modal="#admin-repo-delete-modal"
89+
data-modal-form.action="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}&id={{.ID}}"
90+
data-modal-repo-name="{{.Name}}"
91+
>{{svg "octicon-trash"}}</a>
92+
</td>
8893
</tr>
8994
{{else}}
9095
<tr><td class="tw-text-center" colspan="12">{{ctx.Locale.Tr "no_results_found"}}</td></tr>
@@ -96,17 +101,15 @@
96101
{{template "base/paginate" .}}
97102
</div>
98103

99-
<div class="ui g-modal-confirm delete modal">
100-
<div class="header">
101-
{{svg "octicon-trash"}}
102-
{{ctx.Locale.Tr "repo.settings.delete"}}
103-
</div>
104+
<form class="ui small modal form-fetch-action" id="admin-repo-delete-modal" method="post">
105+
{{.CsrfTokenHtml}}
106+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.settings.delete"}}</div>
104107
<div class="content">
105108
<p>{{ctx.Locale.Tr "repo.settings.delete_desc"}}</p>
106-
{{ctx.Locale.Tr "repo.settings.delete_notices_2" (HTMLFormat `<span class="%s"></span>` "name")}}<br>
109+
{{ctx.Locale.Tr "repo.settings.delete_notices_2" (HTMLFormat `<span class="%s"></span>` "repo-name")}}<br>
107110
{{ctx.Locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
108111
</div>
109112
{{template "base/modal_actions_confirm" .}}
110-
</div>
113+
</form>
111114

112115
{{template "admin/layout_footer" .}}

‎templates/projects/list.tmpl‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
{{else}}
6868
<a class="link-action flex-text-inline" href data-url="{{.Link ctx}}/close">{{svg "octicon-skip" 14}}{{ctx.Locale.Tr "repo.projects.close"}}</a>
6969
{{end}}
70-
<a class="delete-button flex-text-inline" href="#" data-url="{{.Link ctx}}/delete">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
70+
<a class="link-action flex-text-inline text red" href data-modal-confirm="#repo-project-delete-modal" data-url="{{.Link ctx}}/delete">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
7171
</div>
7272
{{end}}
7373
</div>
@@ -81,14 +81,9 @@
8181
</div>
8282

8383
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
84-
<div class="ui g-modal-confirm delete modal">
85-
<div class="header">
86-
{{svg "octicon-trash"}}
87-
{{ctx.Locale.Tr "repo.projects.deletion"}}
88-
</div>
89-
<div class="content">
90-
<p>{{ctx.Locale.Tr "repo.projects.deletion_desc"}}</p>
91-
</div>
84+
<div class="ui small modal" id="repo-project-delete-modal">
85+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.projects.deletion"}}</div>
86+
<div class="content"><p>{{ctx.Locale.Tr "repo.projects.deletion_desc"}}</p></div>
9287
{{template "base/modal_actions_confirm" .}}
9388
</div>
9489
{{end}}

‎templates/repo/issue/milestones.tmpl‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
{{else}}
7777
<a class="link-action flex-text-inline" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-x" 14}}{{ctx.Locale.Tr "repo.milestones.close"}}</a>
7878
{{end}}
79-
<a class="delete-button flex-text-inline" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
79+
<a class="link-action flex-text-inline text red" href data-modal-confirm="#repo-milestone-delete-modal" data-url="{{$.RepoLink}}/milestones/delete?id={{.ID}}">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
8080
</div>
8181
{{end}}
8282
</div>
@@ -92,15 +92,11 @@
9292
</div>
9393

9494
{{if or .CanWriteIssues .CanWritePulls}}
95-
<div class="ui g-modal-confirm delete modal">
96-
<div class="header">
97-
{{svg "octicon-trash"}}
98-
{{ctx.Locale.Tr "repo.milestones.deletion"}}
99-
</div>
100-
<div class="content">
101-
<p>{{ctx.Locale.Tr "repo.milestones.deletion_desc"}}</p>
102-
</div>
95+
<div class="ui small modal" id="repo-milestone-delete-modal">
96+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.milestones.deletion"}}</div>
97+
<div class="content"><p>{{ctx.Locale.Tr "repo.milestones.deletion_desc"}}</p></div>
10398
{{template "base/modal_actions_confirm" .}}
10499
</div>
105100
{{end}}
101+
106102
{{template "base/footer" .}}

‎templates/repo/release/new.tmpl‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<a class="ui small button" href="{{.RepoLink}}/releases">
106106
{{ctx.Locale.Tr "repo.release.cancel"}}
107107
</a>
108-
<a class="ui small red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}">
108+
<a class="ui small red button link-action" data-modal-confirm="#repo-release-delete-modal" data-url="{{$.RepoLink}}/releases/delete?id={{.ID}}">
109109
{{ctx.Locale.Tr "repo.release.delete_release"}}
110110
</a>
111111
{{if .IsDraft}}
@@ -129,15 +129,11 @@
129129
</div>
130130

131131
{{if .PageIsEditRelease}}
132-
<div class="ui g-modal-confirm delete modal">
133-
<div class="header">
134-
{{svg "octicon-trash"}}
135-
{{ctx.Locale.Tr "repo.release.deletion"}}
136-
</div>
137-
<div class="content">
138-
<p>{{ctx.Locale.Tr "repo.release.deletion_desc"}}</p>
139-
</div>
132+
<div class="ui small modal" id="repo-release-delete-modal">
133+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.release.deletion"}}</div>
134+
<div class="content"><p>{{ctx.Locale.Tr "repo.release.deletion_desc"}}</p></div>
140135
{{template "base/modal_actions_confirm" .}}
141136
</div>
142137
{{end}}
138+
143139
{{template "base/footer" .}}

‎templates/repo/settings/branches.tmpl‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</div>
5050
</div>
5151
<div class="flex-item-trailing">
52-
<a class="rm ui tiny button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{ctx.Locale.Tr "repo.settings.edit_protected_branch"}}</a>
53-
<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
52+
<a class="ui tiny button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{ctx.Locale.Tr "repo.settings.edit_protected_branch"}}</a>
53+
<button class="ui red tiny button link-action" data-modal-confirm="#repo-branch-protection-delete-modal" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete?id={{.ID}}">
5454
{{ctx.Locale.Tr "repo.settings.protected_branch.delete_rule"}}
5555
</button>
5656
</div>
@@ -65,14 +65,9 @@
6565
{{end}}
6666
</div>
6767

68-
<div class="ui g-modal-confirm delete modal">
69-
<div class="header">
70-
{{svg "octicon-trash"}}
71-
{{ctx.Locale.Tr "repo.settings.protected_branch_deletion"}}
72-
</div>
73-
<div class="content">
74-
<p>{{ctx.Locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p>
75-
</div>
68+
<div class="ui small modal" id="repo-branch-protection-delete-modal">
69+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.settings.protected_branch_deletion"}}</div>
70+
<div class="content"><p>{{ctx.Locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p></div>
7671
{{template "base/modal_actions_confirm" .}}
7772
</div>
7873

‎templates/repo/settings/collaboration.tmpl‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</div>
3030
</div>
3131
</div>
32-
<button class="ui red tiny button inline delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
32+
<button class="ui red tiny button link-action" data-modal-confirm="#repo-collaborator-delete-modal" data-url="{{$.Link}}/delete?id={{.ID}}">
3333
{{ctx.Locale.Tr "repo.settings.delete_collaborator"}}
3434
</button>
3535
</div>
@@ -95,7 +95,7 @@
9595
</div>
9696
{{if $allowedToChangeTeams}}
9797
<div class="flex-item-trailing" {{if .IncludesAllRepositories}} data-tooltip-content="{{ctx.Locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
98-
<button class="ui red tiny button inline delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
98+
<button class="ui red tiny button link-action {{if .IncludesAllRepositories}}disabled{{end}}" data-modal-confirm="#repo-collaborator-delete-modal" data-url="{{$.Link}}/team/delete?id={{.ID}}">
9999
{{ctx.Locale.Tr "repo.settings.delete_collaborator"}}
100100
</button>
101101
</div>
@@ -123,14 +123,9 @@
123123
{{end}}
124124
</div>
125125

126-
<div class="ui g-modal-confirm delete modal">
127-
<div class="header">
128-
{{svg "octicon-trash"}}
129-
{{ctx.Locale.Tr "repo.settings.collaborator_deletion"}}
130-
</div>
131-
<div class="content">
132-
<p>{{ctx.Locale.Tr "repo.settings.collaborator_deletion_desc"}}</p>
133-
</div>
126+
<div class="ui small modal" id="repo-collaborator-delete-modal">
127+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.settings.collaborator_deletion"}}</div>
128+
<div class="content"><p>{{ctx.Locale.Tr "repo.settings.collaborator_deletion_desc"}}</p></div>
134129
{{template "base/modal_actions_confirm" .}}
135130
</div>
136131

‎templates/repo/settings/deploy_keys.tmpl‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</div>
6060
</div>
6161
<div class="flex-item-trailing">
62-
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
62+
<button class="ui red tiny button link-action" data-modal-confirm="#repo-deploy-key-delete-modal" data-url="{{$.Link}}/delete?id={{.ID}}">
6363
{{ctx.Locale.Tr "settings.delete_key"}}
6464
</button>
6565
</div>
@@ -72,14 +72,9 @@
7272
</div>
7373
</div>
7474

75-
<div class="ui g-modal-confirm delete modal">
76-
<div class="header">
77-
{{svg "octicon-trash"}}
78-
{{ctx.Locale.Tr "repo.settings.deploy_key_deletion"}}
79-
</div>
80-
<div class="content">
81-
<p>{{ctx.Locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
82-
</div>
75+
<div class="ui small modal" id="repo-deploy-key-delete-modal">
76+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.settings.deploy_key_deletion"}}</div>
77+
<div class="content"><p>{{ctx.Locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p></div>
8378
{{template "base/modal_actions_confirm" .}}
8479
</div>
8580

‎templates/repo/wiki/view.tmpl‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
{{if and .CanWriteWiki (not .Repository.IsMirror)}}
5151
<a class="ui small button" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_edit">{{ctx.Locale.Tr "repo.wiki.edit_page_button"}}</a>
5252
<a class="ui small primary button" href="{{.RepoLink}}/wiki?action=_new">{{ctx.Locale.Tr "repo.wiki.new_page_button"}}</a>
53-
<a class="ui small red button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}?action=_delete" data-id="{{.PageURL}}">{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</a>
53+
<a class="ui small red button link-action" href data-modal-confirm="#repo-wiki-delete-page-modal" data-url="{{.RepoLink}}/wiki/{{.PageURL}}?action=_delete">{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</a>
5454
{{end}}
5555
</div>
5656
</div>
@@ -96,14 +96,9 @@
9696
</div>
9797
</div>
9898

99-
<div class="ui g-modal-confirm delete modal">
100-
<div class="header">
101-
{{svg "octicon-trash"}}
102-
{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}
103-
</div>
104-
<div class="content">
105-
<p>{{ctx.Locale.Tr "repo.wiki.delete_page_notice_1" $title}}</p>
106-
</div>
99+
<div class="ui small modal" id="repo-wiki-delete-page-modal">
100+
<div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</div>
101+
<div class="content"><p>{{ctx.Locale.Tr "repo.wiki.delete_page_notice_1" $title}}</p></div>
107102
{{template "base/modal_actions_confirm" .}}
108103
</div>
109104

0 commit comments

Comments
 (0)