Fix issue/pul sidebar (#14826)

templates/repo/issue/view_content/sidebar.tmpl

@@ -524,10 +524,49 @@
 				{{end}}
 			</div>
 
-			{{ if and .IsRepoAdmin (not .Repository.IsArchived) }}
+			{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
+				<input type="hidden" id="repolink" value="{{$.RepoRelPath}}">
+				<input type="hidden" id="repoId" value="{{.Repository.ID}}">
+				<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
+				<input type="hidden" id="type" value="{{.IssueType}}">
+				<!-- I know, there is probably a better way to do this -->
+				<input type="hidden" id="issueIndex" value="{{.Issue.Index}}"/>
+
+				<div class="ui basic modal remove-dependency">
+					<div class="ui icon header">
+						{{svg "octicon-trashcan"}}
+						{{.i18n.Tr "repo.issues.dependency.remove_header"}}
+					</div>
+					<div class="content">
+						<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/delete" id="removeDependencyForm">
+							{{$.CsrfTokenHtml}}
+							<input type="hidden" value="" name="removeDependencyID" id="removeDependencyID"/>
+							<input type="hidden" value="" name="dependencyType" id="dependencyType"/>
+						</form>
+						<p>{{if .Issue.IsPull}}
+							{{.i18n.Tr "repo.issues.dependency.pr_remove_text"}}
+						{{else}}
+							{{.i18n.Tr "repo.issues.dependency.issue_remove_text"}}
+						{{end}}</p>
+					</div>
+					<div class="actions">
+						<div class="ui basic red cancel inverted button">
+							<i class="remove icon"></i>
+							{{.i18n.Tr "repo.issues.dependency.cancel"}}
+						</div>
+						<div class="ui basic green ok inverted button">
+							<i class="checkmark icon"></i>
+							{{.i18n.Tr "repo.issues.dependency.remove"}}
+						</div>
+					</div>
+				</div>
+			{{end}}
+		{{end}}
+
+		{{if and .IsRepoAdmin (not .Repository.IsArchived)}}
 			<div class="ui divider"></div>
 			<div class="ui watching">
-				<button class="fluid ui show-modal button {{if .Issue.IsLocked }} negative {{ end }}" data-modal="#lock">
+				<button class="fluid ui show-modal button {{if .Issue.IsLocked }} negative {{end}}" data-modal="#lock">
 					{{if .Issue.IsLocked}}
 						{{svg "octicon-key"}}
 						{{.i18n.Tr "repo.issues.unlock"}}
@@ -543,23 +582,24 @@
 				<div class="header">
 					{{ if .Issue.IsLocked }}
 						{{.i18n.Tr "repo.issues.unlock.title"}}
-					{{ else }}
+					{{else}}
 						{{.i18n.Tr "repo.issues.lock.title"}}
-					{{ end }}
+					{{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 }}
+					{{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 }}
+					{{end}}
 				</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">
 					{{.CsrfTokenHtml}}
 
@@ -588,60 +628,21 @@
 								</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 }}
+							{{else}}
 								{{.i18n.Tr "repo.issues.lock_confirm"}}
-							{{ end }}
+							{{end}}
 						</button>
 					</div>
 				</form>
 			</div>
 			</div>
-		{{ end }}
+		{{end}}
-
 	</div>
 </div>
-{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
-	<input type="hidden" id="repolink" value="{{$.RepoRelPath}}">
-	<input type="hidden" id="repoId" value="{{.Repository.ID}}">
-	<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
-	<input type="hidden" id="type" value="{{.IssueType}}">
-	<!-- I know, there is probably a better way to do this -->
-	<input type="hidden" id="issueIndex" value="{{.Issue.Index}}"/>
-
-	<div class="ui basic modal remove-dependency">
-		<div class="ui icon header">
-			{{svg "octicon-trashcan"}}
-			{{.i18n.Tr "repo.issues.dependency.remove_header"}}
-		</div>
-		<div class="content">
-			<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/delete" id="removeDependencyForm">
-				{{$.CsrfTokenHtml}}
-				<input type="hidden" value="" name="removeDependencyID" id="removeDependencyID"/>
-				<input type="hidden" value="" name="dependencyType" id="dependencyType"/>
-			</form>
-			<p>{{if .Issue.IsPull}}
-				{{.i18n.Tr "repo.issues.dependency.pr_remove_text"}}
-			{{else}}
-				{{.i18n.Tr "repo.issues.dependency.issue_remove_text"}}
-			{{end}}</p>
-		</div>
-		<div class="actions">
-			<div class="ui basic red cancel inverted button">
-				<i class="remove icon"></i>
-				{{.i18n.Tr "repo.issues.dependency.cancel"}}
-			</div>
-			<div class="ui basic green ok inverted button">
-				<i class="checkmark icon"></i>
-				{{.i18n.Tr "repo.issues.dependency.remove"}}
-			</div>
-		</div>
-	</div>
-{{end}}
-		{{end}}