Refactor delete_modal_actions template and use it for project column related actions...

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>

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index c0e94d3b8790325219702168b4712769bea93996..b4233d65d1ad8301a6e5cbd5b88cde888e938471 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -462,6 +462,8 @@ team_invite.text_3 = Note: This invitation was intended for %[1]s. If you were n
 [modal]
 yes = Yes
 no = No
+confirm = Confirm
+cancel = Cancel
 modify = Update
 
 [form]

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 49007e572da96b17709898220b332da7fd2ef75c..c3ff228ac05220e6566f7e838c26f0c89f0843ce 100644 (file)
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -440,14 +440,14 @@
        </div>
 </div>
 
-<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 "admin.auths.delete_auth_title"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "admin.auths.delete_auth_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index d8fa986cff3e336be59f6c8702d8b5eff46d016d..61af57109548c7e4d97ae25c510795f65b80ad96 100644 (file)
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -73,11 +73,11 @@
 
                {{template "base/paginate" .}}
 
-               <div class="ui basic modal" id="change-email-modal">
-                       <div class="ui icon header">
+               <div class="ui gitea-confirm-modal modal" id="change-email-modal">
+                       <div class="header">
                                {{.locale.Tr "admin.emails.change_email_header"}}
                        </div>
-                       <div class="content center">
+                       <div class="content">
                                <p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
 
                                <form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
@@ -94,7 +94,7 @@
                                        <input type="hidden" id="form-activate" name="activate" value="" required>
 
                                        <div class="center">
-                                               {{template "base/delete_modal_actions" .}}
+                                               {{template "base/modal_actions_confirm" .}}
                                        </div>
                                </form>
                        </div>

diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index d53e9e18dcc8c8a91930ada2cc958616b5fac581..4d66d3bfbb64a75e9959ca0ccc06cf85a25714df 100644 (file)
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -37,15 +37,14 @@
                {{template "admin/process" .}}
        </div>
 </div>
-<div class="ui small basic delete modal">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal">
+       <div class="header">
                {{.locale.Tr "admin.monitor.process.cancel"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
                <p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index dd17bde036ad397f74c48d4a90ce3bd26cd53721..850b6333f2447aa2d7714576b035a911117dd295 100644 (file)
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -72,7 +72,6 @@
 </div>
 
 <div class="ui modal admin" id="detail-modal">
-       {{svg "octicon-x" 16 "close inside"}}
        <div class="header">{{$.locale.Tr "admin.notices.view_detail_header"}}</div>
        <div class="content">
                <div class="sub header"></div>

diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 121f575861d991463c8dc73ceece5b0cdad08e73..6b3480d427557fad9b7332dbceb04843cf035e82 100644 (file)
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -80,14 +80,14 @@
        </div>
 </div>
 
-<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 "packages.settings.delete"}}
        </div>
        <div class="content">
                {{.locale.Tr "packages.settings.delete.notice" `<span class="name"></span>` `<span class="dataVersion"></span>` | Safe}}
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 767c235a385e1276ecc9b14ff27d3ba89fd19252..10c35bd59971c6763653e0640677dca29403e597 100644 (file)
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -181,16 +181,15 @@
                </div>
        </div>
 </div>
