diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-24 19:08:59 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-24 07:08:59 -0400 |
commit | 75c62054a633fc9ae25887f72da1ec2d08a31e90 (patch) | |
tree | aa36b43874d7c556120c04b646175d52de5ee10d /templates/admin | |
parent | 47748df9b38bdde4c39d7e55f4517536d9d2fa21 (diff) | |
download | gitea-75c62054a633fc9ae25887f72da1ec2d08a31e90.tar.gz gitea-75c62054a633fc9ae25887f72da1ec2d08a31e90.zip |
Improve some modal action buttons (#24289)
Follow #24097 and #24285
And add a devtest page for modal action button testing.
http://localhost:3000/devtest/fomantic-modal
Now the `modal_actions_confirm.tmpl` could support: green / blue /
yellow positive buttons, the negative button is "secondary".
ps: this PR is only a small improvement, there are still a lot of
buttons not having proper colors. In the future these buttons could be
improved by this approach.
These buttons could also be improved according to the conclusion of
#24285 in the future.
![image](https://user-images.githubusercontent.com/2114189/233847773-a6d6b29b-7b5c-490e-8425-40dfd0ad2529.png)
And add GitHub-like single danger button (context:
https://github.com/go-gitea/gitea/issues/24285#issuecomment-1519100312)
![image](https://user-images.githubusercontent.com/2114189/233891566-055d7611-894d-4d5a-baf5-f6369180bf8d.png)
---------
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'templates/admin')
-rw-r--r-- | templates/admin/auth/edit.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/emails/list.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/monitor.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/packages/list.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/queue.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/repo/list.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/repo/unadopted.tmpl | 26 | ||||
-rw-r--r-- | templates/admin/stacktrace.tmpl | 2 | ||||
-rw-r--r-- | templates/admin/user/edit.tmpl | 2 |
9 files changed, 12 insertions, 30 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index c39725699c..0aed59ffab 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -436,7 +436,7 @@ </div> </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "admin.auths.delete_auth_title"}} diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 05c6aa66b4..1da40cbf29 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -70,7 +70,7 @@ {{template "base/paginate" .}} - <div class="ui gitea-confirm-modal modal" id="change-email-modal"> + <div class="ui g-modal-confirm modal" id="change-email-modal"> <div class="header"> {{.locale.Tr "admin.emails.change_email_header"}} </div> diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl index 4b9e51503c..1ab6b75a1e 100644 --- a/templates/admin/monitor.tmpl +++ b/templates/admin/monitor.tmpl @@ -34,7 +34,7 @@ {{template "admin/process" .}} </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{.locale.Tr "admin.monitor.process.cancel"}} </div> diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 48046f4296..2edcad4b7b 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -76,7 +76,7 @@ {{template "base/paginate" .}} </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "packages.settings.delete"}} diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index 79b20dc1a4..d3052c91a9 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -178,7 +178,7 @@ </div> </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{.locale.Tr "admin.monitor.queue.pool.cancel"}} </div> diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 06c801774f..f9a0a6ef98 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -91,7 +91,7 @@ {{template "base/paginate" .}} </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.delete"}} diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index fa29cae1fe..3e47447178 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -26,7 +26,7 @@ <span class="name">{{$dir}}</span> <div class="right floated content"> <button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button> - <div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}"> + <div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}"> <div class="header"> <span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span> </div> @@ -39,20 +39,11 @@ <input type="hidden" name="action" value="adopt"> <input type="hidden" name="q" value="{{$.Keyword}}"> <input type="hidden" name="page" value="{{$.CurrentPage}}"> - <div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}} - <button class="ui red basic inverted cancel button"> - {{svg "octicon-trash" 16 "gt-mr-2"}} - {{$.locale.Tr "modal.no"}} - </button> - <button class="ui green basic inverted ok button"> - {{svg "octicon-check" 16 "gt-mr-2"}} - {{$.locale.Tr "modal.yes"}} - </button> - </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale)}} </form> </div> <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> - <div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}"> + <div class="ui g-modal-confirm modal" id="delete-unadopted-modal-{{$dirI}}"> <div class="header"> <span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span> </div> @@ -65,16 +56,7 @@ <input type="hidden" name="action" value="delete"> <input type="hidden" name="q" value="{{$.Keyword}}"> <input type="hidden" name="page" value="{{$.CurrentPage}}"> - <div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}} - <button class="ui red basic inverted cancel button"> - {{svg "octicon-trash" 16 "gt-mr-2"}} - {{$.locale.Tr "modal.no"}} - </button> - <button class="ui green basic inverted ok button"> - {{svg "octicon-check" 16 "gt-mr-2"}} - {{$.locale.Tr "modal.yes"}} - </button> - </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}} </form> </div> </div> diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index 1995404d91..2ffb9982f2 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -15,7 +15,7 @@ </div> </div> -<div class="ui gitea-confirm-modal delete modal"> +<div class="ui g-modal-confirm delete modal"> <div class="header"> {{.locale.Tr "admin.monitor.process.cancel"}} </div> diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index cd3175b493..30109cc923 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -192,7 +192,7 @@ </div> </div> -<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal"> +<div class="ui g-modal-confirm delete modal" id="delete-user-modal"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "settings.delete_account_title"}} |