Implementing new header parts

src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala

@@ -758,8 +758,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          .setTree(revCommit.getTree)
          .setOutputStream(response.getOutputStream)
          .call()
-
-      Unit
     }
   }
 

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

@@ -1,15 +1,14 @@
 @(active: String,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   id: Option[String] = None,
-  expand: Boolean = false,
+  isRepoTop: Boolean = false,
   isNoGroup: Boolean = true,
   info: Option[Any] = None,
   error: Option[Any] = None)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-@import gitbucket.core.service.RepositoryService._
 
-@sidemenu(path: String, name: String, icon: String, label: String, count: Int = 0) = {
+@menuitem(path: String, name: String, icon: String, label: String, count: Int = 0) = {
   <li @if(active == name){class="active"}>
     <a href="@url(repository)@path">
       <i class="menu-icon @if(active == name){menu-icon-active} octicon octicon-@{icon} "></i> @label
@@ -19,6 +18,7 @@
     </a>
   </li>
 }
+
 <div class="headbar">
   <div class="container">
     @helper.html.information(info)
@@ -59,12 +59,12 @@
       }
     </div>
     <ul class="headmenu">
-      @sidemenu(""       , "code"   , "code" , "Code")
+      @menuitem(""       , "code"   , "code" , "Code")
-      @sidemenu("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount)
+      @menuitem("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount)
-      @sidemenu("/pulls" , "pulls"  , "git-pull-request" , "Pull Requests", repository.pullCount)
+      @menuitem("/pulls" , "pulls"  , "git-pull-request" , "Pull Requests", repository.pullCount)
-      @sidemenu("/wiki"  , "wiki"   , "book"  , "Wiki")
+      @menuitem("/wiki"  , "wiki"   , "book"  , "Wiki")
       @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
-        @sidemenu("/settings" , "settings" , "tools", "Settings")
+        @menuitem("/settings" , "settings" , "tools", "Settings")
       }
     </ul>
   </div>
@@ -99,7 +99,7 @@
     }
 *@
 @*  <div class="pull-left" style="width: 895px;">*@
-    @if(expand){
+    @if(isRepoTop){
       @repository.repository.description.map { description =>
         <p class="description">@detectAndRenderLinks(description)</p>
       }
@@ -173,7 +173,7 @@ $(function(){
       $('#fork-form').submit();
     });
   }
-
+@*
   @repository.sshUrl.map { sshUrl =>
     $('#repository-url-http').click(function(){
       $('#repository-url-proto').text('HTTP');
@@ -189,5 +189,6 @@ $(function(){
       $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
     });
   }
+*@
 });
 </script>

src/main/twirl/gitbucket/core/repo/files.scala.html

@@ -11,6 +11,7 @@
   error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
+@import gitbucket.core.service.RepositoryService._
 @html.main(
   if(pathList.isEmpty){
     if(branch == repository.repository.defaultBranch){
@@ -23,12 +24,32 @@
   }, Some(repository)) {
   @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){
     <div class="head">
-      <div class="pull-right"><div class="btn-group">
+      @if(pathList.isEmpty){
-        <a href="@url(repository)/find/@encodeRefName(branch)" class="btn btn-sm btn-default" data-toggle="tooltip" data-placement="bottom" data-hotkey="t" title="Quickly jump between files"><i class="octicon octicon-list-unordered"></i></a>
+        <div class="pull-right">
-        @if(pathList.nonEmpty){
+          @if(platform != "linux" && platform != null){
-          <a href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default" data-toggle="tooltip" data-placement="bottom" title="Browse commits for this branch"><i class="octicon octicon-clock"></i></a>
+            <a href="@openRepoUrl(repository.httpUrl)" id="repository-clone-url" class="btn btn-sm btn-default"><i class="octicon octicon-desktop-download"></i></a>
-        }
+          }
-      </div></div>
+          <a href="@{url(repository)}/archive/@{encodeRefName(branch)}.zip" class="btn btn-sm btn-default"><i class="octicon octicon-cloud-download"></i>Download ZIP</a>
+        </div>
+        <div class="pull-right">
+          <div style="width: 200px; margin-top: 2px; margin-right: 5px; margin-left: 5px;">
+            @helper.html.copy("repository-url-copy", repository.httpUrl){
+              <input type="text" value="@repository.httpUrl" id="repository-url" class="form-control input-sm" readonly>
+            }
+          </div>
+        </div>
+        <div class="pull-right">
+          <div class="btn-group">
+          <a href="@url(repository)/find/@encodeRefName(branch)" class="btn btn-sm btn-default" data-toggle="tooltip" data-placement="bottom" data-hotkey="t">Find file</a>
+          @*
+          @if(pathList.nonEmpty){
+            <a href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-sm btn-default" data-toggle="tooltip" data-placement="bottom" title="Browse commits for this branch">History</a>
+          }
+          *@
+          </div>
+        </div>
+      }
+
       @branchPullRequest.map{ case (pullRequest, issue) =>
         <a href="@url(repository)/pull/@pullRequest.issueId" class="btn btn-sm btn-pullrequest-branch" title="@issue.title" data-toggle="tooltip">#@pullRequest.issueId</a>
       }.getOrElse{