diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html index 10ce60c..3923771 100644 --- a/src/main/twirl/gitbucket/core/issues/create.scala.html +++ b/src/main/twirl/gitbucket/core/issues/create.scala.html @@ -9,7 +9,7 @@ @html.menu("issues", repository){
-
+
@avatarLink(loginAccount.get.userName, 48)
@@ -32,7 +32,7 @@
-
+
@issueinfo(None, Nil, Nil, collaborators, milestones.map(x => (x, 0, 0)), labels, hasWritePermission, repository)
diff --git a/src/main/twirl/gitbucket/core/issues/issue.scala.html b/src/main/twirl/gitbucket/core/issues/issue.scala.html index d948fe2..3d056bf 100644 --- a/src/main/twirl/gitbucket/core/issues/issue.scala.html +++ b/src/main/twirl/gitbucket/core/issues/issue.scala.html @@ -47,11 +47,11 @@
-
+
@commentlist(Some(issue), comments, hasWritePermission, repository) @commentform(issue, true, hasWritePermission, repository)
-
+
@issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
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/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/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html index bb0dfd9..d0f6af0 100644 --- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html @@ -66,7 +66,7 @@ }
-