Skip to content

Commit 476a043

Browse files
HesterGwxiaoguang
HesterG
and
wxiaoguang
authored
Refactor delete_modal_actions template and use it for project column related actions (#24097)
Co-Author: @wxiaoguang This PR is to fix #23318 (comment) . The way to fix this in this PR is to use `delete_modal_actions.tmpl` here both to fix this issue and keep ui consistency (as suggested by [TODO here](https://github.com/go-gitea/gitea/blob/4299c3b7db61f8741eca0ba3d663bb65745a4acc/templates/projects/view.tmpl#L161)) And this PR also refactors `delete_modal_actions.tmpl` and its related styles, and use the template for more modal actions: 1. Added template attributes: * locale * ModalButtonStyle: "yes" (default) or "confirm" * ModalButtonCancelText * ModalButtonOkText 2. Rename `delete_modal_actions.tmpl` template to `modal_actions_confirm.tmpl` because it is not only used for action modals deletion now. 3. Refactored css related to modals into `web_src/css/modules/modal.css` and improved the styles. 4. Also use the template for PR deletion modal and remove issue dependency modal. 5. Some modals should also use the template, but not sure how to open them, so mark these modal actions by `{{/* TODO: Convert to base/modal_actions_confirm */}}` After (Also tested on arc green): Hovering on the left buttons <img width="711" alt="Screen Shot 2023-04-23 at 15 17 12" src="https://user-images.githubusercontent.com/17645053/233825650-76307e65-9255-44bb-80e8-7062f58ead1b.png"> <img width="786" alt="Screen Shot 2023-04-23 at 15 17 21" src="https://user-images.githubusercontent.com/17645053/233825652-4dc6f7d1-a180-49fb-a468-d60950eaee0d.png"> Test for functionalities: https://user-images.githubusercontent.com/17645053/233826857-76376fda-022c-42d0-b0f3-339c17ca4e59.mov --------- Co-authored-by: wxiaoguang <[email protected]>
1 parent 5e38922 commit 476a043

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+285
-286
lines changed

‎options/locale/locale_en-US.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,8 @@ team_invite.text_3 = Note: This invitation was intended for %[1]s. If you were n
462462
[modal]
463463
yes = Yes
464464
no = No
465+
confirm = Confirm
466+
cancel = Cancel
465467
modify = Update
466468

467469
[form]

‎templates/admin/auth/edit.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,14 +440,14 @@
440440
</div>
441441
</div>
442442

443-
<div class="ui small basic delete modal">
444-
<div class="ui icon header">
443+
<div class="ui gitea-confirm-modal delete modal">
444+
<div class="header">
445445
{{svg "octicon-trash"}}
446446
{{.locale.Tr "admin.auths.delete_auth_title"}}
447447
</div>
448448
<div class="content">
449449
<p>{{.locale.Tr "admin.auths.delete_auth_desc"}}</p>
450450
</div>
451-
{{template "base/delete_modal_actions" .}}
451+
{{template "base/modal_actions_confirm" .}}
452452
</div>
453453
{{template "base/footer" .}}

‎templates/admin/emails/list.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@
7373

7474
{{template "base/paginate" .}}
7575

76-
<div class="ui basic modal" id="change-email-modal">
77-
<div class="ui icon header">
76+
<div class="ui gitea-confirm-modal modal" id="change-email-modal">
77+
<div class="header">
7878
{{.locale.Tr "admin.emails.change_email_header"}}
7979
</div>
80-
<div class="content center">
80+
<div class="content">
8181
<p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
8282

8383
<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
@@ -94,7 +94,7 @@
9494
<input type="hidden" id="form-activate" name="activate" value="" required>
9595

9696
<div class="center">
97-
{{template "base/delete_modal_actions" .}}
97+
{{template "base/modal_actions_confirm" .}}
9898
</div>
9999
</form>
100100
</div>

‎templates/admin/monitor.tmpl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@
3737
{{template "admin/process" .}}
3838
</div>
3939
</div>
40-
<div class="ui small basic delete modal">
41-
<div class="ui icon header">
42-
{{svg "octicon-x" 16 "close inside"}}
40+
<div class="ui gitea-confirm-modal delete modal">
41+
<div class="header">
4342
{{.locale.Tr "admin.monitor.process.cancel"}}
4443
</div>
4544
<div class="content">
4645
<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
4746
<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
4847
</div>
49-
{{template "base/delete_modal_actions" .}}
48+
{{template "base/modal_actions_confirm" .}}
5049
</div>
5150
{{template "base/footer" .}}

‎templates/admin/notice.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
</div>
7373

7474
<div class="ui modal admin" id="detail-modal">
75-
{{svg "octicon-x" 16 "close inside"}}
7675
<div class="header">{{$.locale.Tr "admin.notices.view_detail_header"}}</div>
7776
<div class="content">
7877
<div class="sub header"></div>

‎templates/admin/packages/list.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@
8080
</div>
8181
</div>
8282

83-
<div class="ui small basic delete modal">
84-
<div class="ui icon header">
83+
<div class="ui gitea-confirm-modal delete modal">
84+
<div class="header">
8585
{{svg "octicon-trash"}}
8686
{{.locale.Tr "packages.settings.delete"}}
8787
</div>
8888
<div class="content">
8989
{{.locale.Tr "packages.settings.delete.notice" `<span class="name"></span>` `<span class="dataVersion"></span>` | Safe}}
9090
</div>
91-
{{template "base/delete_modal_actions" .}}
91+
{{template "base/modal_actions_confirm" .}}
9292
</div>
9393
{{template "base/footer" .}}

‎templates/admin/queue.tmpl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,15 @@
181181
</div>
182182
</div>
183183
</div>
184-
<div class="ui small basic delete modal">
185-
<div class="ui icon header">
186-
{{svg "octicon-x" 16 "close inside"}}
184+
<div class="ui gitea-confirm-modal delete modal">
185+
<div class="header">
187186
{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
188187
</div>
189188
<div class="content">
190189
<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
191190
<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
192191
</div>
193-
{{template "base/delete_modal_actions" .}}
192+
{{template "base/modal_actions_confirm" .}}
194193
</div>
195194

196195
{{template "base/footer" .}}

‎templates/admin/repo/list.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
</div>
9696
</div>
9797

98-
<div class="ui small basic delete modal">
99-
<div class="ui icon header">
98+
<div class="ui gitea-confirm-modal delete modal">
99+
<div class="header">
100100
{{svg "octicon-trash"}}
101101
{{.locale.Tr "repo.settings.delete"}}
102102
</div>
@@ -105,6 +105,6 @@
105105
{{.locale.Tr "repo.settings.delete_notices_2" `<span class="name"></span>` | Safe}}<br>
106106
{{.locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
107107
</div>
108-
{{template "base/delete_modal_actions" .}}
108+
{{template "base/modal_actions_confirm" .}}
109109
</div>
110110
{{template "base/footer" .}}

‎templates/admin/repo/unadopted.tmpl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<span class="name">{{$dir}}</span>
3030
<div class="right floated content">
3131
<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
32-
<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
33-
{{svg "octicon-x" 16 "close inside"}}
32+
<div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
3433
<div class="header">
3534
<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
3635
</div>
@@ -43,7 +42,7 @@
4342
<input type="hidden" name="action" value="adopt">
4443
<input type="hidden" name="q" value="{{$.Keyword}}">
4544
<input type="hidden" name="page" value="{{$.CurrentPage}}">
46-
<div class="actions">
45+
<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
4746
<button class="ui red basic inverted cancel button">
4847
{{svg "octicon-trash" 16 "gt-mr-2"}}
4948
{{$.locale.Tr "modal.no"}}
@@ -56,8 +55,7 @@
5655
</form>
5756
</div>
5857
<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>
59-
<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
60-
{{svg "octicon-x" 16 "close inside"}}
58+
<div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
6159
<div class="header">
6260
<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
6361
</div>
@@ -70,7 +68,7 @@
7068
<input type="hidden" name="action" value="delete">
7169
<input type="hidden" name="q" value="{{$.Keyword}}">
7270
<input type="hidden" name="page" value="{{$.CurrentPage}}">
73-
<div class="actions">
71+
<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
7472
<button class="ui red basic inverted cancel button">
7573
{{svg "octicon-trash" 16 "gt-mr-2"}}
7674
{{$.locale.Tr "modal.no"}}

‎templates/admin/stacktrace.tmpl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@
1818
</div>
1919
</div>
2020
</div>
21-
<div class="ui small basic delete modal">
22-
<div class="ui icon header">
23-
{{svg "octicon-x" 16 "close inside"}}
21+
<div class="ui gitea-confirm-modal delete modal">
22+
<div class="header">
2423
{{.locale.Tr "admin.monitor.process.cancel"}}
2524
</div>
2625
<div class="content">
2726
<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
2827
<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
2928
</div>
30-
{{template "base/delete_modal_actions" .}}
29+
{{template "base/modal_actions_confirm" .}}
3130
</div>
3231

3332
{{template "base/footer" .}}

‎templates/admin/user/edit.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@
196196
</div>
197197
</div>
198198

199-
<div class="ui small basic delete modal" id="delete-user-modal">
200-
<div class="ui icon header">
199+
<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal">
200+
<div class="header">
201201
{{svg "octicon-trash"}}
202202
{{.locale.Tr "settings.delete_account_title"}}
203203
</div>
@@ -213,7 +213,7 @@
213213
</div>
214214
<p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
215215
</div>
216-
{{template "base/delete_modal_actions" .}}
216+
{{template "base/modal_actions_confirm" .}}
217217
</form>
218218
</div>
219219
{{template "base/footer" .}}

‎templates/base/delete_modal_actions.tmpl

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎templates/base/modal_actions_confirm.tmpl

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{{/*
2+
Template Attributes:
3+
* locale
4+
* ModalButtonStyle: "yes" (default) or "confirm"
5+
* ModalButtonCancelText
6+
* ModalButtonOkText
7+
8+
The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally
9+
*/}}
10+
<div class="actions">
11+
{{$textNegitive := .locale.Tr "modal.no"}}
12+
{{$textPositive := .locale.Tr "modal.yes"}}
13+
{{if eq .ModalButtonStyle "confirm"}}
14+
{{$textNegitive = .locale.Tr "modal.cancel"}}
15+
{{$textPositive = .locale.Tr "modal.confirm"}}
16+
{{end}}
17+
{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}}
18+
{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}
19+
<button class="ui red cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button>
20+
<button class="ui green ok button">{{svg "octicon-check"}} {{$textPositive}}</button>
21+
</div>

‎templates/org/member/members.tmpl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,23 @@
8181
{{template "base/paginate" .}}
8282
</div>
8383
</div>
84-
<div class="ui small basic delete modal" id="leave-organization">
85-
<div class="ui icon header">
86-
{{svg "octicon-x" 16 "close inside"}}
84+
<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
85+
<div class="header">
8786
{{$.locale.Tr "org.members.leave"}}
8887
</div>
8988
<div class="content">
9089
<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
9190
</div>
92-
{{template "base/delete_modal_actions" .}}
91+
{{template "base/modal_actions_confirm" .}}
9392
</div>
94-
<div class="ui small basic delete modal" id="remove-organization-member">
95-
<div class="ui icon header">
96-
{{svg "octicon-x" 16 "close inside"}}
93+
<div class="ui gitea-confirm-modal delete modal" id="remove-organization-member">
94+
<div class="header">
9795
{{$.locale.Tr "org.members.remove"}}
9896
</div>
9997
<div class="content">
10098
<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataOrganizationName"></span>` | Safe}}</p>
10199
</div>
102-
{{template "base/delete_modal_actions" .}}
100+
{{template "base/modal_actions_confirm" .}}
103101
</div>
104102

105103
{{template "base/footer" .}}

‎templates/org/settings/delete.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
</div>
3030
</div>
3131

32-
<div class="ui small basic delete modal">
33-
<div class="ui icon header">
32+
<div class="ui gitea-confirm-modal delete modal">
33+
<div class="header">
3434
{{svg "octicon-trash"}}
3535
{{.locale.Tr "org.settings.delete_org_title"}}
3636
</div>
3737
<div class="content">
3838
<p>{{.locale.Tr "org.settings.delete_org_desc"}}</p>
3939
</div>
40-
{{template "base/delete_modal_actions" .}}
40+
{{template "base/modal_actions_confirm" .}}
4141
</div>
4242
{{template "base/footer" .}}

‎templates/org/team/members.tmpl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,13 @@
6464
</div>
6565
</div>
6666
</div>
67-
<div class="ui small basic delete modal" id="remove-team-member">
68-
<div class="ui icon header">
69-
{{svg "octicon-x" 16 "close inside"}}
67+
<div class="ui gitea-confirm-modal delete modal" id="remove-team-member">
68+
<div class="header">
7069
{{$.locale.Tr "org.members.remove"}}
7170
</div>
7271
<div class="content">
7372
<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataTeamName"></span>` | Safe}}</p>
7473
</div>
75-
{{template "base/delete_modal_actions" .}}
74+
{{template "base/modal_actions_confirm" .}}
7675
</div>
7776
{{template "base/footer" .}}

‎templates/org/team/new.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@
148148
</div>
149149
</div>
150150

151-
<div class="ui small basic delete modal">
152-
<div class="ui icon header">
151+
<div class="ui gitea-confirm-modal delete modal">
152+
<div class="header">
153153
{{svg "octicon-trash"}}
154154
{{.locale.Tr "org.teams.delete_team_title"}}
155155
</div>
156156
<div class="content">
157157
<p>{{.locale.Tr "org.teams.delete_team_desc"}}</p>
158158
</div>
159-
{{template "base/delete_modal_actions" .}}
159+
{{template "base/modal_actions_confirm" .}}
160160
</div>
161161
{{template "base/footer" .}}

‎templates/org/team/repositories.tmpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,26 @@
6464
</div>
6565
</div>
6666

67-
<div class="ui small basic delete modal" id="org-team-remove-all-repo">
68-
<div class="ui icon header">
67+
<div class="ui gitea-confirm-modal delete modal" id="org-team-remove-all-repo">
68+
<div class="header">
6969
{{svg "octicon-trash"}}
7070
{{.locale.Tr "org.teams.remove_all_repos_title"}}
7171
</div>
7272
<div class="content">
7373
<p>{{.locale.Tr "org.teams.remove_all_repos_desc"}}</p>
7474
</div>
75-
{{template "base/delete_modal_actions" .}}
75+
{{template "base/modal_actions_confirm" .}}
7676
</div>
7777

78-
<div class="ui small basic addall modal" id="org-team-add-all-repo">
79-
<div class="ui icon header">
78+
<div class="ui gitea-confirm-modal addall modal" id="org-team-add-all-repo">
79+
<div class="header">
8080
{{svg "octicon-globe"}}
8181
{{.locale.Tr "org.teams.add_all_repos_title"}}
8282
</div>
8383
<div class="content">
8484
<p>{{.locale.Tr "org.teams.add_all_repos_desc"}}</p>
8585
</div>
86-
{{template "base/delete_modal_actions" .}}
86+
{{template "base/modal_actions_confirm" .}}
8787
</div>
8888

8989
{{template "base/footer" .}}

‎templates/org/team/sidebar.tmpl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,12 @@
8383
</div>
8484
{{end}}
8585
</div>
86-
<div class="ui small basic delete modal" id="leave-team-sidebar">
87-
<div class="ui icon header">
88-
{{svg "octicon-x" 16 "close inside"}}
86+
<div class="ui gitea-confirm-modal delete modal" id="leave-team-sidebar">
87+
<div class="header">
8988
{{$.locale.Tr "org.teams.leave"}}
9089
</div>
9190
<div class="content">
9291
<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
9392
</div>
94-
{{template "base/delete_modal_actions" .}}
93+
{{template "base/modal_actions_confirm" .}}
9594
</div>

‎templates/org/team/teams.tmpl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,13 @@
4343
</div>
4444
</div>
4545
</div>
46-
<div class="ui small basic delete modal" id="leave-team">
47-
<div class="ui icon header">
48-
{{svg "octicon-x" 16 "close inside"}}
46+
<div class="ui gitea-confirm-modal delete modal" id="leave-team">
47+
<div class="header">
4948
{{$.locale.Tr "org.teams.leave"}}
5049
</div>
5150
<div class="content">
5251
<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
5352
</div>
54-
{{template "base/delete_modal_actions" .}}
53+
{{template "base/modal_actions_confirm" .}}
5554
</div>
5655
{{template "base/footer" .}}

0 commit comments

Comments
 (0)