From 555e293a44c6bb1755e14650fdf10f94c1ab2867 Mon Sep 17 00:00:00 2001
From: Gerben <gerben@treora.com>
Date: Tue, 20 Mar 2018 16:41:47 +0100
Subject: [PATCH] Remove Commits|Branches submenu, show #commits besides branch
 dropdown

---
 templates/repo/branch_dropdown.tmpl |  7 ++++++-
 templates/repo/sub_menu.tmpl        | 15 +--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index b7f4c91..3935ad5 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -1,6 +1,6 @@
 <div class="fitted item choose reference">
 	<div class="ui floating filter dropdown custom" data-can-create-branch="{{.CanCreateBranch}}" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
-		<div class="ui basic small compact button" @click="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
+		<div class="ui basic small compact left attached button" @click="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
 			<span class="text">
 				<i class="octicon octicon-git-branch"></i>
 				{{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}:
@@ -62,4 +62,9 @@
 			<div class="message" v-if="showNoResults">${ noResults }</div>
 		</div>
 	</div>
+	{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}}
+		<div class="ui basic small compact right attached button">
+			<a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }}</a>
+		</div>
+	{{end}}
 </div>
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl
index cd37f80..9eab08a 100644
--- a/templates/repo/sub_menu.tmpl
+++ b/templates/repo/sub_menu.tmpl
@@ -1,14 +1 @@
-<div class="ui segment sub-menu">
-	<div class="ui two horizontal center link list">
-		{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}}
-			<div class="item{{if .PageIsCommits}} active{{end}}">
-				<a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }}</a>
-			</div>
-		{{end}}
-		{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo) }}
-			<div class="item{{if .PageIsBranches}} active{{end}}">
-				<a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BranchesCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .BranchesCount "repo.branch" "repo.branches") }}</a>
-			</div>
-		{{end}}
-	</div>
-</div>
+<!---->