diff options
| author | silverwind <me@silverwind.io> | 2021-03-21 19:58:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-21 19:58:28 +0100 |
| commit | 4fd6e821985c8b88e07f29deee1feda5537e9cb8 (patch) | |
| tree | cb85b5a4561354f0091d85fc9558791d54928fab /templates | |
| parent | 98c8513db25be29d1fe201acf3caa4156509fa04 (diff) | |
| download | gitea-4fd6e821985c8b88e07f29deee1feda5537e9cb8.tar.gz gitea-4fd6e821985c8b88e07f29deee1feda5537e9cb8.zip | |
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
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 95 |
1 files 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}} </button> </div> - - <div class="ui tiny modal" id="lock"> <div class="header"> {{ if .Issue.IsLocked }} @@ -588,62 +586,61 @@ {{.i18n.Tr "repo.issues.lock.title"}} {{end}} </div> - </div> - <div class="content"> - <div class="ui warning message text left"> - {{ if .Issue.IsLocked }} - {{.i18n.Tr "repo.issues.unlock.notice_1"}}<br> - {{.i18n.Tr "repo.issues.unlock.notice_2"}}<br> - {{else}} - {{.i18n.Tr "repo.issues.lock.notice_1"}}<br> - {{.i18n.Tr "repo.issues.lock.notice_2"}}<br> - {{.i18n.Tr "repo.issues.lock.notice_3"}}<br> - {{end}} - </div> + <div class="content"> + <div class="ui warning message text left"> + {{ if .Issue.IsLocked }} + {{.i18n.Tr "repo.issues.unlock.notice_1"}}<br> + {{.i18n.Tr "repo.issues.unlock.notice_2"}}<br> + {{else}} + {{.i18n.Tr "repo.issues.lock.notice_1"}}<br> + {{.i18n.Tr "repo.issues.lock.notice_2"}}<br> + {{.i18n.Tr "repo.issues.lock.notice_3"}}<br> + {{end}} + </div> - <form class="ui form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}{{ if .Issue.IsLocked }}/unlock{{else}}/lock{{end}}" - method="post"> - {{.CsrfTokenHtml}} + <form class="ui form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}{{ if .Issue.IsLocked }}/unlock{{else}}/lock{{end}}" + method="post"> + {{.CsrfTokenHtml}} - {{ if not .Issue.IsLocked }} - <div class="field"> - <strong> {{ .i18n.Tr "repo.issues.lock.reason" }} </strong> - </div> + {{ if not .Issue.IsLocked }} + <div class="field"> + <strong> {{ .i18n.Tr "repo.issues.lock.reason" }} </strong> + </div> - <div class="field"> - <div class="ui fluid dropdown selection" tabindex="0"> + <div class="field"> + <div class="ui fluid dropdown selection" tabindex="0"> - <select name="reason"> - <option value=""> </option> - {{range .LockReasons}} - <option value="{{.}}">{{.}}</option> - {{end}} - </select> - {{svg "octicon-triangle-down" 14 "dropdown icon"}} + <select name="reason"> + <option value=""> </option> + {{range .LockReasons}} + <option value="{{.}}">{{.}}</option> + {{end}} + </select> + {{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;"> - {{range .LockReasons}} - <div class="item" data-value="{{.}}">{{.}}</div> - {{end}} + <div class="menu transition hidden" tabindex="-1" style="display: block !important;"> + {{range .LockReasons}} + <div class="item" data-value="{{.}}">{{.}}</div> + {{end}} + </div> </div> </div> - </div> - {{end}} + {{end}} - <div class="text right actions"> - <div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div> - <button class="ui red button"> - {{ if .Issue.IsLocked }} - {{.i18n.Tr "repo.issues.unlock_confirm"}} - {{else}} - {{.i18n.Tr "repo.issues.lock_confirm"}} - {{end}} - </button> - </div> - </form> - </div> + <div class="text right actions"> + <div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div> + <button class="ui red button"> + {{ if .Issue.IsLocked }} + {{.i18n.Tr "repo.issues.unlock_confirm"}} + {{else}} + {{.i18n.Tr "repo.issues.lock_confirm"}} + {{end}} + </button> + </div> + </form> + </div> </div> {{end}} </div> |