From d96e1fa503249033cbbf5356f48bf805ec0b655d Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Thu, 24 Mar 2016 20:08:55 +0900
Subject: [PATCH] Move Branches and Tags link to repository navigation tab

---
 src/main/twirl/gitbucket/core/menu.scala.html          | 8 +++++++-
 src/main/twirl/gitbucket/core/repo/blob.scala.html     | 2 +-
 src/main/twirl/gitbucket/core/repo/branches.scala.html | 2 +-
 src/main/twirl/gitbucket/core/repo/commit.scala.html   | 2 +-
 src/main/twirl/gitbucket/core/repo/commits.scala.html  | 2 +-
 src/main/twirl/gitbucket/core/repo/delete.scala.html   | 2 +-
 src/main/twirl/gitbucket/core/repo/editor.scala.html   | 2 +-
 src/main/twirl/gitbucket/core/repo/files.scala.html    | 2 +-
 src/main/twirl/gitbucket/core/repo/find.scala.html     | 2 +-
 src/main/twirl/gitbucket/core/repo/forked.scala.html   | 4 ++--
 src/main/twirl/gitbucket/core/repo/guide.scala.html    | 2 +-
 src/main/twirl/gitbucket/core/repo/tags.scala.html     | 2 +-
 12 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index d8f759913..010e68656 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -21,6 +21,7 @@
   <div class="container">
     @helper.html.information(info)
     @helper.html.error(error)
+    @*
     <div class="pull-right">
       <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(repository.repository.defaultBranch))" class="header-link">
         <i class="octicon octicon-history"></i>
@@ -39,6 +40,7 @@
         <strong>@repository.tags.length</strong> releases
       </a>
     </div>
+    *@
     <div class="head">
       @helper.html.repositoryicon(repository, true)
       <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
@@ -55,7 +57,11 @@
       }
     </div>
     <ul class="nav nav-tabs">
-      @menuitem(""                   ,"code"       ,"Code")
+      @menuitem(""                   ,"files"      ,"Files")
+      @if(repository.commitCount != 0) {
+        @menuitem("/branches"        ,"branches"   ,"Branches", repository.branchList.length)
+        @menuitem("/tags"            ,"tags"       ,"Tags", repository.tags.length)
+      }
       @menuitem("/issues"            ,"issues"     ,"Issues", repository.issueCount)
       @menuitem("/pulls"             ,"pulls"      ,"Pull Requests", repository.pullCount)
       @menuitem("/issues/labels"     ,"labels"     ,"Labels")
diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html
index bb7f7954d..080b669ec 100644
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -8,7 +8,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     <div class="head">
       <div class="pull-right hide-if-blame"><div class="btn-group">
         <a href="@url(repository)/find/@encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t">Find file</a>
diff --git a/src/main/twirl/gitbucket/core/repo/branches.scala.html b/src/main/twirl/gitbucket/core/repo/branches.scala.html
index a6ca10d11..ae1144a6c 100644
--- a/src/main/twirl/gitbucket/core/repo/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html
@@ -4,7 +4,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("branches", repository){
     <h1>Branches</h1>
     <table class="table table-bordered table-hover table-issues branches">
       <thead>
diff --git a/src/main/twirl/gitbucket/core/repo/commit.scala.html b/src/main/twirl/gitbucket/core/repo/commit.scala.html
index d96f8d5aa..dd42a83f5 100644
--- a/src/main/twirl/gitbucket/core/repo/commit.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commit.scala.html
@@ -11,7 +11,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(commit.shortMessage, Some(repository)){
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     <table class="table table-bordered">
       <tr>
         <th class="box-header">
diff --git a/src/main/twirl/gitbucket/core/repo/commits.scala.html b/src/main/twirl/gitbucket/core/repo/commits.scala.html
index a6664367f..ac16baa79 100644
--- a/src/main/twirl/gitbucket/core/repo/commits.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commits.scala.html
@@ -8,7 +8,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     <div class="head">
       @if(pathList.isEmpty){
         @helper.html.branchcontrol(
diff --git a/src/main/twirl/gitbucket/core/repo/delete.scala.html b/src/main/twirl/gitbucket/core/repo/delete.scala.html
index 548cc32a4..5d38e816a 100644
--- a/src/main/twirl/gitbucket/core/repo/delete.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/delete.scala.html
@@ -6,7 +6,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     <form method="POST" action="@url(repository)/remove" validate="true">
       <div class="head">
         <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html
index 0cd210196..be832df12 100644
--- a/src/main/twirl/gitbucket/core/repo/editor.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html
@@ -7,7 +7,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     @if(protectedBranch){
       <div class="alert alert-danger">branch @branch is protected.</div>
     }
diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html
index 0186b727f..7e53be555 100644
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -21,7 +21,7 @@
   } else {
     s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}"
   }, Some(repository)) {
-  @html.menu("code", repository, Some(branch), info, error){
+  @html.menu("files", repository, Some(branch), info, error){
     <div class="head">
       <div class="pull-right pc">
         <div class="btn-group">
diff --git a/src/main/twirl/gitbucket/core/repo/find.scala.html b/src/main/twirl/gitbucket/core/repo/find.scala.html
index f0fb1f078..14d86bf89 100644
--- a/src/main/twirl/gitbucket/core/repo/find.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/find.scala.html
@@ -5,7 +5,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository, Some(branch)){
+  @html.menu("files", repository, Some(branch)){
 
 <div>
   <div class="find-input">
diff --git a/src/main/twirl/gitbucket/core/repo/forked.scala.html b/src/main/twirl/gitbucket/core/repo/forked.scala.html
index d74c84dc8..df7c35370 100644
--- a/src/main/twirl/gitbucket/core/repo/forked.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/forked.scala.html
@@ -6,7 +6,7 @@
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @html.menu("fork", repository){
-    <h3>
+    <h1>
       Forked repositories
       @if(loginAccount.isEmpty){
         <a href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-success">Fork</a>
@@ -17,7 +17,7 @@
           <a href="@path/@repository.owner/@repository.name/fork" class="btn btn-success" rel="facebox">Fork</a>
         }
       }
-    </h3>
+    </h1>
     @if(loginAccount.isDefined && groupNames.isEmpty){
       <form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork" style="display: none;">
         <input type="hidden" name="account" value="@loginAccount.get.userName"/>
diff --git a/src/main/twirl/gitbucket/core/repo/guide.scala.html b/src/main/twirl/gitbucket/core/repo/guide.scala.html
index b95546e78..d4670f33a 100644
--- a/src/main/twirl/gitbucket/core/repo/guide.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/guide.scala.html
@@ -4,7 +4,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("files", repository){
     @if(!hasWritePermission){
       <h3>This is an empty repository</h3>
     } else {
diff --git a/src/main/twirl/gitbucket/core/repo/tags.scala.html b/src/main/twirl/gitbucket/core/repo/tags.scala.html
index 8982779be..78946ed22 100644
--- a/src/main/twirl/gitbucket/core/repo/tags.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/tags.scala.html
@@ -2,7 +2,7 @@
 @import context._
 @import gitbucket.core.view.helpers._
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.menu("code", repository){
+  @html.menu("tags", repository){
     <h1>Tags</h1>
     <table class="table table-bordered">
       <thead>