Skip to content

Commit 4a259ff

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 67da4c1 commit 4a259ff

File tree

11 files changed

+108
-64
lines changed

11 files changed

+108
-64
lines changed

‎templates/admin/repo/unadopted.tmpl

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,7 @@
3939
<input type="hidden" name="action" value="adopt">
4040
<input type="hidden" name="q" value="{{$.Keyword}}">
4141
<input type="hidden" name="page" value="{{$.CurrentPage}}">
42-
<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
43-
<button class="ui red basic inverted cancel button">
44-
{{svg "octicon-trash" 16 "gt-mr-2"}}
45-
{{$.locale.Tr "modal.no"}}
46-
</button>
47-
<button class="ui green basic inverted ok button">
48-
{{svg "octicon-check" 16 "gt-mr-2"}}
49-
{{$.locale.Tr "modal.yes"}}
50-
</button>
51-
</div>
42+
{{template "base/modal_actions_confirm" (dict "locale" $.locale)}}
5243
</form>
5344
</div>
5445
<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>
@@ -65,16 +56,7 @@
6556
<input type="hidden" name="action" value="delete">
6657
<input type="hidden" name="q" value="{{$.Keyword}}">
6758
<input type="hidden" name="page" value="{{$.CurrentPage}}">
68-
<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
69-
<button class="ui red basic inverted cancel button">
70-
{{svg "octicon-trash" 16 "gt-mr-2"}}
71-
{{$.locale.Tr "modal.no"}}
72-
</button>
73-
<button class="ui green basic inverted ok button">
74-
{{svg "octicon-check" 16 "gt-mr-2"}}
75-
{{$.locale.Tr "modal.yes"}}
76-
</button>
77-
</div>
59+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
7860
</form>
7961
</div>
8062
</div>

‎templates/base/modal_actions_confirm.tmpl

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,43 @@
11
{{/*
22
Template Attributes:
33
* locale
4-
* ModalButtonStyle: "yes" (default) or "confirm"
4+
5+
Two buttons:
6+
7+
* ModalButtonTypes: "yes" (default) or "confirm"
8+
* ModalButtonColors: "green-red" (default) / "blue" / "yellow"
59
* ModalButtonCancelText
610
* ModalButtonOkText
711

12+
Single button:
13+
14+
* ModalButtonDangerText "This action will destroy your data"
15+
816
The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally
917
*/}}
1018
<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"}}
19+
{{if .ModalButtonDangerText}}
20+
<button class="ui danger red ok button">{{.ModalButtonDangerText}}</button>
21+
{{else}}
22+
{{$textNegitive := .locale.Tr "modal.no"}}
23+
{{$textPositive := .locale.Tr "modal.yes"}}
24+
{{if eq .ModalButtonTypes "confirm"}}
25+
{{$textNegitive = .locale.Tr "modal.cancel"}}
26+
{{$textPositive = .locale.Tr "modal.confirm"}}
27+
{{end}}
28+
{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}}
29+
{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}
30+
31+
{{$styleNegative := "red"}}
32+
{{$stylePositive := "green"}}
33+
{{if eq .ModalButtonColors "blue"}}
34+
{{$styleNegative = "secondary basic"}}
35+
{{$stylePositive = "blue"}}
36+
{{else if eq .ModalButtonColors "yellow"}}
37+
{{$styleNegative = "secondary basic"}}
38+
{{$stylePositive = "yellow"}}
39+
{{end}}
40+
<button class="ui {{$styleNegative}} cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button>
41+
<button class="ui {{$stylePositive}} ok button">{{svg "octicon-check"}} {{$textPositive}}</button>
1642
{{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>
2143
</div>

‎templates/devtest/fomantic-modal.tmpl

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{{template "base/head" .}}
2+
<div class="page-content devtest ui container">
3+
4+
<div class="ui gitea-confirm-modal modal" id="test-modal-default">
5+
<div class="header">{{svg "octicon-file"}} Default dialog <span>title</span></div>
6+
<div class="content">
7+
very long aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
8+
</div>
9+
{{template "base/modal_actions_confirm" (dict "locale" $.locale)}}
10+
</div>
11+
12+
<div class="ui gitea-confirm-modal modal" id="test-modal-confirm">
13+
<div class="header">Confirm dialog</div>
14+
<div class="content">hello, this is the modal dialog content</div>
15+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
16+
</div>
17+
18+
<div class="ui gitea-confirm-modal modal" id="test-modal-blue">
19+
<div class="header">Blue dialog</div>
20+
<div class="content">hello, this is the modal dialog content</div>
21+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "blue")}}
22+
</div>
23+
24+
<div class="ui gitea-confirm-modal modal" id="test-modal-yellow">
25+
<div class="header">yellow dialog</div>
26+
<div class="content">hello, this is the modal dialog content</div>
27+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
28+
</div>
29+
30+
<div class="ui gitea-confirm-modal modal" id="test-modal-danger">
31+
{{svg "octicon-x" 16 "inside close"}}
32+
<div class="header">dangerous action dialog</div>
33+
<div class="content">hello, this is the modal dialog content, this is a dangerous operation</div>
34+
{{template "base/modal_actions_confirm" (dict "ModalButtonDangerText" "This is a dangerous operation")}}
35+
</div>
36+
37+
<div class="modal-buttons"></div>
38+
<script type="module">
39+
for (const el of $('.ui.modal')) {
40+
const $btn = $('<button>').text(`Show ${el.id}`).on('click', () => {
41+
$(el).modal('show');
42+
});
43+
$('.modal-buttons').append($btn);
44+
}
45+
</script>
46+
<style>
47+
.modal-buttons button { margin: 5px; }
48+
</style>
49+
</div>
50+
{{template "base/footer" .}}

