Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-15 18:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak branch list presentation

Browse Source
This commit is contained in:
Naoki Takezoe
2016-05-05 16:00:04 +09:00
parent 7534a88607
commit 05bfaafe32
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/twirl/gitbucket/core/repo/branches.scala.html
View File

@@ -33,13 +33,13 @@
urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch) urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
}.getOrElse { }.getOrElse {
encodeRefName(repository.repository.defaultBranch) encodeRefName(repository.repository.defaultBranch)
}}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-default">New Pull Request</a> }}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-success">New Pull Request</a>
} else { } else {
<a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent => <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch) urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
}.getOrElse { }.getOrElse {
encodeRefName(repository.repository.defaultBranch) encodeRefName(repository.repository.defaultBranch)
}}...@{encodeRefName(branch.name)}" class="btn btn-default">Compare</a> }}...@{encodeRefName(branch.name)}" class="btn btn-success">Compare</a>
} }
} }
@if(hasWritePermission){ @if(hasWritePermission){
@@ -68,7 +68,7 @@
</div> </div>
<div class="branch-a-b-count"> <div class="branch-a-b-count">
@if(branch.mergeInfo.isEmpty){ @if(branch.mergeInfo.isEmpty){
<span class="label">Default</span> <span class="badge">Default</span>
}else{ }else{
@branch.mergeInfo.map{ info => @branch.mergeInfo.map{ info =>
<div data-toggle="tooltip" title="@info.ahead commits ahead, @info.behind commits behind @repository.repository.defaultBranch"> <div data-toggle="tooltip" title="@info.ahead commits ahead, @info.behind commits behind @repository.repository.defaultBranch">