handle closed state as well, hide cli when closed

Author: silverwind

templates/repo/issue/view_content/pull.tmpl

@@ -109,8 +109,8 @@
 	</div>
 {{end}}
 <div class="timeline-item comment merge box">
-	<a class="timeline-avatar text  {{if .Issue.PullRequest.HasMerged}}purple
-	{{- else if .Issue.IsClosed}}grey
+	<a class="timeline-avatar text {{if .Issue.PullRequest.HasMerged}}purple
+	{{- else if .Issue.IsClosed}}red
 	{{- else if .IsPullWorkInProgress}}grey
 	{{- else if .IsFilesConflicted}}grey
 	{{- else if .IsPullRequestBroken}}red
@@ -151,19 +151,20 @@
 					{{end}}
 				</div>
 			{{else if .Issue.IsClosed}}
-				<div class="item text">
-					{{if .IsPullRequestBroken}}
-						{{$.locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
-					{{else}}
-						{{$.locale.Tr "repo.pulls.reopen_to_merge"}}
+				<div class="item item-section text gt-f1">
+					<div class="item-section-left">
+						{{if .IsPullRequestBroken}}
+							{{$.locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
+						{{else}}
+							{{$.locale.Tr "repo.pulls.reopen_to_merge"}}
+						{{end}}
+					</div>
+					{{if and .IsPullBranchDeletable (not .IsPullRequestBroken)}}
+						<div class="item-section-right">
+							<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{$.locale.Tr "repo.branch.delete_html"}}</button>
+						</div>
 					{{end}}
 				</div>
-				{{if and .IsPullBranchDeletable ( not .IsPullRequestBroken )}}
-					<div class="ui divider"></div>
-					<div>
-						<a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.locale.Tr "repo.branch.delete" .HeadTarget}}</a>
-					</div>
-				{{end}}
 			{{else if .IsPullFilesConflicted}}
 				<div class="item text">
 					{{svg "octicon-x"}}
@@ -472,7 +473,7 @@
 				</div>
 			{{end}}
 
-			{{if and .ShowMergeInstructions .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged)}}
+			{{if and .ShowMergeInstructions .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}}
 				{{template "repo/issue/view_content/pull_merge_instruction" (dict "locale" .locale "Issue" .Issue)}}
 			{{end}}
 		</div>

web_src/css/repository.css

@@ -694,9 +694,8 @@
   margin-right: 5px;
 }
 
-.repository.view.issue .pull .merge.box .avatar {
-  margin-left: 10px;
-  margin-top: 10px;
+.repository.view.issue .pull .merge.box .timeline-avatar {
+  margin-top: 2px;
 }
 
 .repository.view.issue .pull .merge.box .branch-update.grid .row {