forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'giteaoffical/main'
* giteaoffical/main: Improve some modal action buttons (go-gitea#24289) Enable forbidigo linter (go-gitea#24278) Fix no edit/close/delete button in org repo project view page (go-gitea#24301) Replace whitespace inside template parens during make fmt (go-gitea#24293) Upgrade act (go-gitea#24298)
- Loading branch information
Showing
76 changed files
with
202 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,38 @@ | ||
{{/* | ||
Template Attributes: | ||
* locale | ||
* ModalButtonStyle: "yes" (default) or "confirm" | ||
|
||
Two buttons (negative, positive): | ||
* ModalButtonTypes: "yes" (default) or "confirm" | ||
* ModalButtonColors: "green" (default) / "blue" / "yellow" | ||
* ModalButtonCancelText | ||
* ModalButtonOkText | ||
|
||
Single danger button (GitHub-like): | ||
* ModalButtonDangerText "This action will destroy your data" | ||
|
||
The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally | ||
*/}} | ||
<div class="actions"> | ||
{{$textNegitive := .locale.Tr "modal.no"}} | ||
{{$textPositive := .locale.Tr "modal.yes"}} | ||
{{if eq .ModalButtonStyle "confirm"}} | ||
{{$textNegitive = .locale.Tr "modal.cancel"}} | ||
{{$textPositive = .locale.Tr "modal.confirm"}} | ||
{{if .ModalButtonDangerText}} | ||
<button class="ui danger red ok button">{{.ModalButtonDangerText}}</button> | ||
{{else}} | ||
{{$textNegitive := .locale.Tr "modal.no"}} | ||
{{$textPositive := .locale.Tr "modal.yes"}} | ||
{{if eq .ModalButtonTypes "confirm"}} | ||
{{$textNegitive = .locale.Tr "modal.cancel"}} | ||
{{$textPositive = .locale.Tr "modal.confirm"}} | ||
{{end}} | ||
{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}} | ||
{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}} | ||
|
||
{{$stylePositive := "green"}} | ||
{{if eq .ModalButtonColors "blue"}} | ||
{{$stylePositive = "blue"}} | ||
{{else if eq .ModalButtonColors "yellow"}} | ||
{{$stylePositive = "yellow"}} | ||
{{end}} | ||
<button class="ui secondary basic cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button> | ||
<button class="ui {{$stylePositive}} ok button">{{svg "octicon-check"}} {{$textPositive}}</button> | ||
{{end}} | ||
{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}} | ||
{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}} | ||
<button class="ui red cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button> | ||
<button class="ui green ok button">{{svg "octicon-check"}} {{$textPositive}}</button> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
{{template "base/head" .}} | ||
<div class="page-content devtest ui container"> | ||
<div class="ui g-modal-confirm modal" id="test-modal-default"> | ||
<div class="header">{{svg "octicon-file"}} Default dialog <span>title</span></div> | ||
<div class="content"> | ||
very long aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||
</div> | ||
{{template "base/modal_actions_confirm" (dict "locale" $.locale)}} | ||
</div> | ||
|
||
<div class="ui g-modal-confirm modal" id="test-modal-confirm"> | ||
<div class="header">Confirm dialog</div> | ||
<div class="content">hello, this is the modal dialog content</div> | ||
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} | ||
</div> | ||
|
||
<div class="ui g-modal-confirm modal" id="test-modal-blue"> | ||
<div class="header">Blue dialog</div> | ||
<div class="content">hello, this is the modal dialog content</div> | ||
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "blue")}} | ||
</div> | ||
|
||
<div class="ui g-modal-confirm modal" id="test-modal-yellow"> | ||
<div class="header">yellow dialog</div> | ||
<div class="content">hello, this is the modal dialog content</div> | ||
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}} | ||
</div> | ||
|
||
<div class="ui g-modal-confirm modal" id="test-modal-danger"> | ||
{{svg "octicon-x" 16 "inside close"}} | ||
<div class="header">dangerous action dialog</div> | ||
<div class="content">hello, this is the modal dialog content, this is a dangerous operation</div> | ||
{{template "base/modal_actions_confirm" (dict "ModalButtonDangerText" "I know and must do this is dangerous operation")}} | ||
</div> | ||
|
||
<div class="modal-buttons"></div> | ||
<script type="module"> | ||
for (const el of $('.ui.modal')) { | ||
const $btn = $('<button>').text(`Show ${el.id}`).on('click', () => { | ||
$(el).modal({onApprove() {alert('confirmed')}}).modal('show'); | ||
}); | ||
$('.modal-buttons').append($btn); | ||
} | ||
</script> | ||
<style> | ||
.modal-buttons button { margin: 5px; } | ||
</style> | ||
</div> | ||
{{template "base/footer" .}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.