Skip to content

Commit e42be40

Browse files
committed
Fix lock modal content rendering outside modal (go-gitea#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
1 parent 61444ed commit e42be40

File tree

1 file changed

+46
-49
lines changed

1 file changed

+46
-49
lines changed

templates/repo/issue/view_content/sidebar.tmpl

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,6 @@
578578
{{end}}
579579
</button>
580580
</div>
581-
582-
583581
<div class="ui tiny modal" id="lock">
584582
<div class="header">
585583
{{ if .Issue.IsLocked }}
@@ -588,62 +586,61 @@
588586
{{.i18n.Tr "repo.issues.lock.title"}}
589587
{{end}}
590588
</div>
591-
</div>
592-
<div class="content">
593-
<div class="ui warning message text left">
594-
{{ if .Issue.IsLocked }}
595-
{{.i18n.Tr "repo.issues.unlock.notice_1"}}<br>
596-
{{.i18n.Tr "repo.issues.unlock.notice_2"}}<br>
597-
{{else}}
598-
{{.i18n.Tr "repo.issues.lock.notice_1"}}<br>
599-
{{.i18n.Tr "repo.issues.lock.notice_2"}}<br>
600-
{{.i18n.Tr "repo.issues.lock.notice_3"}}<br>
601-
{{end}}
602-
</div>
589+
<div class="content">
590+
<div class="ui warning message text left">
591+
{{ if .Issue.IsLocked }}
592+
{{.i18n.Tr "repo.issues.unlock.notice_1"}}<br>
593+
{{.i18n.Tr "repo.issues.unlock.notice_2"}}<br>
594+
{{else}}
595+
{{.i18n.Tr "repo.issues.lock.notice_1"}}<br>
596+
{{.i18n.Tr "repo.issues.lock.notice_2"}}<br>
597+
{{.i18n.Tr "repo.issues.lock.notice_3"}}<br>
598+
{{end}}
599+
</div>
603600

604-
<form class="ui form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}{{ if .Issue.IsLocked }}/unlock{{else}}/lock{{end}}"
605-
method="post">
606-
{{.CsrfTokenHtml}}
601+
<form class="ui form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}{{ if .Issue.IsLocked }}/unlock{{else}}/lock{{end}}"
602+
method="post">
603+
{{.CsrfTokenHtml}}
607604

608-
{{ if not .Issue.IsLocked }}
609-
<div class="field">
610-
<strong> {{ .i18n.Tr "repo.issues.lock.reason" }} </strong>
611-
</div>
605+
{{ if not .Issue.IsLocked }}
606+
<div class="field">
607+
<strong> {{ .i18n.Tr "repo.issues.lock.reason" }} </strong>
608+
</div>
612609

613-
<div class="field">
614-
<div class="ui fluid dropdown selection" tabindex="0">
610+
<div class="field">
611+
<div class="ui fluid dropdown selection" tabindex="0">
615612

616-
<select name="reason">
617-
<option value=""> </option>
618-
{{range .LockReasons}}
619-
<option value="{{.}}">{{.}}</option>
620-
{{end}}
621-
</select>
622-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
613+
<select name="reason">
614+
<option value=""> </option>
615+
{{range .LockReasons}}
616+
<option value="{{.}}">{{.}}</option>
617+
{{end}}
618+
</select>
619+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
623620

624-
<div class="default text"> </div>
621+
<div class="default text"> </div>
625622

626-
<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
627-
{{range .LockReasons}}
628-
<div class="item" data-value="{{.}}">{{.}}</div>
629-
{{end}}
623+
<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
624+
{{range .LockReasons}}
625+
<div class="item" data-value="{{.}}">{{.}}</div>
626+
{{end}}
627+
</div>
630628
</div>
631629
</div>
632-
</div>
633-
{{end}}
630+
{{end}}
634631

635-
<div class="text right actions">
636-
<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
637-
<button class="ui red button">
638-
{{ if .Issue.IsLocked }}
639-
{{.i18n.Tr "repo.issues.unlock_confirm"}}
640-
{{else}}
641-
{{.i18n.Tr "repo.issues.lock_confirm"}}
642-
{{end}}
643-
</button>
644-
</div>
645-
</form>
646-
</div>
632+
<div class="text right actions">
633+
<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
634+
<button class="ui red button">
635+
{{ if .Issue.IsLocked }}
636+
{{.i18n.Tr "repo.issues.unlock_confirm"}}
637+
{{else}}
638+
{{.i18n.Tr "repo.issues.lock_confirm"}}
639+
{{end}}
640+
</button>
641+
</div>
642+
</form>
643+
</div>
647644
</div>
648645
{{end}}
649646
</div>

0 commit comments

Comments
 (0)