diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index e5680d3..b1fa0f9 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -497,6 +497,10 @@ getForkedRepositories( repository.repository.originUserName.getOrElse(repository.owner), repository.repository.originRepositoryName.getOrElse(repository.name)), + context.loginAccount match { + case None => List() + case account: Option[Account] => getGroupsByUserName(account.get.userName) + }, // groups of current user repository) }) @@ -507,13 +511,7 @@ using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => val ref = multiParams("splat").head JGitUtil.getTreeId(git, ref).map{ treeId => - html.find(ref, - treeId, - repository, - context.loginAccount match { - case None => List() - case account: Option[Account] => getGroupsByUserName(account.get.userName) - }) + html.find(ref, treeId, repository) } getOrElse NotFound } }) @@ -575,10 +573,6 @@ html.files(revision, repository, if(path == ".") Nil else path.split("/").toList, // current path - context.loginAccount match { - case None => List() - case account: Option[Account] => getGroupsByUserName(account.get.userName) - }, // groups of current user new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount), getPullRequestFromBranch(repository.owner, repository.name, revstr, repository.repository.defaultBranch), diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html index d2d8f6e..de74c01 100644 --- a/src/main/twirl/gitbucket/core/account/application.scala.html +++ b/src/main/twirl/gitbucket/core/account/application.scala.html @@ -33,9 +33,9 @@ } @personalTokens.zipWithIndex.map { case (token, i) => @if(i != 0){ -
+
} - @token.note + @token.note Delete } diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html index be35630..653d467 100644 --- a/src/main/twirl/gitbucket/core/account/group.scala.html +++ b/src/main/twirl/gitbucket/core/account/group.scala.html @@ -42,12 +42,12 @@
@if(account.isDefined){
- Delete Group + Delete Group
} - + @if(account.isDefined){ - Cancel + Cancel }
diff --git a/src/main/twirl/gitbucket/core/account/menu.scala.html b/src/main/twirl/gitbucket/core/account/menu.scala.html index 47734f9..ef4fbc5 100644 --- a/src/main/twirl/gitbucket/core/account/menu.scala.html +++ b/src/main/twirl/gitbucket/core/account/menu.scala.html @@ -1,7 +1,7 @@ @(active: String, ssh: Boolean)(implicit context: gitbucket.core.controller.Context) @import context._
-
diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html index 34f8388..24f40f0 100644 --- a/src/main/twirl/gitbucket/core/account/ssh.scala.html +++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html @@ -17,9 +17,9 @@ } @sshKeys.zipWithIndex.map { case (key, i) => @if(i != 0){ -
+
} - @key.title (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid.")) + @key.title (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid.")) Delete } diff --git a/src/main/twirl/gitbucket/core/admin/menu.scala.html b/src/main/twirl/gitbucket/core/admin/menu.scala.html index dba5f63..eac843e 100644 --- a/src/main/twirl/gitbucket/core/admin/menu.scala.html +++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html @@ -3,7 +3,7 @@
-
- \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/helper/copy.scala.html b/src/main/twirl/gitbucket/core/helper/copy.scala.html index d0172ab..827ff0b 100644 --- a/src/main/twirl/gitbucket/core/helper/copy.scala.html +++ b/src/main/twirl/gitbucket/core/helper/copy.scala.html @@ -3,12 +3,12 @@
@html -
} else { - } - + @@ -53,14 +53,14 @@ *@ - GitBucket + GitBucket @defining(AutoUpdate.getCurrentVersion){ version => @version.majorVersion.@version.minorVersion } @if(loginAccount.isDefined){ @repository.map { repository => - + } @@ -69,7 +69,7 @@ } else { @* TODO: merge with below *@ @repository.map { repository => - + } @@ -100,7 +100,7 @@
} else { - Sign in + Sign in } diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index c26bc81..2e077f2 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -1,17 +1,15 @@ @(active: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo, id: Option[String] = None, - isRepoTop: Boolean = false, - isNoGroup: Boolean = true, info: Option[Any] = None, error: Option[Any] = None)(body: Html)(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ -@menuitem(path: String, name: String, icon: String, label: String, count: Int = 0) = { +@menuitem(path: String, name: String, label: String, count: Int = 0) = {
  • - @label + @label @if(count > 0){ @count } @@ -23,30 +21,25 @@
    @helper.html.information(info) @helper.html.error(error) -
    - @if(repository.commitCount > 0){ -
    - - - @if(loginAccount.isEmpty){ - Fork - } else { - @if(isNoGroup) { - Fork - } else { - Fork - } - } - - @repository.forkedCount - -
    - @if(loginAccount.isDefined && isNoGroup){ - +
    + + + @if(repository.commitCount > 10000){ + 10000+ commits + } else { + @repository.commitCount commits } - } + + + + @repository.branchList.length branches + + + + @repository.tags.length releases + +
    +
    @helper.html.repositoryicon(repository, true) @repository.owner / @repository.name @@ -56,92 +49,23 @@ forked from @x.parentUserName/@x.parentRepositoryName
    } + @x.description.map { description => +
    @detectAndRenderLinks(description)
    + } }
    -
    - @if(isRepoTop){ - @repository.repository.description.map { description => -

    @detectAndRenderLinks(description)

    - } -
    - - - - - - -
    - - - @if(repository.commitCount > 10000){ - 10000+ commits - } else { - @repository.commitCount commits - } - - - - - @repository.branchList.length branches - - - - - @repository.tags.length releases - -
    -
    - } @body
    - diff --git a/src/main/twirl/gitbucket/core/pulls/commits.scala.html b/src/main/twirl/gitbucket/core/pulls/commits.scala.html index 6ce399d..9b9b831 100644 --- a/src/main/twirl/gitbucket/core/pulls/commits.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/commits.scala.html @@ -4,42 +4,40 @@ @import context._ @import gitbucket.core.view.helpers._ @import gitbucket.core.model._ -
    - @commits.map { day => -
    - Commits on @date(day.head.commitTime) -
    -
    - @day.map { commit => -
    - +@commits.map { day => +
    + Commits on @date(day.head.commitTime) +
    +
    + @day.map { commit => +
    +
    + @commit.id.substring(0, 7) + +
    +
    +
    @avatarLink(commit, 40)
    -
    @avatarLink(commit, 40)
    + @link(commit.summary, repository) + @if(commit.description.isDefined){ + ... + } +
    + @if(commit.description.isDefined){ + + }
    - @link(commit.summary, repository) - @if(commit.description.isDefined){ - ... + @user(commit.authorName, commit.authorEmailAddress, "username") + authored @helper.html.datetimeago(commit.authorTime) + @if(commit.isDifferentFromAuthor) { + + @user(commit.committerName, commit.committerEmailAddress, "username") + committed @helper.html.datetimeago(commit.authorTime) } -
    - @if(commit.description.isDefined){ - - } -
    - @user(commit.authorName, commit.authorEmailAddress, "username") - authored @helper.html.datetimeago(commit.authorTime) - @if(commit.isDifferentFromAuthor) { - - @user(commit.committerName, commit.committerEmailAddress, "username") - committed @helper.html.datetimeago(commit.authorTime) - } -
    - } -
    - } -
    +
    + } +
    +} diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index 36ad7ee..4d2c7c3 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -78,7 +78,7 @@
    - +
    diff --git a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html index a4e4749..5270646 100644 --- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html @@ -12,7 +12,7 @@ @import gitbucket.core.model._
    -
    +
    @issues.html.commentlist(Some(issue), comments, hasWritePermission, repository, Some(pullreq))
    @@ -44,7 +44,7 @@ @issues.html.commentform(issue, !merged, hasWritePermission, repository) }
    -
    +
    @issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
    diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html index 50cca17..3dd8c07 100644 --- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html @@ -51,7 +51,7 @@
    - +
    } @@ -83,7 +83,7 @@
    @if(status.hasMergePermission){
    - +   You can also merge branches on the command line.

    @@ -35,7 +35,7 @@

    @@ -66,7 +66,7 @@ }
    -