From ddeaffb705876b11cfb5f8dbd4b9960ec4c12369 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sat, 12 May 2018 16:37:30 +0900
Subject: [PATCH 1/3] Move Fork button to the header

---
 src/main/twirl/gitbucket/core/menu.scala.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index 04d9de031..ac2d6f2af 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -53,9 +53,6 @@
           @menuitem(externalWikiUrl, "wiki", "Wiki", "book")
         }
       }
-      @if(repository.repository.options.allowFork) {
-        @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
-      }
       @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){
         @menuitem("/settings", "settings", "Settings", "gear")
       }
@@ -78,6 +75,9 @@
             @gitbucket.core.plugin.PluginRegistry().getRepositoryHeaders.map { repositoryHeaderComponent =>
               @repositoryHeaderComponent(repository, context)
             }
+            <a class="btn btn-default btn-sm" href="@helpers.url(repository)/network/members">
+              <span class="strong"><i class="octicon octicon-repo-forked"></i>Fork</span><span class="muted">: @repository.forkedCount</span>
+            </a>
           </div>
           @gitbucket.core.helper.html.repositoryicon(repository, true)
           <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>

From 6e4a203f815d8abd099e2c45e8fc0cd49672b352 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 18 Jun 2018 16:02:12 +0900
Subject: [PATCH 2/3] Hide fork button if its option is disabled

---
 src/main/twirl/gitbucket/core/menu.scala.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index ac2d6f2af..355fec6e6 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -75,9 +75,11 @@
             @gitbucket.core.plugin.PluginRegistry().getRepositoryHeaders.map { repositoryHeaderComponent =>
               @repositoryHeaderComponent(repository, context)
             }
-            <a class="btn btn-default btn-sm" href="@helpers.url(repository)/network/members">
-              <span class="strong"><i class="octicon octicon-repo-forked"></i>Fork</span><span class="muted">: @repository.forkedCount</span>
-            </a>
+            @if(repository.repository.options.allowFork) {
+              <a class="btn btn-default btn-sm" href="@helpers.url(repository)/network/members">
+                <span class="strong"><i class="octicon octicon-repo-forked"></i>Fork</span><span class="muted">: @repository.forkedCount</span>
+              </a>
+            }
           </div>
           @gitbucket.core.helper.html.repositoryicon(repository, true)
           <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>

From e578f9548b6bf7eb7bf4dedd4ad524f263ab7071 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 25 Jun 2018 19:42:57 +0900
Subject: [PATCH 3/3] Add a button to show forked repos to the fork account
 select dialog

---
 .../core/helper/forkrepository.scala.html     | 33 ++++++++--------
 src/main/twirl/gitbucket/core/menu.scala.html | 30 ++++++++++++--
 .../gitbucket/core/repo/forked.scala.html     | 39 +------------------
 3 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/helper/forkrepository.scala.html b/src/main/twirl/gitbucket/core/helper/forkrepository.scala.html
index e7de31a7c..628428b01 100644
--- a/src/main/twirl/gitbucket/core/helper/forkrepository.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/forkrepository.scala.html
@@ -1,23 +1,24 @@
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
   groupAndPerm: Seq[(String, Boolean)])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
-<h2 class="facebox-header">Where should we fork this repository?</h2>
+<h2 class="facebox-header">
+  Where should we fork this repository?
+  <a class="btn btn-default btn-sm" href="@helpers.url(repository)/network/members">Show forks</a>
+</h2>
 <form action="@helpers.url(repository)/fork" id="fork" method="post">
-  <div class="content">
-    <div class="block">
-      @helpers.avatar(context.loginAccount.get.userName, 24) <a href="javascript:void(0);" class="js-fork-owner-select-target">@@@context.loginAccount.get.userName</a>
-    </div>
-    @for((groupName, isManager) <- groupAndPerm) {
-      @if(isManager) {
-        <div class="block js-fork-owner-select-target">
-          @helpers.avatar(groupName, 24) <a href="javascript:void(0);" class="js-fork-owner-select-target">@@@groupName</a>
-        </div>
-      } else {
-        <div class="block" title="You don't have permission to fork here.">
-          @helpers.avatar(groupName, 24) <span class="muted">@@@groupName</span>
-        </div>
-      }
-    }
+  <div class="block">
+    @helpers.avatar(context.loginAccount.get.userName, 24) <a href="javascript:void(0);" class="js-fork-owner-select-target">@@@context.loginAccount.get.userName</a>
   </div>
