Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-05 07:09:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2005 from gitbucket/fork-button

Browse Source 
Move Fork button to the header
This commit is contained in:
Naoki Takezoe
2018-06-25 19:54:37 +09:00
committed by GitHub
parent 9830392cb9 e578f9548b
commit d322f772e8
3 changed files with 47 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/twirl/gitbucket/core/helper/forkrepository.scala.html
View File

@@ -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>

32
src/main/twirl/gitbucket/core/menu.scala.html
View File

@@ -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,20 @@
@gitbucket.core.plugin.PluginRegistry().getRepositoryHeaders.map { repositoryHeaderComponent =>
@repositoryHeaderComponent(repository, context)
}
@if(repository.repository.options.allowFork) {
@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>
@@ -95,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>

39
src/main/twirl/gitbucket/core/repo/forked.scala.html
View File

@@ -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>