From f219489564b626b5c6cb3ed5afcdc03be52c12c4 Mon Sep 17 00:00:00 2001
From: Gary Kim <gary@garykim.dev>
Date: Sun, 14 Jul 2019 10:28:05 +0800
Subject: [PATCH] Add last commit information to repo branches page

This change adds the ID and commit message of the last
commit on a branch to the branches page for repositories.

Signed-off-by: Gary Kim <gary@garykim.dev>
---
 public/css/index.css            |  3 ++-
 public/less/_explore.less       |  5 ++++-
 templates/repo/branch/list.tmpl | 13 ++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/css/index.css b/public/css/index.css
index 0630cb6ed567..764cd325fc4c 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -982,7 +982,8 @@ tbody.commit-list{vertical-align:baseline}
 .ui.repository.list .item .time{font-size:12px;color:grey}
 .ui.repository.list .item .ui.tags{margin-bottom:1em}
 .ui.repository.list .item .ui.avatar.image{width:24px;height:24px}
-.ui.repository.branches .time{font-size:12px;color:grey}
+.ui.repository.branches .info{font-size:12px;color:grey}
+.ui.repository.branches .info i{vertical-align:middle}
 .ui.user.list .item{padding-bottom:25px}
 .ui.user.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px}
 .ui.user.list .item .ui.avatar.image{width:40px;height:40px}
diff --git a/public/less/_explore.less b/public/less/_explore.less
index c5065a35bc24..bc47c7737764 100644
--- a/public/less/_explore.less
+++ b/public/less/_explore.less
@@ -62,9 +62,12 @@
 }
 
 .ui.repository.branches {
-    .time {
+    .info {
         font-size: 12px;
         color: #808080;
+        i {
+            vertical-align: middle;
+        }
     }
 }
 
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 04c9e1dad5b6..cd73cc2f4a82 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -14,11 +14,14 @@
 					<tr>
 						<td>
 						{{range $branch := .Branches}}
-							{{if and .IsProtected (eq .Name $.DefaultBranch)}}
-								<i class="octicon octicon-shield"></i>
+							{{if eq .Name $.DefaultBranch}}
+								{{if .IsProtected}}
+									<i class="octicon octicon-shield"></i>
+								{{end}}
+								{{$.DefaultBranch}}
+								<p class="info"><i class="octicon octicon-git-commit"></i><a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · {{Safe (EllipsisString (Printf "%s" (RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas)) 72)}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
 							{{end}}
 						{{end}}
-						{{.DefaultBranch}}
 						</td>
 					</tr>
 				</tbody>
@@ -48,13 +51,13 @@
 									<td>
 									{{if .IsDeleted}}
 										<s><a href="{{$.RepoLink}}/src/branch/{{.Name | EscapePound}}">{{.Name}}</a></s>
-										<p class="time">{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}</p>
+										<p class="info">{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}</p>
 									{{else}}
 										{{if .IsProtected}}
 											<i class="octicon octicon-shield"></i>
 										{{end}}
 										<a href="{{$.RepoLink}}/src/branch/{{.Name | EscapePound}}">{{.Name}}</a>
-										<p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
+										<p class="info"><i class="octicon octicon-git-commit"></i><a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · {{Safe (EllipsisString (Printf "%s" (RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas)) 72)}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
 									{{end}}
 									</td>
 									<td class="ui">