diff options
author | Hester Gong <hestergong@gmail.com> | 2023-04-23 17:24:19 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-23 17:24:19 +0800 |
commit | 476a043a5fb2b472e2aaced450ac2a0c9102854e (patch) | |
tree | fcbc301d7fca09eee292cdd039a6980a88aefa63 /templates/projects/view.tmpl | |
parent | 5e389228f61844c0d59d5bc5974483dae0aa1b8b (diff) | |
download | gitea-476a043a5fb2b472e2aaced450ac2a0c9102854e.tar.gz gitea-476a043a5fb2b472e2aaced450ac2a0c9102854e.zip |
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](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 <wxiaoguang@gmail.com>
Diffstat (limited to 'templates/projects/view.tmpl')
-rw-r--r-- | templates/projects/view.tmpl | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 338524d153..34eaf93670 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -99,7 +99,6 @@ data-modal="#default-project-board-modal-{{.ID}}" data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}" data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}" - data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}" data-url="{{$.Link}}/{{.ID}}/default"> {{svg "octicon-pin"}} {{$.locale.Tr "repo.projects.column.set_default"}} @@ -109,13 +108,15 @@ data-modal="#default-project-board-modal-{{.ID}}" data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}" data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}" - data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}" data-url="{{$.Link}}/{{.ID}}/unsetdefault"> {{svg "octicon-pin"}} {{$.locale.Tr "repo.projects.column.unset_default"}} </a> {{end}} - <a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}"> + <a class="item show-modal button show-delete-column-modal" + data-modal="#delete-board-modal-{{.ID}}" + data-url="{{$.Link}}/{{.ID}}" + > {{svg "octicon-trash"}} {{$.locale.Tr "repo.projects.column.delete"}} </a> @@ -149,32 +150,26 @@ </div> </div> - <div class="ui basic modal default-project-board-modal" id="default-project-board-modal-{{.ID}}"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}"> + <div class="header"> <span id="default-project-board-header"></span> </div> - <div class="content center"> + <div class="content"> <label id="default-project-board-content"></label> </div> - <div class="text right actions"> - <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button> - <button class="ui primary button default-project-board-button" id="default-project-board-submit"></button> - </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}} </div> - <div class="ui basic modal" id="delete-board-modal-{{.ID}}"> - <div class="ui icon header"> + <div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}"> + <div class="header"> {{$.locale.Tr "repo.projects.column.delete"}} </div> - <div class="content center"> + <div class="content"> <label> {{$.locale.Tr "repo.projects.column.deletion_desc"}} </label> </div> - <div class="text right actions">{{/* TODO: convert to base/delete_modal_actions.tmpl */}} - <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button> - <button class="ui red button delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button> - </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}} </div> </div> </div> @@ -277,14 +272,14 @@ </div> {{if .CanWriteProjects}} - <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.projects.deletion"}} </div> <div class="content"> <p>{{.locale.Tr "repo.projects.deletion_desc"}}</p> </div> - {{template "base/delete_modal_actions" .}} + {{template "base/modal_actions_confirm" .}} </div> {{end}} |