diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html index 3b7f125..5b43005 100644 --- a/src/main/twirl/issues/issue.scala.html +++ b/src/main/twirl/issues/issue.scala.html @@ -10,44 +10,41 @@ @import view.helpers._ @html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("issues", repository){ - + + + + @if(issue.closed) { + Closed + } else { + Open + } + + @user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining( + comments.filter( _.action.contains("comment") ).size + ){ count => + @count @plural(count, "comment") + } + +

+
@commentlist(issue, comments, hasWritePermission, repository) diff --git a/src/main/twirl/pulls/mergeguide.scala.html b/src/main/twirl/pulls/mergeguide.scala.html index d8f28d1..e859794 100644 --- a/src/main/twirl/pulls/mergeguide.scala.html +++ b/src/main/twirl/pulls/mergeguide.scala.html @@ -36,7 +36,7 @@

} @helper.html.copy("repository-url-copy", requestRepositoryUrl){ - + }

diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html index efc9840..452ec52 100644 --- a/src/main/twirl/pulls/pullreq.scala.html +++ b/src/main/twirl/pulls/pullreq.scala.html @@ -14,74 +14,50 @@ @html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("pulls", repository){ @defining(dayByDayCommits.flatten){ commits => -

    -
  • -

    - - @issue.title - #@issue.issueId - - -

    - @if(issue.closed) { - @comments.find(_.action == "merge").map{ comment => - Merged - - @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch - @helper.html.datetimeago(comment.registeredDate) - - }.getOrElse { - Closed - - @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch - - } - } else { - Open - - @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch - - } -

    -
    • -
  • -
    - @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){ +
    +
    + @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){ Edit - } - New issue -
    - -
    • -
- @* -
- @if(issue.closed) { - @comments.find(_.action == "merge").map{ comment => - Merged + } + New issue +
+ +

+ + @issue.title + #@issue.issueId + + +

+
+ @if(issue.closed) { + @comments.find(_.action == "merge").map{ comment => + Merged + @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit") into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch @helper.html.datetimeago(comment.registeredDate) - }.getOrElse { - Closed + + }.getOrElse { + Closed + @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit") into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch - } - } else { - Open + + } + } else { + Open + @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit") into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch - } -
- *@ + + } +