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/org | |
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/org')
-rw-r--r-- | templates/org/member/members.tmpl | 4 | ||||
-rw-r--r-- | templates/org/settings/delete.tmpl | 2 | ||||
-rw-r--r-- | templates/org/team/members.tmpl | 2 | ||||
-rw-r--r-- | templates/org/team/new.tmpl | 2 | ||||
-rw-r--r-- | templates/org/team/repositories.tmpl | 4 | ||||
-rw-r--r-- | templates/org/team/sidebar.tmpl | 2 | ||||
-rw-r--r-- | templates/org/team/teams.tmpl | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 7b6c83cfcc..d6ab265ea8 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -81,7 +81,7 @@ {{template "base/paginate" .}} </div> </div> -<div class="ui gitea-confirm-modal delete modal" id="leave-organization"> +<div class="ui g-modal-confirm delete modal" id="leave-organization"> <div class="header"> {{$.locale.Tr "org.members.leave"}} </div> @@ -90,7 +90,7 @@ </div> {{template "base/modal_actions_confirm" .}} </div> -<div class="ui gitea-confirm-modal delete modal" id="remove-organization-member"> +<div class="ui g-modal-confirm delete modal" id="remove-organization-member"> <div class="header"> {{$.locale.Tr "org.members.remove"}} </div> diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 1cfe1f16cd..9c8644da27 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -21,7 +21,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 "org.settings.delete_org_title"}} diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index e387090b3b..5f520f24a1 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -64,7 +64,7 @@ </div> </div> </div> -<div class="ui gitea-confirm-modal delete modal" id="remove-team-member"> +<div class="ui g-modal-confirm delete modal" id="remove-team-member"> <div class="header"> {{$.locale.Tr "org.members.remove"}} </div> diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 2860ea497b..0cba09be51 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -148,7 +148,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 "org.teams.delete_team_title"}} diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 41561da311..86b4a212d1 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -64,7 +64,7 @@ </div> </div> -<div class="ui gitea-confirm-modal delete modal" id="org-team-remove-all-repo"> +<div class="ui g-modal-confirm delete modal" id="org-team-remove-all-repo"> <div class="header"> {{svg "octicon-trash"}} {{.locale.Tr "org.teams.remove_all_repos_title"}} @@ -75,7 +75,7 @@ {{template "base/modal_actions_confirm" .}} </div> -<div class="ui gitea-confirm-modal addall modal" id="org-team-add-all-repo"> +<div class="ui g-modal-confirm addall modal" id="org-team-add-all-repo"> <div class="header"> {{svg "octicon-globe"}} {{.locale.Tr "org.teams.add_all_repos_title"}} diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index f265255256..f215dd52cd 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -83,7 +83,7 @@ </div> {{end}} </div> -<div class="ui gitea-confirm-modal delete modal" id="leave-team-sidebar"> +<div class="ui g-modal-confirm delete modal" id="leave-team-sidebar"> <div class="header"> {{$.locale.Tr "org.teams.leave"}} </div> diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index c31b6caf1c..9148a45e5a 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -43,7 +43,7 @@ </div> </div> </div> -<div class="ui gitea-confirm-modal delete modal" id="leave-team"> +<div class="ui g-modal-confirm delete modal" id="leave-team"> <div class="header"> {{$.locale.Tr "org.teams.leave"}} </div> |