Move repository status to right of the header

src/main/twirl/gitbucket/core/menu.scala.html

@@ -1,7 +1,6 @@
 @(active: String,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   id: Option[String] = None,
-  isRepoTop: Boolean = false,
   info: Option[Any] = None,
   error: Option[Any] = None)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
@@ -22,6 +21,24 @@
   <div class="container">
     @helper.html.information(info)
     @helper.html.error(error)
+    <div class="pull-right">
+      <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(""))" class="header-link">
+        <i class="octicon octicon-history"></i>
+        @if(repository.commitCount > 10000){
+          <strong>10000+</strong> commits
+        } else {
+          <strong>@repository.commitCount</strong> commits
+        }
+      </a>
+      <a href="@url(repository)/branches" class="header-link" class="header-link">
+        <i class="octicon octicon-git-branch"></i>
+        <strong>@repository.branchList.length</strong> branches
+      </a>
+      <a href="@url(repository)/tags" class="header-link" class="header-link">
+        <i class="octicon octicon-tag"></i>
+        <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>
@@ -32,6 +49,9 @@
             forked from <a href="@path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
           </div>
         }
+        @x.description.map { description =>
+          <div class="normal muted" style="margin-left: 36px; font-size: 80%;">@detectAndRenderLinks(description)</div>
+        }
       }
     </div>
     <ul class="nav nav-tabs">
@@ -47,38 +67,5 @@
   </div>
 </div>
 <div class="container body">
-  @if(isRepoTop){
-    @repository.repository.description.map { description =>
-      <p class="description">@detectAndRenderLinks(description)</p>
-    }
-    <div style="margin-bottom: 10px; padding: 4px;" class="panel panel-default">
-      <table class="fill-width">
-        <tr>
-          <td style="width: 33%; text-align: center;">
-            <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(""))" class="header-link">
-              <i class="octicon octicon-history"></i>
-              @if(repository.commitCount > 10000){
-                <strong>10000+</strong> commits
-              } else {
-                <strong>@repository.commitCount</strong> commits
-              }
-            </a>
-          </td>
-          <td style="width: 33%; text-align: center;">
-            <a href="@url(repository)/branches" class="header-link" class="header-link">
-              <i class="octicon octicon-git-branch"></i>
-              <strong>@repository.branchList.length</strong> branches
-            </a>
-          </td>
-          <td style="width: 33%; text-align: center;">
-            <a href="@url(repository)/tags" class="header-link" class="header-link">
-              <i class="octicon octicon-tag"></i>
-              <strong>@repository.tags.length</strong> releases
-            </a>
-          </td>
-        </tr>
-      </table>
-    </div>
-  }
   @body
 </div>

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), pathList.isEmpty, info, error){
+  @html.menu("code", repository, Some(branch), info, error){
     <div class="head">
       @if(pathList.isEmpty){
         <div class="pull-right pc">

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), false){
+  @html.menu("code", repository, Some(branch)){
 
 <div>
   <div class="find-input">

src/main/webapp/assets/common/css/gitbucket.css

@@ -141,6 +141,7 @@ div.input-group>span.fork {
   margin-top: 1px;
 }
 
+/*
 div.input-group>span.fork>span.count {
   background-color: white;
   -webkit-border-radius: 0 4px 4px 0;
@@ -149,10 +150,10 @@ div.input-group>span.fork>span.count {
   border: 1px solid #d8d8d8;
   border-left: none;
   font-size: 11px;
-  /*height: 24px;*/
   padding: 3px 6px;
   display: table-cell;
 }
+*/
 
 a.global-header-menu {
   color: black;
@@ -173,7 +174,7 @@ div.head {
 }
 
 div.head div.forked {
-  font-size: 60%;
+  font-size: 65%;
   margin-left: 36px;
   color: #999999;
 }
@@ -187,13 +188,6 @@ div.container-wide {
   padding-right: 10px;
 }
 
-/*
-div.pagination {
-  margin-top: 0px;
-  margin-bottom: 0px;
-}
-*/
-
 div.body {
   margin-top: 20px;
   margin-bottom: 40px;