From 4fd6e821985c8b88e07f29deee1feda5537e9cb8 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 21 Mar 2021 19:58:28 +0100 Subject: [PATCH] Fix lock modal content rendering outside modal (#15095) * Fix lock modal content rendering outside modal The .content was not a child to .modal so was rendering outside. This is a recent regression but I'm not certain when it was introduced. * remove extraneous closing div --- .../repo/issue/view_content/sidebar.tmpl | 95 +++++++++---------- 1 file changed, 46 insertions(+), 49 deletions(-) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 7b4e522e86..f51f6a5265 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -578,8 +578,6 @@ {{end}} - - -
-
- {{ if .Issue.IsLocked }} - {{.i18n.Tr "repo.issues.unlock.notice_1"}}
- {{.i18n.Tr "repo.issues.unlock.notice_2"}}
- {{else}} - {{.i18n.Tr "repo.issues.lock.notice_1"}}
- {{.i18n.Tr "repo.issues.lock.notice_2"}}
- {{.i18n.Tr "repo.issues.lock.notice_3"}}
- {{end}} -
+
+
+ {{ if .Issue.IsLocked }} + {{.i18n.Tr "repo.issues.unlock.notice_1"}}
+ {{.i18n.Tr "repo.issues.unlock.notice_2"}}
+ {{else}} + {{.i18n.Tr "repo.issues.lock.notice_1"}}
+ {{.i18n.Tr "repo.issues.lock.notice_2"}}
+ {{.i18n.Tr "repo.issues.lock.notice_3"}}
+ {{end}} +
-
- {{.CsrfTokenHtml}} + + {{.CsrfTokenHtml}} - {{ if not .Issue.IsLocked }} -
- {{ .i18n.Tr "repo.issues.lock.reason" }} -
+ {{ if not .Issue.IsLocked }} +
+ {{ .i18n.Tr "repo.issues.lock.reason" }} +
-
- +
+
{{.i18n.Tr "settings.cancel"}}
+ +
+ +
{{end}}