‎templates/projects/view.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<div class="content">
158158
<label id="default-project-board-content"></label>
159159
</div>
160-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
160+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
161161
</div>
162162

163163
<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
@@ -169,7 +169,7 @@
169169
{{$.locale.Tr "repo.projects.column.deletion_desc"}}
170170
</label>
171171
</div>
172-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
172+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
173173
</div>
174174
</div>
175175
</div>

‎templates/repo/editor/edit.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
<p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p>
6666
</div>
6767
<div class="actions">
68-
<button class="ui red basic cancel inverted button">
68+
<button class="ui red cancel button">
6969
{{svg "octicon-x"}}
7070
{{.locale.Tr "repo.editor.cancel"}}
7171
</button>
72-
<button class="ui green basic ok inverted button">
72+
<button class="ui green ok button">
7373
{{svg "fontawesome-save"}}
7474
{{.locale.Tr "repo.editor.commit_changes"}}
7575
</button>

‎templates/repo/editor/patch.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
<p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p>
4646
</div>
4747
<div class="actions">
48-
<button class="ui red basic inverted cancel button">
48+
<button class="ui red cancel button">
4949
{{svg "octicon-x"}}
5050
{{.locale.Tr "repo.editor.cancel"}}
5151
</button>
52-
<button class="ui green basic inverted ok button">
52+
<button class="ui green ok button">
5353
{{svg "fontawesome-save"}}
5454
{{.locale.Tr "repo.editor.commit_changes"}}
5555
</button>

‎templates/repo/projects/view.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
<div class="content">
164164
<label id="default-project-board-content"></label>
165165
</div>
166-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
166+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
167167
</div>
168168

169169
<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
@@ -175,7 +175,7 @@
175175
{{$.locale.Tr "repo.projects.column.deletion_desc"}}
176176
</label>
177177
</div>
178-
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
178+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
179179
</div>
180180
</div>
181181
</div>

‎templates/repo/settings/lfs.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,10 @@
4646
</p>
4747
<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
4848
{{$.CsrfTokenHtml}}
49-
<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
50-
<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
51-
<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
52-
</div>
49+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
5350
</form>
5451
</div>
5552
</div>
5653
{{end}}
5754
</div>
58-
</div>
5955
{{template "repo/settings/layout_footer" .}}

‎templates/user/settings/applications.tmpl

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -272,17 +272,7 @@
272272
<div class="content">
273273
<p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p>
274274
</div>
275-
276-
<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm.tmpl */}}
277-
<button class="ui green basic inverted cancel button">
278-
{{svg "octicon-x"}}
279-
{{.locale.Tr "settings.access_token_deletion_cancel_action"}}
280-
</button>
281-
<button class="ui red basic inverted ok button">
282-
{{svg "octicon-check"}}
283-
{{.locale.Tr "settings.access_token_deletion_confirm_action"}}
284-
</button>
285-
</div>
275+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
286276
</div>
287277

288278
{{template "user/settings/layout_footer" .}}

‎templates/user/settings/repos.tmpl

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,7 @@
4646
{{$.CsrfTokenHtml}}
4747
<input type="hidden" name="id" value="{{$dir}}">
4848
<input type="hidden" name="action" value="adopt">
49-
<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
50-
<button class="ui red basic inverted cancel button">
51-
{{svg "octicon-x"}}
52-
{{$.locale.Tr "modal.no"}}
53-
</button>
54-
<button class="ui green basic inverted ok button">
55-
{{svg "octicon-check"}}
56-
{{$.locale.Tr "modal.yes"}}
57-
</button>
58-
</div>
49+
{{template "base/modal_actions_confirm" .}}
5950
</form>
6051
</div>
6152
{{end}}

0 commit comments

Comments
 (0)