From 93232f410a639a2aa7ecff6299f202cd07e2a920 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 13 Sep 2023 01:08:37 +0200 Subject: [PATCH] [GITEA] Tidy up archive modal - Make it consistent with the other modals of the dangerous actions. (cherry picked from commit 576d7ec759baefd2382d565212c3168e38bbdd75) (cherry picked from commit 8b1225f9742cc0d3942824895923cbc8e9d49d04) (cherry picked from commit c2c47972ee492686842b1623f9fe941a0e599f0a) (cherry picked from commit eec301806b925388585546edc6407e3f6d644f44) (cherry picked from commit 6b5e728f0aaa87e2711c1c2d2111446fc412e0ca) (cherry picked from commit 3681691e65a73ef59205b066320c9ce58d4d80e4) (cherry picked from commit e39dfa550d691ff73a05a507d4cb2fd073940088) (cherry picked from commit 0c78c8c5ac6970495cde3e2737ed05b200e02f5a) (cherry picked from commit 661cf72db07039abde51e03dc43a89e240cebae0) [GITEA] Tidy up archive modal (squash) ctx.Locale (cherry picked from commit 4bb6ee71f0f0a45d70fed048444f0b1ae0f4ded0) (cherry picked from commit ddafd8fbe3fca0469d846aa4b65ed53675f2304e) (cherry picked from commit 9467a6915fe362057958982e7fb381f1cf5d9c98) (cherry picked from commit e632b10380bb00ffddd6e917ab150515a5c6d251) (cherry picked from commit 6609d075914a5d897afa59924f9e16b7a9710501) (cherry picked from commit c130b8a09a6f5a1fcc71fc0bbbb7738ca70774ec) (cherry picked from commit 1080de57542b4685d849ebb6bc4d900a770a22a8) (cherry picked from commit a9813744d4e1e08a0229a4749e6fca7d9a4d1de6) --- templates/repo/settings/options.tmpl | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 3bbf4b0d52..80aec2b252 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -976,20 +976,23 @@ {{end}}
-

+

{{if .Repository.IsArchived}} {{ctx.Locale.Tr "repo.settings.unarchive.text"}} {{else}} {{ctx.Locale.Tr "repo.settings.archive.text"}} {{end}} -

-
-
- {{.CsrfTokenHtml}} - - - {{template "base/modal_actions_confirm" .}} +
+ + {{.CsrfTokenHtml}} + + +
+ + +
+ {{end}} {{end}}