diff --git a/src/main/twirl/dashboard/issueslist.scala.html b/src/main/twirl/dashboard/issueslist.scala.html index 37ef3a1..42b5f95 100644 --- a/src/main/twirl/dashboard/issueslist.scala.html +++ b/src/main/twirl/dashboard/issueslist.scala.html @@ -8,13 +8,6 @@ @import context._ @import view.helpers._ @import service.IssuesService.IssueInfo -@* - -*@
diff --git a/src/main/twirl/dashboard/pulls.scala.html b/src/main/twirl/dashboard/pulls.scala.html index 0e2eff6..d908e94 100644 --- a/src/main/twirl/dashboard/pulls.scala.html +++ b/src/main/twirl/dashboard/pulls.scala.html @@ -11,6 +11,6 @@ @dashboard.html.tab("pulls")
@issuesnavi(filter, "pulls", condition) - @pullslist(issues, page, openCount, closedCount, condition, filter, groups) + @issueslist(issues, page, openCount, closedCount, condition, filter, groups)
} diff --git a/src/main/twirl/dashboard/pullslist.scala.html b/src/main/twirl/dashboard/pullslist.scala.html deleted file mode 100644 index af58f02..0000000 --- a/src/main/twirl/dashboard/pullslist.scala.html +++ /dev/null @@ -1,68 +0,0 @@ -@(issues: List[service.IssuesService.IssueInfo], - page: Int, - openCount: Int, - closedCount: Int, - condition: service.IssuesService.IssueSearchCondition, - filter: String, - groups: List[String])(implicit context: app.Context) -@import context._ -@import view.helpers._ -@import service.IssuesService.IssueInfo -@* - -*@ - - - - - @issues.map { case IssueInfo(issue, labels, milestone, commentCount) => - - - - } -
- @dashboard.html.header(openCount, closedCount, condition, groups) -
- - @issue.userName/@issue.repositoryName ・ - @issue.title - #@issue.issueId -
- @issue.content.map { content => - @cut(content, 90) - }.getOrElse { - No description available - } -
-
- @avatarLink(issue.openedUserName, 20) by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)  - @if(commentCount > 0){ - @commentCount @plural(commentCount, "comment") - } -
-
-
- @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 10, condition.toURL) -