Skip to content

Commit bb7fcf7

Browse files
wxiaoguangwxiaoguang
committed
temp
1 parent 4ce5236 commit bb7fcf7

File tree

7 files changed

+47
-55
lines changed

7 files changed

+47
-55
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/base/modal_actions_confirm.tmpl

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
{{/*
22
Template Attributes:
3+
* locale
4+
* ModalButtonStyle: "yes" (default) or "confirm"
35
* ModalButtonCancelText
46
* ModalButtonOkText
57

68
The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally
79
*/}}
810
<div class="actions">
9-
<button class="ui red cancel button">
10-
{{svg "octicon-x"}}
11-
{{if .ModalButtonCancelText}}{{.ModalButtonCancelText}}{{else}}{{.locale.Tr "modal.no"}}{{end}}
12-
</button>
13-
<button class="ui green ok button">
14-
{{svg "octicon-check"}}
15-
{{if .ModalButtonOkText}}{{.ModalButtonOkText}}{{else}}{{.locale.Tr "modal.yes"}}{{end}}
16-
</button>
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>
1721
</div>

‎templates/projects/view.tmpl

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,7 @@
157157
<div class="content center">
158158
<label id="default-project-board-content"></label>
159159
</div>
160-
{{$ModalButtonCancelText := $.locale.Tr "settings.cancel"}}
161-
{{- $ModalButtonOkText := $.locale.Tr "repo.projects.column.set_default" -}}
162-
{{- if .Default -}}
163-
{{- $ModalButtonOkText = $.locale.Tr "repo.projects.column.unset_default" -}}
164-
{{- end -}}
165-
{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
160+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
166161
</div>
167162

168163
<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -174,8 +169,7 @@
174169
{{$.locale.Tr "repo.projects.column.deletion_desc"}}
175170
</label>
176171
</div>
177-
{{$ModalButtonOkText := $.locale.Tr "repo.projects.column.delete"}}
178-
{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
172+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
179173
</div>
180174
</div>
181175
</div>

‎templates/repo/projects/view.tmpl

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,7 @@
163163
<div class="content center">
164164
<label id="default-project-board-content"></label>
165165
</div>
166-
{{$ModalButtonCancelText := $.locale.Tr "settings.cancel"}}
167-
{{- $ModalButtonOkText := $.locale.Tr "repo.projects.column.set_default" -}}
168-
{{- if .Default -}}
169-
{{- $ModalButtonOkText = $.locale.Tr "repo.projects.column.unset_default" -}}
170-
{{- end -}}
171-
{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
166+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
172167
</div>
173168

174169
<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
@@ -180,8 +175,7 @@
180175
{{$.locale.Tr "repo.projects.column.deletion_desc"}}
181176
</label>
182177
</div>
183-
{{$ModalButtonOkText := $.locale.Tr "repo.projects.column.delete"}}
184-
{{template "base/modal_actions_confirm" (dict "." $ "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
178+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
185179
</div>
186180
</div>
187181
</div>

‎web_src/css/base.css

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,37 +1140,6 @@ a.ui.card:hover {
11401140
color: var(--color-text);
11411141
}
11421142

1143-
.ui.modal {
1144-
background: var(--color-body);
1145-
}
1146-
1147-
.ui.modal > .header {
1148-
color: var(--color-text-dark);
1149-
background: var(--color-secondary-bg);
1150-
border-color: var(--color-secondary);
1151-
border-top-left-radius: var(--border-radius);
1152-
border-top-right-radius: var(--border-radius);
1153-
}
1154-
1155-
.ui.modal > .content {
1156-
background: var(--color-body);
1157-
text-align: left !important;
1158-
}
1159-
1160-
.ui.modal > .actions {
1161-
background: var(--color-secondary-bg);
1162-
border-color: var(--color-secondary);
1163-
text-align: center;
1164-
}
1165-
1166-
.ui.modal > .close.inside {
1167-
color: var(--color-text);
1168-
}
1169-
1170-
.ui.modal > form > .actions {
1171-
text-align: center;
1172-
}
1173-
11741143
.ui.basic.table > tbody > tr {
11751144
border-color: var(--color-secondary);
11761145
}

‎web_src/css/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
@import "./features/codeeditor.css";
1111
@import "./features/projects.css";
1212
@import "./modules/tippy.css";
13+
@import "./modules/modal.css";
1314
@import "./code/linebutton.css";
1415
@import "./markup/content.css";
1516
@import "./markup/codecopy.css";

‎web_src/css/modules/modal.css

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
.ui.modal {
2+
background: var(--color-body);
3+
}
4+
5+
.ui.modal > .header {
6+
color: var(--color-text-dark);
7+
background: var(--color-secondary-bg);
8+
border-color: var(--color-secondary);
9+
border-top-left-radius: var(--border-radius);
10+
border-top-right-radius: var(--border-radius);
11+
}
12+
13+
.ui.modal > .content {
14+
background: var(--color-body);
15+
}
16+
17+
.ui.modal > .actions {
18+
background: var(--color-secondary-bg);
19+
border-color: var(--color-secondary);
20+
}
21+
22+
.ui.modal > .close.inside {
23+
color: var(--color-text);
24+
}
25+
26+
.ui.modal > form > .actions {
27+
text-align: center;
28+
}

0 commit comments

Comments
 (0)