diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala index 3a868b1..ede7dc9 100644 --- a/src/main/scala/view/helpers.scala +++ b/src/main/scala/view/helpers.scala @@ -70,7 +70,7 @@ /** * URL encode except '/'. */ - def encodeBranchName(value: String): String = StringUtil.urlEncode(value).replace("%2F", "/") + def encodeRefName(value: String): String = StringUtil.urlEncode(value).replace("%2F", "/") def urlEncode(value: String): String = StringUtil.urlEncode(value) diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html index ba442ff..2b3c0cf 100644 --- a/src/main/twirl/pulls/compare.scala.html +++ b/src/main/twirl/pulls/compare.scala.html @@ -27,7 +27,7 @@ } @helper.html.dropdown(originId, "base") { @originRepository.branchList.map { branch => -
  • @helper.html.checkicon(branch == originId) @branch
    • +
  • @helper.html.checkicon(branch == originId) @branch
    • } } ... @@ -38,7 +38,7 @@ } @helper.html.dropdown(forkedId, "compare") { @forkedRepository.branchList.map { branch => -
  • @helper.html.checkicon(branch == forkedId) @branch
    • +
  • @helper.html.checkicon(branch == forkedId) @branch
    • } } diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index 96cd73f..6478df2 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -9,12 +9,12 @@ @html.header("code", repository) @tab(branch, repository, "files")
    - @repository.name / + @repository.name / @pathList.zipWithIndex.map { case (section, i) => @if(i == pathList.length - 1){ @section } else { - @section / + @section / } }
    @@ -30,7 +30,7 @@
    Raw - History + History
    diff --git a/src/main/twirl/repo/branches.scala.html b/src/main/twirl/repo/branches.scala.html index c8c5681..5a2cfb0 100644 --- a/src/main/twirl/repo/branches.scala.html +++ b/src/main/twirl/repo/branches.scala.html @@ -16,7 +16,7 @@ @branchInfo.map { case (branchName, latestUpdateDate) => - @branchName + @branchName @* Delete branch *@ @@ -28,10 +28,10 @@ @if(repository.repository.defaultBranch == branchName){ Base branch } else { - to @{repository.repository.defaultBranch} + to @{repository.repository.defaultBranch} } - ZIP + ZIP } diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html index 9a0805f..03a357c 100644 --- a/src/main/twirl/repo/commit.scala.html +++ b/src/main/twirl/repo/commit.scala.html @@ -26,7 +26,7 @@ @branches.zipWithIndex.map { case (branch, i) => - @branch + @branch } } diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html index 35f5d43..55f2274 100644 --- a/src/main/twirl/repo/commits.scala.html +++ b/src/main/twirl/repo/commits.scala.html @@ -11,16 +11,16 @@ @tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
    @if(pathList.isEmpty){ - @repository.name / Commit History + @repository.name / Commit History } @if(pathList.nonEmpty){ History for - @repository.name / + @repository.name / @pathList.zipWithIndex.map { case (section, i) => @if(i == pathList.length - 1){ @section } else { - @section / + @section / } } } diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 4e8ffde..19f7e96 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -12,12 +12,12 @@
    @defining(repository.commitCount){ commitCount => - @if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")  + @if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")  }
    - @repository.name / + @repository.name / @pathList.zipWithIndex.map { case (section, i) => - @section / + @section / }
    @@ -46,7 +46,7 @@ @if(pathList.size > 0){ - .. + .. @@ -62,9 +62,9 @@ @if(file.isDirectory){ - @file.name + @file.name } else { - @file.name + @file.name } @datetime(file.time) diff --git a/src/main/twirl/repo/tab.scala.html b/src/main/twirl/repo/tab.scala.html index a976871..c245780 100644 --- a/src/main/twirl/repo/tab.scala.html +++ b/src/main/twirl/repo/tab.scala.html @@ -12,13 +12,13 @@ style = "margin-right: 20px;" ){ @repository.branchList.map { branch => -
  • @helper.html.checkicon(id == branch) @branch
    • +
  • @helper.html.checkicon(id == branch) @branch
    • } } } - Files - Commits + Files + Commits Branches@if(repository.branchList.length > 0){ @repository.branchList.length} Tags@if(repository.tags.length > 0){ @repository.tags.length}
  • @@ -28,7 +28,7 @@
  • - ZIP + ZIP
    • diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html index 78d108f..2574f3e 100644 --- a/src/main/twirl/repo/tags.scala.html +++ b/src/main/twirl/repo/tags.scala.html @@ -14,10 +14,10 @@ @repository.tags.map { tag => - @tag.name + @tag.name @datetime(tag.time) @tag.id.substring(0, 10) - ZIP + ZIP }