diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index df896a14f..fbfeafe5a 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -21,45 +21,47 @@ @import gitbucket.core.view.helpers @gitbucket.core.html.main(s"Pull requests - ${repository.owner}/${repository.name}", Some(repository)){ @gitbucket.core.html.menu("pulls", repository){ -
-
- @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork", filter=("origin_repo", "Find Repository...")) { - @members.map { case (owner, name, defaultBranch) => -
  • @gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name
  • +
    +
    +
    + @gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork", filter=("origin_repo", "Find Repository...")) { + @members.map { case (owner, name, defaultBranch) => +
  • @gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name
  • + } } - } - @gitbucket.core.helper.html.dropdown(originId, "base", filter=("origin_branch", "Find Branch...")) { - @if(!originRepository.branchList.contains(originId)){ -
  • @gitbucket.core.helper.html.checkicon(true) @originId
  • + @gitbucket.core.helper.html.dropdown(originId, "base", filter=("origin_branch", "Find Branch...")) { + @if(!originRepository.branchList.contains(originId)){ +
  • @gitbucket.core.helper.html.checkicon(true) @originId
  • + } + @originRepository.branchList.map { branch => +
  • @gitbucket.core.helper.html.checkicon(branch == originId) @branch
  • + } } - @originRepository.branchList.map { branch => -
  • @gitbucket.core.helper.html.checkicon(branch == originId) @branch
  • + + ... + @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork", filter=("forked_repo", "Find Repository...")) { + @members.map { case (owner, name, defaultBranch) => +
  • @gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name
  • + } } - } - ... - @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork", filter=("forked_repo", "Find Repository...")) { - @members.map { case (owner, name, defaultBranch) => -
  • @gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name
  • - } - } - @gitbucket.core.helper.html.dropdown(forkedId, "compare", filter=("forked_branch", "Find Branch...")) { - @if(!forkedRepository.branchList.contains(forkedId)){ -
  • @gitbucket.core.helper.html.checkicon(true) @forkedId
  • - } - @forkedRepository.branchList.map { branch => -
  • @gitbucket.core.helper.html.checkicon(branch == forkedId) @branch
  • + @gitbucket.core.helper.html.dropdown(forkedId, "compare", filter=("forked_branch", "Find Branch...")) { + @if(!forkedRepository.branchList.contains(forkedId)){ +
  • @gitbucket.core.helper.html.checkicon(true) @forkedId
  • + } + @forkedRepository.branchList.map { branch => +
  • @gitbucket.core.helper.html.checkicon(branch == forkedId) @branch
  • + } } + +
    + @if(originRepository.branchList.contains(originId) && forkedRepository.branchList.contains(forkedId)){ + }
    - @if(originRepository.branchList.contains(originId) && forkedRepository.branchList.contains(forkedId)){ - - } -
    - @if(commits.nonEmpty && context.loginAccount.isDefined && originRepository.branchList.contains(originId) && forkedRepository.branchList.contains(forkedId)){ -
    - + @if(commits.nonEmpty && context.loginAccount.isDefined && originRepository.branchList.contains(originId) && forkedRepository.branchList.contains(forkedId)){ +
    @@ -113,9 +115,9 @@ )
    - -
    - } +
    + } + @if(commits.isEmpty){

    There isn't anything to compare.