pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix lock modal content rendering outside modal (#15095)

Browse source 
* 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
This commit is contained in:
silverwind 2021-03-21 19:58:28 +01:00 committed by GitHub
parent 98c8513db2
commit 4fd6e82198
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
templates/repo/issue/view_content/sidebar.tmpl
View file

@ -578,8 +578,6 @@
{{end}} {{end}}
</button> </button>
</div> </div>
<div class="ui tiny modal" id="lock"> <div class="ui tiny modal" id="lock">
<div class="header"> <div class="header">
{{ if .Issue.IsLocked }} {{ if .Issue.IsLocked }}
@ -588,62 +586,61 @@
{{.i18n.Tr "repo.issues.lock.title"}} {{.i18n.Tr "repo.issues.lock.title"}}
{{end}} {{end}}
</div> </div>
</div> <div class="content">
<div class="content"> <div class="ui warning message text left">
<div class="ui warning message text left"> {{ if .Issue.IsLocked }}
{{ if .Issue.IsLocked }} {{.i18n.Tr "repo.issues.unlock.notice_1"}}<br>
{{.i18n.Tr "repo.issues.unlock.notice_1"}}<br> {{.i18n.Tr "repo.issues.unlock.notice_2"}}<br>
{{.i18n.Tr "repo.issues.unlock.notice_2"}}<br> {{else}}
{{else}} {{.i18n.Tr "repo.issues.lock.notice_1"}}<br>
{{.i18n.Tr "repo.issues.lock.notice_1"}}<br> {{.i18n.Tr "repo.issues.lock.notice_2"}}<br>
{{.i18n.Tr "repo.issues.lock.notice_2"}}<br> {{.i18n.Tr "repo.issues.lock.notice_3"}}<br>
{{.i18n.Tr "repo.issues.lock.notice_3"}}<br> {{end}}
{{end}} </div>
</div>
<form class="ui form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}{{ if .Issue.IsLocked }}/unlock{{else}}/lock{{end}}" <form class="ui form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}{{ if .Issue.IsLocked }}/unlock{{else}}/lock{{end}}"
method="post"> method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
{{ if not .Issue.IsLocked }} {{ if not .Issue.IsLocked }}
<div class="field"> <div class="field">
<strong> {{ .i18n.Tr "repo.issues.lock.reason" }} </strong> <strong> {{ .i18n.Tr "repo.issues.lock.reason" }} </strong>
</div> </div>
<div class="field"> <div class="field">
<div class="ui fluid dropdown selection" tabindex="0"> <div class="ui fluid dropdown selection" tabindex="0">
<select name="reason"> <select name="reason">
<option value=""> </option> <option value=""> </option>
{{range .LockReasons}} {{range .LockReasons}}
<option value="{{.}}">{{.}}</option> <option value="{{.}}">{{.}}</option>
{{end}} {{end}}
</select> </select>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
<div class="default text"> </div> <div class="default text"> </div>
<div class="menu transition hidden" tabindex="-1" style="display: block !important;"> <div class="menu transition hidden" tabindex="-1" style="display: block !important;">
{{range .LockReasons}} {{range .LockReasons}}
<div class="item" data-value="{{.}}">{{.}}</div> <div class="item" data-value="{{.}}">{{.}}</div>
{{end}} {{end}}
</div>
</div> </div>
</div> </div>
</div> {{end}}
{{end}}
<div class="text right actions"> <div class="text right actions">
<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div> <div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
<button class="ui red button"> <button class="ui red button">
{{ if .Issue.IsLocked }} {{ if .Issue.IsLocked }}
{{.i18n.Tr "repo.issues.unlock_confirm"}} {{.i18n.Tr "repo.issues.unlock_confirm"}}
{{else}} {{else}}
{{.i18n.Tr "repo.issues.lock_confirm"}} {{.i18n.Tr "repo.issues.lock_confirm"}}
{{end}} {{end}}
</button> </button>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
{{end}} {{end}}
</div> </div>