From 09c50a149b1bf3e0b52c05119f685f7dae73d8e9 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 9 Jul 2016 16:07:32 +0900 Subject: [PATCH] Change import to resolve resolving error in IntelliJ --- .../twirl/gitbucket/core/repo/blob.scala.html | 51 +++++++-------- .../gitbucket/core/repo/branches.scala.html | 39 ++++++------ .../core/repo/commentform.scala.html | 13 ++-- .../gitbucket/core/repo/commit.scala.html | 39 ++++++------ .../gitbucket/core/repo/commits.scala.html | 35 +++++------ .../gitbucket/core/repo/delete.scala.html | 23 ++++--- .../core/repo/editcomment.scala.html | 5 +- .../gitbucket/core/repo/editor.scala.html | 33 +++++----- .../gitbucket/core/repo/files.scala.html | 63 +++++++++---------- .../twirl/gitbucket/core/repo/find.scala.html | 13 ++-- .../gitbucket/core/repo/forked.scala.html | 35 +++++------ .../gitbucket/core/repo/guide.scala.html | 12 ++-- .../twirl/gitbucket/core/repo/tags.scala.html | 17 +++-- .../gitbucket/core/search/code.scala.html | 21 +++---- .../gitbucket/core/search/issues.scala.html | 25 ++++---- .../gitbucket/core/search/menu.scala.html | 13 ++-- .../gitbucket/core/search/wiki.scala.html | 21 +++---- .../core/settings/branches.scala.html | 18 +++--- .../core/settings/branchprotection.scala.html | 14 ++--- .../core/settings/collaborators.scala.html | 17 +++-- .../gitbucket/core/settings/danger.scala.html | 19 +++--- .../core/settings/edithooks.scala.html | 21 +++---- .../gitbucket/core/settings/hooks.scala.html | 19 +++--- .../gitbucket/core/settings/menu.scala.html | 15 +++-- .../core/settings/options.scala.html | 13 ++-- .../gitbucket/core/wiki/compare.scala.html | 21 +++---- .../twirl/gitbucket/core/wiki/edit.scala.html | 10 +-- .../gitbucket/core/wiki/history.scala.html | 25 ++++---- .../twirl/gitbucket/core/wiki/page.scala.html | 41 ++++++------ .../gitbucket/core/wiki/pages.scala.html | 11 ++-- 30 files changed, 336 insertions(+), 366 deletions(-) diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html index 080b669ec..33e53957b 100644 --- a/src/main/twirl/gitbucket/core/repo/blob.scala.html +++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html @@ -5,13 +5,14 @@ latestCommit: gitbucket.core.util.JGitUtil.CommitInfo, hasWritePermission: Boolean, isBlame: Boolean)(implicit context: gitbucket.core.controller.Context) -@import context._ -@import gitbucket.core.view.helpers._ -@html.main(s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}", Some(repository)) { - @html.menu("files", repository){ +@import gitbucket.core.view.helpers +@import gitbucket.core.helper.html.datetimeago +@import gitbucket.core.helper.html.checkicon +@gitbucket.core.html.main(s"${(repository.name :: pathList).mkString("/")} at ${helpers.encodeRefName(branch)} - ${repository.owner}/${repository.name}", Some(repository)) { + @gitbucket.core.html.menu("files", repository){
- Find file + Find file
Newer @@ -29,71 +30,71 @@ Older
- @helper.html.branchcontrol( + @gitbucket.core.helper.html.branchcontrol( branch, repository, hasWritePermission ){ @repository.branchList.map { x => -
  • @helper.html.checkicon(x == branch) @x
    • +
  • @checkicon(x == branch) @x
    • } } - @repository.name / + @repository.name / @pathList.zipWithIndex.map { case (section, i) => @if(i == pathList.length - 1){ @section } else { - @section / + @section / } }
    - @avatar(latestCommit, 28) - @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong") - @helper.html.datetimeago(latestCommit.commitTime) - @link(latestCommit.summary, repository) + @helpers.avatar(latestCommit, 28) + @helpers.user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong") + @datetimeago(latestCommit.commitTime) + @helpers.link(latestCommit.summary, repository)
    @if(hasWritePermission && content.viewType == "text" && repository.branchList.contains(branch)){ - Edit + Edit } - Raw + Raw @if(content.viewType == "text"){ - Blame + Blame } - History + History @if(hasWritePermission && repository.branchList.contains(branch)){ - Delete + Delete }
    @if(content.viewType == "text"){ - @defining(isRenderable(pathList.reverse.head)){ isRrenderable => - @if(!isBlame && isRrenderable) { + @defining(helpers.isRenderable(pathList.reverse.head)){ isRenderable => + @if(!isBlame && isRenderable) {
    - @renderMarkup(pathList, content.content.get, branch, repository, false, false, true) + @helpers.renderMarkup(pathList, content.content.get, branch, repository, false, false, true)
    } else {
    - 
    @content.content.get
    + 
    @content.content.get
    } } } @if(content.viewType == "image"){
    - +
    } @if(content.viewType == "large" || content.viewType == "binary"){
    - View Raw
    + View Raw

    (Sorry about that, but we can't show files that are this big right now)
    } } } - + - + + - - + + +