From bb988483bd271e81eacf93ff61594e82c0049eb2 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 29 Aug 2024 11:50:03 -0700
Subject: [PATCH] Allow multiple branches, pull requests

---
 options/locale/locale_en-US.ini               |  1 +
 .../view_content/sidebar_development.tmpl     | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b286e8be13..157565539c 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1627,6 +1627,7 @@ issues.maybefixed = May be fixed by %s
 issues.create_branch_from_issue_success = Create branch %s from issue successfully
 issues.pr.completed = Completed
 issues.pr.conflicted = Merge conflicts
+issues.branch.latest = Latest commit %s
 issues.link.created = Created %s
 issues.num_participants = %d Participants
 issues.attachment.open_tab = `Click to see "%s" in a new tab`
diff --git a/templates/repo/issue/view_content/sidebar_development.tmpl b/templates/repo/issue/view_content/sidebar_development.tmpl
index d48c7c1e8d..dd3bc6b2db 100644
--- a/templates/repo/issue/view_content/sidebar_development.tmpl
+++ b/templates/repo/issue/view_content/sidebar_development.tmpl
@@ -1,8 +1,8 @@
 <span class="text"><strong>{{ctx.Locale.Tr "repo.issues.development"}}</strong></span>
 <div class="ui devlinks list">
-{{if not .DevLinks}}
+<div>
 <a class="tw-mt-1 fluid ui show-modal" data-modal="#create_branch">{{ctx.Locale.Tr "repo.branch.new_branch"}}</a>
-{{end}}
+</div>
 {{range .DevLinks}}
 	{{if .PullRequest}}
 		<span>{{template "shared/issueicon" .PullRequest.Issue}}
@@ -25,14 +25,20 @@
 		{{end}}
 		</div>
 	{{else if and .Branch .DisplayBranch}}
-		<span>
-			{{svg "octicon-git-branch" 14}}
-			<a href="{{.Branch.Repo.Link}}/src/branch/{{.Branch.Name}}" class="item">
-				<span class="gt-ellipsis">{{.Branch.Name}}</span>
-			</a>
-		</span>
-		<div>Latest commit {{DateTime "short" .Branch.CommitTime}}</div>
-		<a href="{{$.Issue.Repo.Link}}/compare/{{$.Issue.Repo.DefaultBranch}}...{{.Branch.Repo.FullName}}:{{.Branch.Name}}">{{ctx.Locale.Tr "repo.pulls.new"}}</a>
+		<div class="tw-flex tw-justify-between">
+			<div class="tw-flex tw-left tw-items-center tw-h-full">
+				{{svg "octicon-git-branch" 14}}
+				<a href="{{.Branch.Repo.Link}}/src/branch/{{.Branch.Name}}">
+					<span class="gt-ellipsis">{{.Branch.Name}}</span>
+				</a>
+			</div>
+			<div class="tw-right">
+				<a class="ui button mini compact basic icon" href="{{$.Issue.Repo.Link}}/compare/{{$.Issue.Repo.DefaultBranch}}...{{.Branch.Repo.FullName}}:{{.Branch.Name}}">
+				{{svg "octicon-git-pull-request"}}
+				</a>
+			</div>
+		</div>
+		<div>{{ctx.Locale.Tr "repo.issues.branch.latest" (DateTime "short" .Branch.CommitTime)}}</div>
 	{{end}}
 {{end}}
 </div>