diff --git a/src/main/twirl/issues/commentform.scala.html b/src/main/twirl/issues/commentform.scala.html index c94964a..4ca951e 100644 --- a/src/main/twirl/issues/commentform.scala.html +++ b/src/main/twirl/issues/commentform.scala.html @@ -5,6 +5,7 @@ @import context._ @import view.helpers._ @if(loginAccount.isDefined){ +

@avatar(loginAccount.get.userName, 48)
diff --git a/src/main/twirl/issues/commentlist.scala.html b/src/main/twirl/issues/commentlist.scala.html index 1ffbae0..7038e1d 100644 --- a/src/main/twirl/issues/commentlist.scala.html +++ b/src/main/twirl/issues/commentlist.scala.html @@ -5,20 +5,36 @@ pullreq: Option[model.PullRequest] = None)(implicit context: app.Context) @import context._ @import view.helpers._ +
@avatar(issue.openedUserName, 48)
+
+
+ @user(issue.openedUserName, styleClass="username strong") commented on @datetime(issue.registeredDate) + + @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){ + + } + +
+
+ @markdown(issue.content getOrElse "No description provided.", repository, false, true) +
+
+ @comments.map { comment => @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){
@avatar(comment.commentedUserName, 48)
- @user(comment.commentedUserName, styleClass="username strong") - @if(comment.action == "comment"){ - commented - } else { - @if(pullreq.isEmpty){ referenced the issue } else { referenced the pull request } - } + + @if(comment.action == "comment"){ + commented + } else { + @if(pullreq.isEmpty){ referenced the issue } else { referenced the pull request } + } + on @datetime(comment.registeredDate) + - @datetime(comment.registeredDate) @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer" && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){   diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html index 7d18f93..60a7633 100644 --- a/src/main/twirl/issues/issue.scala.html +++ b/src/main/twirl/issues/issue.scala.html @@ -10,30 +10,41 @@ @import view.helpers._ @html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("issues", repository){ - @tab("issues", true, repository) -
-
- @issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository) - @commentlist(issue, comments, hasWritePermission, repository) - @commentform(issue, true, hasWritePermission, repository) -
-
+
  • +

    @issue.title #@issue.issueId

    @if(issue.closed) { Closed } else { Open } -
    - @defining(comments.filter( _.action.contains("comment") ).size){ count => - @count @plural(count, "comment") + + @user(issue.openedUserName, styleClass="username strong") opened this issue on @datetime(issue.registeredDate) - @defining( + comments.filter( _.action.contains("comment") ).size + ){ count => + @count @plural(count, "comment") } + +

    +
    • +
  • +
    + @if(hasWritePermission || loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){ + Edit + } + New issue
    +
    • + +
    +
    + @commentlist(issue, comments, hasWritePermission, repository) + @commentform(issue, true, hasWritePermission, repository) +
    +
    + @issueinfo(issue, issueLabels, labels, hasWritePermission, repository)
    - @issues.html.labels(issue, issueLabels, labels, hasWritePermission, repository) +
    } diff --git a/src/main/twirl/issues/issueinfo.scala.html b/src/main/twirl/issues/issueinfo.scala.html new file mode 100644 index 0000000..0440695 --- /dev/null +++ b/src/main/twirl/issues/issueinfo.scala.html @@ -0,0 +1,62 @@ +@(issue: model.Issue, + issueLabels: List[model.Label], + labels: List[model.Label], + hasWritePermission: Boolean, + repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) +@import view.helpers._ +
    + Labels + @if(hasWritePermission){ +
    + @helper.html.dropdown(right = true) { + @labels.map { label => +
  • + + @helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId)) +   + @label.labelName + +
    • + } + } +
    + } +
    +
      + @labellist(issueLabels) +
    +
    +
    + Milestone + +
    +
    +
    + Assignee + +
    + + diff --git a/src/main/twirl/issues/labels.scala.html b/src/main/twirl/issues/labels.scala.html deleted file mode 100644 index a8abfbf..0000000 --- a/src/main/twirl/issues/labels.scala.html +++ /dev/null @@ -1,51 +0,0 @@ -@(issue: model.Issue, - issueLabels: List[model.Label], - labels: List[model.Label], - hasWritePermission: Boolean, - repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) -@import view.helpers._ -
    - Labels - @if(hasWritePermission){ -
    - @helper.html.dropdown(right = true) { - @labels.map { label => -
  • - - @helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId)) -   - @label.labelName - -
    • - } - } -
    - } -
    -
      - @labellist(issueLabels) -
    - diff --git a/src/main/twirl/pulls/conversation.scala.html b/src/main/twirl/pulls/conversation.scala.html index 89b5ad1..3b91549 100644 --- a/src/main/twirl/pulls/conversation.scala.html +++ b/src/main/twirl/pulls/conversation.scala.html @@ -67,7 +67,7 @@
    }
    - @issues.html.labels(issue, issueLabels, labels, hasWritePermission, repository) + @issues.html.issueinfo(issue, issueLabels, labels, hasWritePermission, repository)