-<div class="ui small basic delete modal">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal">
+       <div class="header">
                {{.locale.Tr "admin.monitor.queue.pool.cancel"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
                <p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index f8e2bbc8444ef7d621d1ccbdb8f1ae155abe88ef..1574a376688ce3fbdf097f015f2b544311e97c94 100644 (file)
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -95,8 +95,8 @@
        </div>
 </div>
 
-<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.delete"}}
        </div>
@@ -105,6 +105,6 @@
                {{.locale.Tr "repo.settings.delete_notices_2" `<span class="name"></span>` | Safe}}<br>
                {{.locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index a8e04850d0dd3069debaa651869c41317fd27c65..fbb0bdf0e8ca1b778760be0f50398ed8993c1c80 100644 (file)
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -29,8 +29,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 basic modal" id="adopt-unadopted-modal-{{$dirI}}">
-                                                                                       {{svg "octicon-x" 16 "close inside"}}
+                                                                               <div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
                                                                                        <div class="header">
                                                                                                <span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
                                                                                        </div>
@@ -43,7 +42,7 @@
                                                                                                <input type="hidden" name="action" value="adopt">
                                                                                                <input type="hidden" name="q" value="{{$.Keyword}}">
                                                                                                <input type="hidden" name="page" value="{{$.CurrentPage}}">
-                                                                                               <div class="actions">
+                                                                                               <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"}}
@@ -56,8 +55,7 @@
                                                                                        </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 basic modal" id="delete-unadopted-modal-{{$dirI}}">
-                                                                                       {{svg "octicon-x" 16 "close inside"}}
+                                                                               <div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
                                                                                        <div class="header">
                                                                                                <span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
                                                                                        </div>
@@ -70,7 +68,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">
+                                                                                               <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"}}

diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 4e16036ae3a3c9af218916dc6dcc14c2b1f96ba5..2bef11fcf68dbffae5f60ca75598c2a60e9d5fe4 100644 (file)
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -18,16 +18,15 @@
                </div>
        </div>
 </div>
-<div class="ui small basic delete modal">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal">
+       <div class="header">
                {{.locale.Tr "admin.monitor.process.cancel"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
                <p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 4fd0d892f258dd4437c10939c84c423b05726956..6d916ae207c846fabeb603a8ce54eef151eacfcf 100644 (file)
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -196,8 +196,8 @@
        </div>
 </div>
 
-<div class="ui small basic delete modal" id="delete-user-modal">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.delete_account_title"}}
        </div>
@@ -213,7 +213,7 @@
                        </div>
                        <p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
                </div>
-               {{template "base/delete_modal_actions" .}}
+               {{template "base/modal_actions_confirm" .}}
        </form>
 </div>
 {{template "base/footer" .}}

diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
deleted file mode 100644 (file)
index 29bf5f9..0000000
--- a/templates/base/delete_modal_actions.tmpl
+++ /dev/null
@@ -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>

diff --git a/templates/base/modal_actions_confirm.tmpl b/templates/base/modal_actions_confirm.tmpl
new file mode 100644 (file)
index 0000000..361f214
--- /dev/null
+++ b/templates/base/modal_actions_confirm.tmpl
@@ -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>

diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 511d333c29c27126b5397400ae0b4d0fe1a57d51..7b6c83cfcc044a179a7d907208637c4b090f5759 100644 (file)
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -81,25 +81,23 @@
                {{template "base/paginate" .}}
        </div>
 </div>
-<div class="ui small basic delete modal" id="leave-organization">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
+       <div class="header">
                {{$.locale.Tr "org.members.leave"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
-<div class="ui small basic delete modal" id="remove-organization-member">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="remove-organization-member">
+       <div class="header">
                {{$.locale.Tr "org.members.remove"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataOrganizationName"></span>` | Safe}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 69e226f410a79cb67944c87f3d52d5ecb49060e9..e8a8f5b185aa24d9d0a1659bc14511028cdf0f15 100644 (file)
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -29,14 +29,14 @@
        </div>
 </div>
 
-<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 "org.settings.delete_org_title"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "org.settings.delete_org_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index bb975c0c4df7a4341f76cbbeb1ae19f8c63259bf..e387090b3b61731b44e223103d2acae348804e0a 100644 (file)
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -64,14 +64,13 @@
                </div>
        </div>
 </div>
-<div class="ui small basic delete modal" id="remove-team-member">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="remove-team-member">
+       <div class="header">
                {{$.locale.Tr "org.members.remove"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataTeamName"></span>` | Safe}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 2e65d635803190a67224abb895ec7f6d86074613..2860ea497b44de08cfc143c02793b92741c94d49 100644 (file)
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -148,14 +148,14 @@
        </div>
 </div>
 
-<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 "org.teams.delete_team_title"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "org.teams.delete_team_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 0ffd50226f2a2ad2f3c9f1a5d709e5a135c4a7ba..41561da3114455d618afa60ff5d2febd259a82ee 100644 (file)
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -64,26 +64,26 @@
        </div>
 </div>
 
-<div class="ui small basic delete modal" id="org-team-remove-all-repo">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="org-team-remove-all-repo">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "org.teams.remove_all_repos_title"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "org.teams.remove_all_repos_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui small basic addall modal" id="org-team-add-all-repo">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal addall modal" id="org-team-add-all-repo">
+       <div class="header">
                {{svg "octicon-globe"}}
                {{.locale.Tr "org.teams.add_all_repos_title"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "org.teams.add_all_repos_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index cecd8ddee6c1a51f991831a46999c94a0ef6f53a..f2652552569c93a3bccbfef8160efbfe671a4e33 100644 (file)
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -83,13 +83,12 @@
                </div>
        {{end}}
 </div>
-<div class="ui small basic delete modal" id="leave-team-sidebar">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="leave-team-sidebar">
+       <div class="header">
                {{$.locale.Tr "org.teams.leave"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index 27bbe80a3c53534554ae48534b906cbcd64918a0..c31b6caf1c1da696f76267970d254ce7c36a7e0a 100644 (file)
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -43,14 +43,13 @@
                </div>
        </div>
 </div>
-<div class="ui small basic delete modal" id="leave-team">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="leave-team">
+       <div class="header">
                {{$.locale.Tr "org.teams.leave"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl
index 875bf852bb98a43583f373dd817c1b3289cbcf5e..a443a8d27f4830a6bc8661022e45526497750e28 100644 (file)
--- a/templates/package/settings.tmpl
+++ b/templates/package/settings.tmpl
@@ -57,7 +57,7 @@
                                                <form class="ui form" action="{{.Link}}" method="post">
                                                        {{.CsrfTokenHtml}}
                                                        <input type="hidden" name="action" value="delete">
-                                                       {{template "base/delete_modal_actions" .}}
+                                                       {{template "base/modal_actions_confirm" .}}
                                                </form>
                                        </div>
                                </div>

diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index ae9e3a0d118705c04a7bc5273e5d20ea24981703..bcb402601ce0df40640c3698de55c059b9684180 100644 (file)
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -76,14 +76,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}}

diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 338524d153699d4336d34fb6e21b967cf8c7d3db..34eaf9367053edc0860b4ea1f6d14e7d79fbc764 100644 (file)
--- 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}}

diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 6dd6aecb37f6f7fd45dcfe042c557f0817f5ce06..98862bfd8e448b4dced8032c0fc4cc0562fb3f13 100644 (file)
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -147,15 +147,15 @@
        </div>
 </div>
 
-<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.branch.delete_html"}} <span class="name"></span>
        </div>
        <div class="content">
                <p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 <div class="ui small modal" id="create-branch-modal">

diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 8d72cd1420246e5cbde6433c08e869967536cee4..00e6220c3e398df96805dbdafef13f02f9222055 100644 (file)
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -59,11 +59,11 @@
                                                                                data-modal-cherry-pick-header="{{$.locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
                                                                                data-modal-cherry-pick-content="{{$.locale.Tr "repo.commit.cherry-pick-content"}}"
                                                                                data-modal-cherry-pick-submit="{{.locale.Tr "repo.commit.cherry-pick"}}">{{.locale.Tr "repo.commit.cherry-pick"}}</div>
-                                                                       <div class="ui basic modal" id="cherry-pick-modal">
-                                                                               <div class="ui icon header">
+                                                                       <div class="ui gitea-confirm-modal modal" id="cherry-pick-modal">
+                                                                               <div class="header">
                                                                                        <span id="cherry-pick-header"></span>
                                                                                </div>
-                                                                               <div class="content center">
+                                                                               <div class="content">
                                                                                        <p id="cherry-pick-content" class="branch-dropdown"></p>
                                                                                        {{template "repo/branch_dropdown" dict "root" .
                                                                                                "noTag" true "disableCreateBranch" true

diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index 0ac6e93d4956c4d54b9fb0af170d39837c5b9189..1c0682f4d570e78c404da5af1c060b86f3372093 100644 (file)
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -56,8 +56,8 @@
        </div>
 
 
-       <div class="ui small basic modal" id="edit-empty-content-modal">
-               <div class="ui icon header">
+       <div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
+               <div class="header">
                        {{svg "octicon-file"}}
                        {{.locale.Tr "repo.editor.commit_empty_file_header"}}
                </div>

diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl
index 97637027bbcaa905cefdcf54c8d3e7a2d806fb0f..a211187d069a9630414e48d692d03df72ca9cb58 100644 (file)
--- a/templates/repo/editor/patch.tmpl
+++ b/templates/repo/editor/patch.tmpl
@@ -36,8 +36,8 @@
                </form>
        </div>
 
-       <div class="ui small basic modal" id="edit-empty-content-modal">
-               <div class="ui icon header">
+       <div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
+               <div class="header">
                        {{svg "octicon-file"}}
                        {{.locale.Tr "repo.editor.commit_empty_file_header"}}
                </div>

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index a999c73804f1c4457de4f563476b50c7946ad1a9..5f2e135b98699f0733528c8e24833bc5b66d176d 100644 (file)
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -118,7 +118,6 @@
                                                                {{svg "octicon-repo-forked"}}{{$.locale.Tr "repo.fork"}}
                                                        </a>
                                                        <div class="ui small modal" id="fork-repo-modal">
-                                                               {{svg "octicon-x" 16 "close inside"}}
                                                                <div class="header">
                                                                        {{$.locale.Tr "repo.already_forked" .Name}}
                                                                </div>

diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 52e586b7831fd948b58dd6450906162eae82fa64..32e5a140ae76a6b03a1e20380f0cbc0404484cf0 100644 (file)
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -1,12 +1,12 @@
-<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.issues.label_deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "repo.issues.label_deletion_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 <div class="ui small edit-label modal">

diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index e54a72714a5c1d615d89c706b3c9c20617c4271a..c07232c759584465b16cd2bd7e236a7d186d5c5e 100644 (file)
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -116,15 +116,15 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-       <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.milestones.deletion"}}
                </div>
                <div class="content">
                        <p>{{.locale.Tr "repo.milestones.deletion_desc"}}</p>
                </div>
-               {{template "base/delete_modal_actions" .}}
+               {{template "base/modal_actions_confirm" .}}
        </div>
 {{end}}
 {{template "base/footer" .}}

diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 081b7d08c669634635db9a4a5519e256232a3649..8112373f06b200420b240b6c7a95bd092e8ecd54 100644 (file)
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -197,13 +197,13 @@
        <span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
 </div>
 
-<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.branch.delete" .HeadTarget}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl
index a0d6b0ea05747d904f756e42a1208096c6baf8eb..d86cc52d3a183f3ffbbda91069cd36725722d13b 100644 (file)
--- a/templates/repo/issue/view_content/comments_delete_time.tmpl
+++ b/templates/repo/issue/view_content/comments_delete_time.tmpl
@@ -7,7 +7,7 @@
                                                {{.ctxData.CsrfTokenHtml}}
                                        </form>
                                        <div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div>
-                                       {{template "base/delete_modal_actions" .}}
+                                       {{template "base/modal_actions_confirm" .}}
                                </div>
                                <button class="ui icon button compact mini issue-delete-time" data-id="{{.comment.Time.ID}}" data-tooltip-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}">
                                        {{svg "octicon-trash"}}

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 290488d9fbb947c9d22a326e716a43ea857b7227..bab9ff19366594a90bca36657fa0d3d4af879e35 100644 (file)
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -542,8 +542,8 @@
                        {{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
                                <input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
 
-                               <div class="ui basic modal remove-dependency">
-                                       <div class="ui icon header">
+                               <div class="ui gitea-confirm-modal modal remove-dependency">
+                                       <div class="header">
                                                {{svg "octicon-trash"}}
                                                {{.locale.Tr "repo.issues.dependency.remove_header"}}
                                        </div>
@@ -559,16 +559,9 @@
                                                        {{.locale.Tr "repo.issues.dependency.issue_remove_text"}}
                                                {{end}}</p>
                                        </div>
-                                       <div class="actions">
-                                               <button class="ui red cancel inverted button">
-                                                       {{svg "octicon-x"}}
-                                                       {{.locale.Tr "repo.issues.dependency.cancel"}}
-                                               </button>
-                                               <button class="ui green ok inverted button">
-                                                       {{svg "octicon-check"}}
-                                                       {{.locale.Tr "repo.issues.dependency.remove"}}
-                                               </button>
-                                       </div>
+                                       {{$ModalButtonCancelText := .locale.Tr "repo.issues.dependency.cancel"}}
+                                       {{$ModalButtonOkText := .locale.Tr "repo.issues.dependency.remove"}}
+                                       {{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
                                </div>
                        {{end}}
                {{end}}
@@ -663,15 +656,15 @@
                                {{svg "octicon-trash"}}
                                {{.locale.Tr "repo.issues.delete"}}
                        </button>
-                       <div class="ui basic modal" id="delete">
-                               <div class="ui icon header">
+                       <div class="ui gitea-confirm-modal modal" id="delete">
+                               <div class="header">
                                        {{if .Issue.IsPull}}
                                                {{.locale.Tr "repo.pulls.delete.title"}}
                                        {{else}}
                                                {{.locale.Tr "repo.issues.delete.title"}}
                                        {{end}}
                                </div>
-                               <div class="content center">
+                               <div class="content">
                                        <p>
                                                {{if .Issue.IsPull}}
                                                        {{.locale.Tr "repo.pulls.delete.text"}}
@@ -682,10 +675,7 @@
                                </div>
                                <form action="{{.Issue.Link}}/delete" method="post">
                                        {{.CsrfTokenHtml}}
-                                       <div class="center actions">
-                                               <button class="ui basic cancel inverted button">{{.locale.Tr "settings.cancel"}}</button>
-                                               <button class="ui basic red inverted button">{{.locale.Tr "modal.yes"}}</button>
-                                       </div>
+                                       {{template "base/modal_actions_confirm" .}}
                                </form>
                        </div>
                {{end}}

diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 8cf5d716f1d7c7c435a15761d68174a8e82cf041..ebe6008bbaca85772ed0e39077f755e33fe1d102 100644 (file)
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -78,15 +78,15 @@
 </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}}
 {{template "base/footer" .}}

diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 2ad40d700a3d763ba7c2bb163cc964e2d3684636..cff78df70bfe96c26d574ab917f9757506a86fa3 100644 (file)
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -103,7 +103,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-type="set_default"
                                                                        data-url="{{$.Link}}/{{.ID}}/default">
                                                                                {{svg "octicon-pin"}}
@@ -114,14 +113,16 @@
                                                                        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-type="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="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}"
+                                                               >
                                                                        {{svg "octicon-trash"}}
                                                                        {{$.locale.Tr "repo.projects.column.delete"}}
                                                                </a>
@@ -155,32 +156,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="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
-                                                                       </div>
+                                                                       {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
                                                                </div>
                                                        </div>
                                                </div>
@@ -283,15 +278,15 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-       <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}}
 

diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 8e1793a5bab7c6ddbee4fcfa1bfde51caf0a76ef..1ddb479317722ba4193dd52bd937af178ffaec52 100644 (file)
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -184,15 +184,15 @@
 </div>
 
 {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
-       <div class="ui small basic delete modal">
-               <div class="ui header">
-                       {{svg "octicon-trash" 16 "gt-mr-2"}}
+       <div class="ui gitea-confirm-modal delete modal">
+               <div class="header">
+                       {{svg "octicon-trash"}}
                        {{.locale.Tr "repo.release.delete_tag"}}
                </div>
                <div class="content">
                        <p>{{.locale.Tr "repo.release.deletion_tag_desc"}}</p>
                </div>
-               {{template "base/delete_modal_actions" .}}
+               {{template "base/modal_actions_confirm" .}}
        </div>
 {{end}}
 

diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index ddedfd608690c690e09cd336277ad8770e2e1d92..de5946fe6897b90f5fcc97d273fc667f75b45e79 100644 (file)
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -138,15 +138,15 @@
 </div>
 
 {{if .PageIsEditRelease}}
-       <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.release.deletion"}}
                </div>
                <div class="content">
                        <p>{{.locale.Tr "repo.release.deletion_desc"}}</p>
                </div>
-               {{template "base/delete_modal_actions" .}}
+               {{template "base/modal_actions_confirm" .}}
        </div>
 {{end}}
 {{template "base/footer" .}}

diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 6e51fc7bb24b1cecd4fb2d02f4eb00bcee70119f..53e1b00f6fafff194739db847546f47e935f1d5a 100644 (file)
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -96,15 +96,15 @@
        </div>
 </div>
 
-<div class="ui small basic delete modal">
-       <div class="ui header">
-               {{svg "octicon-trash" 16 "gt-mr-2"}}
+<div class="ui gitea-confirm-modal delete modal">
+       <div class="header">
+               {{svg "octicon-trash"}}
                {{.locale.Tr "repo.settings.protected_branch_deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 654bbba5d05c8c31408296d9ba394c6960c9d524..d9a415662e8c5f4e9e757a66f03ad2e35aeca033 100644 (file)
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -112,14 +112,14 @@
        </div>
 </div>
 
-<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.collaborator_deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "repo.settings.collaborator_deletion_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 33f3937201db196a4e7e8af6f1993a7532ad97a5..a0f802e49a7727747184a39b02a9f6f14f1fb43f 100644 (file)
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -77,14 +77,14 @@
        </div>
 </div>
 
-<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.deploy_key_deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 8be28ad9edba9375fc8b525de1d68c7ad9955058..b4ffa1894ff410852f4401afa9a1ddf846fed65b 100644 (file)
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -40,17 +40,17 @@
                </table>
                {{template "base/paginate" .}}
                {{range .LFSFiles}}
-                       <div class="ui basic modal" id="delete-{{.Oid}}">
-                               <div class="ui icon header">
+                       <div class="ui gitea-confirm-modal modal" id="delete-{{.Oid}}">
+                               <div class="header">
                                        {{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
                                </div>
-                               <div class="content center">
+                               <div class="content">
                                        <p>
                                                {{$.locale.Tr "repo.settings.lfs_delete_warning"}}
                                        </p>
                                        <form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
                                                {{$.CsrfTokenHtml}}
-                                               <div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}}
+                                               <div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
                                                        <button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
                                                        <button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
                                                </div>

diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 81c1e4759e8d5936823818dc73e625c3092e9d0a..70850a6ea42ea2471fd96aa245c59cab15c8d610 100644 (file)
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -967,15 +967,15 @@
        {{end}}
 
        {{if not .Repository.IsMirror}}
-               <div class="ui basic modal" id="archive-repo-modal">
-                       <div class="ui icon header">
+               <div class="ui gitea-confirm-modal modal" id="archive-repo-modal">
+                       <div class="header">
                                {{if .Repository.IsArchived}}
                                        {{.locale.Tr "repo.settings.unarchive.header"}}
                                {{else}}
                                        {{.locale.Tr "repo.settings.archive.header"}}
                                {{end}}
                        </div>
-                       <div class="content center">
+                       <div class="content">
                                <p>
                                        {{if .Repository.IsArchived}}
                                                {{.locale.Tr "repo.settings.unarchive.text"}}
@@ -988,7 +988,7 @@
                                {{.CsrfTokenHtml}}
                                <input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}">
                                <input type="hidden" name="repo_id" value="{{.Repository.ID}}">
-                               {{template "base/delete_modal_actions" .}}
+                               {{template "base/modal_actions_confirm" .}}
                        </form>
                </div>
        {{end}}

diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index f455899663e8f958182d2dab277b0806562c77d1..209e39a96be6eecee7309d4b0dae78842f7c0247 100644 (file)
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -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>

diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 123511d011fe18506a2e922e93423410855118d1..74e4090b9a897a60601145ccdad8ac2e46377dde 100644 (file)
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -99,15 +99,15 @@
        </div>
 </div>
 
-<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.wiki.delete_page_button"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "repo.wiki.delete_page_notice_1" ($title|Escape) | Safe}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 40b49247432269a53fd2d9530948616f24f55949..d92010ce11516bf0ab10a80c95c0af0663b87d82 100644 (file)
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -89,14 +89,14 @@
                </table>
                {{template "base/paginate" .}}
        </div>
-       <div class="ui small basic delete modal" id="runner-delete-modal">
-               <div class="ui icon header">
+       <div class="ui gitea-confirm-modal delete modal" id="runner-delete-modal">
+               <div class="header">
                        {{svg "octicon-trash"}}
                        {{.locale.Tr "actions.runners.delete_runner_header"}}
                </div>
                <div class="content">
                        <p>{{.locale.Tr "actions.runners.delete_runner_notice" | Safe}}</p>
                </div>
-               {{template "base/delete_modal_actions" .}}
+               {{template "base/modal_actions_confirm" .}}
        </div>
 </div>

diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index 4aa5f0ccd578a588216ba1019d50440e93cfa4fa..659836eadde1b28418c4522337c933d0dba6a712 100644 (file)
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -56,13 +56,13 @@
                {{.locale.Tr "secrets.none"}}
        {{end}}
 </div>
-<div class="ui small basic delete modal">
-       <div class="ui header">
-               {{svg "octicon-trash" 16 "gt-mr-2"}}
+<div class="ui gitea-confirm-modal delete modal">
+       <div class="header">
+               {{svg "octicon-trash"}}
                {{.locale.Tr "secrets.deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "secrets.deletion.description"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 53f7d021e0b6a2a645450a5c7efa66f70a5127ca..2ad3eb7af2b95eca78d37284b77fe0af735f4323 100644 (file)
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -161,26 +161,26 @@
        </div>
 </div>
 
-<div class="ui small basic delete modal" id="delete-email">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-email">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.email_deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.email_deletion_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui small basic delete modal" id="delete-account">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-account">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.delete_account_title"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.delete_account_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 2694f5cad0d407ceaff9bd36bf2f70c866aed4b5..bb0fba8f4f176e4c2475bf57ad169bd145a864cb 100644 (file)
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -268,8 +268,8 @@
        </div>
 </div>
 
-<div class="ui small basic delete modal" id="delete-token">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-token">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.access_token_deletion"}}
        </div>
@@ -277,7 +277,7 @@
                <p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p>
        </div>
 
-       <div class="actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl */}}
+       <div class="actions">{{/* TODO: Convert to base/modal_actions_confirm.tmpl */}}
                <button class="ui green basic inverted cancel button">
                        {{svg "octicon-x"}}
                        {{.locale.Tr "settings.access_token_deletion_cancel_action"}}

diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl
index 8ec304532422ecd592fc450564b9aa2e14eec8f6..5a9554b0309fa00d0949e7bd238844edc83c34a7 100644 (file)
--- a/templates/user/settings/applications_oauth2_list.tmpl
+++ b/templates/user/settings/applications_oauth2_list.tmpl
@@ -47,13 +47,13 @@
        </form>
 </div>
 
-<div class="ui small basic delete modal" id="remove-gitea-oauth2-application">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="remove-gitea-oauth2-application">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.remove_oauth2_application"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.oauth2_application_remove_description"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/user/settings/grants_oauth2.tmpl b/templates/user/settings/grants_oauth2.tmpl
index 3b92f35f37afe660a4f5610d32fab9a719c0be4f..205b374176bc46d1daf1df27a5c1a50cdc075692 100644 (file)
--- a/templates/user/settings/grants_oauth2.tmpl
+++ b/templates/user/settings/grants_oauth2.tmpl
@@ -28,13 +28,13 @@
        </div>
 </div>
 
-<div class="ui small basic delete modal" id="revoke-gitea-oauth2-grant">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="revoke-gitea-oauth2-grant">
+       <div class="header">
                {{svg "octicon-shield" 16 "gt-mr-2"}}
                {{.locale.Tr "settings.revoke_oauth2_grant"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.revoke_oauth2_grant_description"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 9ba9199db70d8a82772b66028c8b9f90bba3b874..46b60aafd861d4eec3b180f1c82f9a8968e1cc3e 100644 (file)
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -111,13 +111,13 @@
 <br>
 <p>{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}</p>
 
-<div class="ui small basic delete modal" id="delete-gpg">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-gpg">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.gpg_key_deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.gpg_key_deletion_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl
index 6194db13ab7ca57ed657db429b0620b55b2957f4..5251e465fd9641a7245d6152012f7684beca7b3e 100644 (file)
--- a/templates/user/settings/keys_principal.tmpl
+++ b/templates/user/settings/keys_principal.tmpl
@@ -54,14 +54,14 @@
                </div>
        </div>
 
-       <div class="ui small basic delete modal" id="delete-principal">
-               <div class="ui icon header">
+       <div class="ui gitea-confirm-modal delete modal" id="delete-principal">
+               <div class="header">
                        {{svg "octicon-trash"}}
                        {{.locale.Tr "settings.ssh_principal_deletion"}}
                </div>
                <div class="content">
                        <p>{{.locale.Tr "settings.ssh_principal_deletion_desc"}}</p>
                </div>
-               {{template "base/delete_modal_actions" .}}
+               {{template "base/modal_actions_confirm" .}}
        </div>
 {{end}}

diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index b60434cae46854c4c5cadce2a9b2bfc4065f639e..d66b4ea528c41c455f4623bd21ec74e4ac073c11 100644 (file)
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -100,13 +100,13 @@
 <br>
 <p>{{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}</p>
 
-<div class="ui small basic delete modal" id="delete-ssh">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-ssh">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.ssh_key_deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.ssh_key_deletion_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index cd513db2490a59bcd49d3e089a546a2ec9d46246..97b5a6a0bce587c16ba10262820cbb8df45b8e5f 100644 (file)
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -40,14 +40,13 @@
                </div>
        </div>
 </div>
-<div class="ui small basic delete modal" id="leave-organization">
-       <div class="ui icon header">
-               {{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
+       <div class="header">
                {{$.locale.Tr "org.members.leave"}}
        </div>
        <div class="content">
                <p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 95ea8d7d0d940e25f3e869e7ce796366ec8be051..7f0b10661415de1f06be3a259b5f34660500a2f4 100644 (file)
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -38,8 +38,7 @@
                                                                                <div class="right floated content">
                                                                                        {{if $.allowAdopt}}
                                                                                                <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 basic modal" id="adopt-unadopted-modal-{{$dirI}}">
-                                                                                                       {{svg "octicon-x" 16 "close inside"}}
+                                                                                               <div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
                                                                                                        <div class="header">
                                                                                                                <span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
                                                                                                        </div>
@@ -50,7 +49,7 @@
                                                                                                                {{$.CsrfTokenHtml}}
                                                                                                                <input type="hidden" name="id" value="{{$dir}}">
                                                                                                                <input type="hidden" name="action" value="adopt">
-                                                                                                               <div class="actions">
+                                                                                                               <div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
                                                                                                                        <button class="ui red basic inverted cancel button">
                                                                                                                                {{svg "octicon-x"}}
                                                                                                                                {{$.locale.Tr "modal.no"}}
@@ -65,8 +64,7 @@
                                                                                        {{end}}
                                                                                        {{if $.allowDelete}}
                                                                                                <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 basic modal" id="delete-unadopted-modal-{{$dirI}}">
-                                                                                                       {{svg "octicon-x" 16 "close inside"}}
+                                                                                               <div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
                                                                                                        <div class="header">
                                                                                                                <span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
                                                                                                        </div>
@@ -77,7 +75,7 @@
                                                                                                                {{$.CsrfTokenHtml}}
                                                                                                                <input type="hidden" name="id" value="{{$dir}}">
                                                                                                                <input type="hidden" name="action" value="delete">
-                                                                                                               {{template "base/delete_modal_actions" $}}
+                                                                                                               {{template "base/modal_actions_confirm" $}}
                                                                                                        </form>
                                                                                                </div>
                                                                                        {{end}}
@@ -131,14 +129,14 @@
        </div>
 </div>
 
-<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 "settings.remove_account_link"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl
index e8eed632946c116383c49b5183e90bdbac2e64d8..196d07c56ff949bf09f3b42462d885c98b22ec7a 100644 (file)
--- a/templates/user/settings/security/accountlinks.tmpl
+++ b/templates/user/settings/security/accountlinks.tmpl
@@ -41,13 +41,13 @@
        </div>
 </div>
 
-<div class="ui small basic delete modal" id="delete-account-link">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-account-link">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.remove_account_link"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl
index 5d6c9cf8cd425a2ffcd486940e8299bd31c86cfc..7a206a021a6e69f2158f2b2dda1d1c45a11c0b16 100644 (file)
--- a/templates/user/settings/security/openid.tmpl
+++ b/templates/user/settings/security/openid.tmpl
@@ -51,13 +51,13 @@
        </form>
 </div>
 
-<div class="ui small basic delete modal" id="delete-openid">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-openid">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.openid_deletion"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.openid_deletion_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index 1a0a8a6432c09cff06b322a7ed834a9275ee6688..f00651e7fca7269fc95a0df8a551dccfd785c29b 100644 (file)
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -23,13 +23,13 @@
        {{end}}
 </div>
 
-<div class="ui small basic delete modal" id="disable-twofa">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="disable-twofa">
+       <div class="header">
                {{svg "octicon-trash"}}
                {{.locale.Tr "settings.twofa_disable"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl
index 2fea2843f6e058f2be69e15a955b0ab04bb86797..25b7f03fca6f71c1db00ebb5b6decf68a1f6fb2c 100644 (file)
--- a/templates/user/settings/security/webauthn.tmpl
+++ b/templates/user/settings/security/webauthn.tmpl
@@ -30,13 +30,13 @@
 
 {{template "user/auth/webauthn_error" .}}
 
-<div class="ui small basic delete modal" id="delete-registration">
-       <div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-registration">
+       <div class="header">
                {{svg "octicon-trash"}}
        {{.locale.Tr "settings.webauthn_delete_key"}}
        </div>
        <div class="content">
                <p>{{.locale.Tr "settings.webauthn_delete_key_desc"}}</p>
        </div>
-       {{template "base/delete_modal_actions" .}}
+       {{template "base/modal_actions_confirm" .}}
 </div>

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 7e510346b3392ca0a37ba4a8d53491866286c45e..42263a974ff5ae76ff1d6e84e0d9d23d9792c1c5 100644 (file)
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1140,32 +1140,6 @@ a.ui.card:hover {
   color: var(--color-text);
 }
 
-.ui.modal {
-  background: var(--color-body);
-}
-
-.ui.modal > .header {
-  color: var(--color-text-dark);
-  background: var(--color-secondary-bg);
-  border-color: var(--color-secondary);
-  border-top-left-radius: var(--border-radius);
-  border-top-right-radius: var(--border-radius);
-}
-
-.ui.modal > .content {
-  background: var(--color-body);
-  text-align: left !important;
-}
-
-.ui.modal > .actions {
-  background: var(--color-secondary-bg);
-  border-color: var(--color-secondary);
-}
-
-.ui.modal > .close.inside {
-  color: var(--color-text);
-}
-
 .ui.basic.table > tbody > tr {
   border-color: var(--color-secondary);
 }

diff --git a/web_src/css/index.css b/web_src/css/index.css
index 253083033862c91b29ac90ccd96e643862e242bb..828251180446cfc3d9d462496d527c612ebf2158 100644 (file)
--- a/web_src/css/index.css
+++ b/web_src/css/index.css
@@ -10,6 +10,7 @@
 @import "./features/codeeditor.css";
 @import "./features/projects.css";
 @import "./modules/tippy.css";
+@import "./modules/modal.css";
 @import "./code/linebutton.css";
 @import "./markup/content.css";
 @import "./markup/codecopy.css";

diff --git a/web_src/css/modules/modal.css b/web_src/css/modules/modal.css
new file mode 100644 (file)
index 0000000..60d096d
--- /dev/null
+++ b/web_src/css/modules/modal.css
@@ -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;
+}

diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index 953671b41d2ac4758fe2d7d4a985f998d7002a95..5d4009622057aa7c26e0827013a54bdeb24ad36d 100644 (file)
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -129,12 +129,7 @@ export function initRepoProject() {
   $('.default-project-board-modal').each(function () {
     const boardColumn = $(this).closest('.board-column');
     const showButton = $(boardColumn).find('.default-project-board-show');
-    const commitButton = $(this).find('.default-project-board-button');
-
-    if ($(showButton).data('type') === 'unset_default') {
-      $(commitButton).removeClass('primary');
-      $(commitButton).addClass('red');
-    }
+    const commitButton = $(this).find('.actions > .ok.button');
 
     $(commitButton).on('click', (e) => {
       e.preventDefault();
@@ -152,12 +147,16 @@ export function initRepoProject() {
     });
   });
 
-  $('.delete-project-board').each(function () {
-    $(this).on('click', function (e) {
+  $('.show-delete-column-modal').each(function () {
+    const deleteColumnModal = $(`${$(this).attr('data-modal')}`);
+    const deleteColumnButton = deleteColumnModal.find('.actions > .ok.button');
+    const deleteUrl = $(this).attr('data-url');
+
+    deleteColumnButton.on('click', (e) => {
       e.preventDefault();
 
       $.ajax({
-        url: $(this).data('url'),
+        url: deleteUrl,
         headers: {
           'X-Csrf-Token': csrfToken,
         },