mirror of https://github.com/go-gitea/gitea
Refactor delete_modal_actions template and use it for project column related actions (#24097)
Co-Author: @wxiaoguang
This PR is to fix
https://github.com/go-gitea/gitea/issues/23318#issuecomment-1506275446 .
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](4299c3b7db/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 <wxiaoguang@gmail.com>
pull/24246/head^2
Hester Gong
2 years ago
committed by
GitHub
parent
5e389228f6
commit
476a043a5f
@ -1,10 +0,0 @@ |
||||
<div class="actions"> |
||||
<button class="ui red basic inverted cancel button"> |
||||
{{svg "octicon-x"}} |
||||
{{.locale.Tr "modal.no"}} |
||||
</button> |
||||
<button class="ui green basic inverted ok button"> |
||||
{{svg "octicon-check"}} |
||||
{{.locale.Tr "modal.yes"}} |
||||
</button> |
||||
</div> |
||||
@ -0,0 +1,21 @@ |
||||
{{/* |
||||
Template Attributes: |
||||
* locale |
||||
* ModalButtonStyle: "yes" (default) or "confirm" |
||||
* ModalButtonCancelText |
||||
* ModalButtonOkText |
||||
|
||||
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"}} |
||||
{{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> |
||||
@ -1,10 +1,10 @@ |
||||
<div class="ui small basic delete modal"> |
||||
<div class="ui icon header"> |
||||
<div class="ui gitea-confirm-modal delete modal"> |
||||
<div class="header"> |
||||
{{svg "octicon-trash"}} |
||||
{{.locale.Tr "repo.settings.webhook_deletion"}} |
||||
</div> |
||||
<div class="content"> |
||||
<p>{{.locale.Tr "repo.settings.webhook_deletion_desc"}}</p> |
||||
</div> |
||||
{{template "base/delete_modal_actions" .}} |
||||
{{template "base/modal_actions_confirm" .}} |
||||
</div> |
||||
|
||||
@ -0,0 +1,47 @@ |
||||
.ui.modal.gitea-confirm-modal { |
||||
max-width: min(800px, 90vw); |
||||
width: fit-content; |
||||
} |
||||
|
||||
.ui.modal > .header { |
||||
/* can't use display:flex, because some headers have space-separated elements, eg: delete branch modal */ |
||||
color: var(--color-text-dark); |
||||
background: var(--color-body); |
||||
border-color: var(--color-secondary); |
||||
border-top-left-radius: var(--border-radius); |
||||
border-top-right-radius: var(--border-radius); |
||||
vertical-align: middle; |
||||
} |
||||
|
||||
.ui.modal > .header .svg { |
||||
vertical-align: middle; |
||||
display: inline-block; |
||||
} |
||||
|
||||
/* Gitea sometimes use a form in a modal dialog, then the "positive" button could submit the form directly */ |
||||
|
||||
.ui.modal > .content, |
||||
.ui.modal > form > .content { |
||||
background: var(--color-body); |
||||
} |
||||
|
||||
.ui.modal > .actions, |
||||
.ui.modal > form > .actions { |
||||
background: var(--color-secondary-bg); |
||||
border-color: var(--color-secondary); |
||||
|
||||
/* these styles are from Fomantic UI */ |
||||
padding: 1rem; |
||||
text-align: right; |
||||
} |
||||
|
||||
/* positive/negative action buttons */ |
||||
.ui.modal .actions > .ui.button { |
||||
display: inline-flex; |
||||
align-items: center; |
||||
padding: 10px 12px 10px 10px; |
||||
} |
||||
|
||||
.ui.modal .actions > .ui.button .svg { |
||||
margin-right: 5px; |
||||
} |
||||
Loading…
Reference in new issue