+  @for((groupName, isManager) <- groupAndPerm) {
+    @if(isManager) {
+      <div class="block js-fork-owner-select-target">
+        @helpers.avatar(groupName, 24) <a href="javascript:void(0);" class="js-fork-owner-select-target">@@@groupName</a>
+      </div>
+    } else {
+      <div class="block" title="You don't have permission to fork here.">
+        @helpers.avatar(groupName, 24) <span class="muted">@@@groupName</span>
+      </div>
+    }
+  }
   <input id="account" name="account" type="hidden" />
 </form>
diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html
index 355fec6e6..4873cb7de 100644
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -76,10 +76,19 @@
               @repositoryHeaderComponent(repository, context)
             }
             @if(repository.repository.options.allowFork) {
-              <a class="btn btn-default btn-sm" href="@helpers.url(repository)/network/members">
-                <span class="strong"><i class="octicon octicon-repo-forked"></i>Fork</span><span class="muted">: @repository.forkedCount</span>
-              </a>
+              @if(context.loginAccount.isEmpty){
+                <a class="btn btn-default btn-sm" href="@context.path/signin?redirect=@helpers.urlEncode(s"${context.path}/${repository.owner}/${repository.name}")">
+                  <span class="strong"><i class="octicon octicon-repo-forked"></i>Fork</span><span class="muted">: @repository.forkedCount</span>
+                </a>
+              } else {
+                <a class="btn btn-default btn-sm" href="@context.path/@repository.owner/@repository.name/fork" rel="facebox">
+                  <span class="strong"><i class="octicon octicon-repo-forked"></i>Fork</span><span class="muted">: @repository.forkedCount</span>
+                </a>
+              }
             }
+            <form id="fork-form" method="post" action="@context.path/@repository.owner/@repository.name/fork" style="display: none;">
+              <input type="hidden" name="account" value="@context.loginAccount.get.userName"/>
+            </form>
           </div>
           @gitbucket.core.helper.html.repositoryicon(repository, true)
           <a href="@helpers.url(repository.owner)">@repository.owner</a> / <a href="@helpers.url(repository)" class="strong">@repository.name</a>
@@ -97,4 +106,19 @@
     @body
   </div>
 </div>
+<script>
+$(function(){
+  $('a[rel*=facebox]').facebox({
+    'loadingImage': '@helpers.assets("/vendors/facebox/loading.gif")',
+    'closeImage': '@helpers.assets("/vendors/facebox/closelabel.png")'
+  });
+
+  $(document).on("click", ".js-fork-owner-select-target", function() {
+    var account = $(this).text().replace("@@", "");
+    $("#account").val(account);
+    $("#fork").submit();
+  });
+});
+</script>
+
 
diff --git a/src/main/twirl/gitbucket/core/repo/forked.scala.html b/src/main/twirl/gitbucket/core/repo/forked.scala.html
index 1bd9988b6..b143526d4 100644
--- a/src/main/twirl/gitbucket/core/repo/forked.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/forked.scala.html
@@ -5,23 +5,7 @@
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @gitbucket.core.html.menu("fork", repository){
-    <h1 class="body-title">
-      Forked repositories
-      @if(context.loginAccount.isEmpty){
-        <a href="@context.path/signin?redirect=@helpers.urlEncode(s"${context.path}/${repository.owner}/${repository.name}")" class="btn btn-success">Fork</a>
-      } else {
-        @if(groupNames.isEmpty) {
-          <a id="fork-link" href="javascript:void(0);" class="btn btn-success">Fork</a>
-        } else {
-          <a href="@context.path/@repository.owner/@repository.name/fork" class="btn btn-success" rel="facebox">Fork</a>
-        }
-      }
-    </h1>
-    @if(context.loginAccount.isDefined && groupNames.isEmpty){
-      <form id="fork-form" method="post" action="@context.path/@repository.owner/@repository.name/fork" style="display: none;">
-        <input type="hidden" name="account" value="@context.loginAccount.get.userName"/>
-      </form>
-    }
+    <h1 class="body-title">Forked repositories</h1>
     <div class="block">
       @if(originRepository.isDefined){
         @helpers.avatarLink(originRepository.get.owner, 20)
@@ -46,24 +30,3 @@
     }
   }
 }
-<script>
-$(function(){
-  $('a[rel*=facebox]').facebox({
-    'loadingImage': '@helpers.assets("/vendors/facebox/loading.gif")',
-    'closeImage': '@helpers.assets("/vendors/facebox/closelabel.png")'
-  });
-
-  $(document).on("click", ".js-fork-owner-select-target", function() {
-    var account = $(this).text().replace("@@", "");
-    $("#account").val(account);
-    $("#fork").submit();
-  });
-
-  @if(context.loginAccount.isDefined){
-  $(document).on("click", "a#fork-link", function(e) {
-    e.preventDefault();
-    $('#fork-form').submit();
-  });
-  }
-});
-</script>