+
+ @if(hasWritePermission){
+ }
}
diff --git a/src/main/twirl/pulls/commits.scala.html b/src/main/twirl/pulls/commits.scala.html
new file mode 100644
index 0000000..0a883f4
--- /dev/null
+++ b/src/main/twirl/pulls/commits.scala.html
@@ -0,0 +1,28 @@
+@(issue: model.Issue,
+ pullreq: model.PullRequest,
+ commits: Seq[Seq[util.JGitUtil.CommitInfo]],
+ hasWritePermission: Boolean,
+ repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+
diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html
new file mode 100644
index 0000000..fef6a61
--- /dev/null
+++ b/src/main/twirl/pulls/compare.scala.html
@@ -0,0 +1,188 @@
+@(commits: Seq[Seq[util.JGitUtil.CommitInfo]],
+ diffs: Seq[util.JGitUtil.DiffInfo],
+ members: List[String],
+ originId: String,
+ forkedId: String,
+ sourceId: String,
+ commitId: String,
+ hasConflict: Boolean,
+ repository: service.RepositoryService.RepositoryInfo,
+ originRepository: service.RepositoryService.RepositoryInfo,
+ forkedRepository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@import org.eclipse.jgit.diff.DiffEntry.ChangeType
+@html.main("Pull Requests - " + repository.owner + "/" + repository.name){
+ @html.header("pulls", repository)
+
+
+
Edit
+
@originRepository.owner:@originId ...
@forkedRepository.owner:@forkedId
+
+
+
+ @if(commits.nonEmpty){
+
+
+ }
+ @if(commits.isEmpty){
+
+
+
+ There isn't anything to compare.
+ @originRepository.owner:@originId and @forkedRepository.owner:@forkedId are identical.
+ |
+
+
+ } else {
+
+
+
+
+
+ Showing @diffs.size changed @plural(diffs.size, "file")
+
+
+ @helper.html.diff(diffs, repository, Some(commitId))
+ }
+}
+
diff --git a/src/main/twirl/pulls/discussion.scala.html b/src/main/twirl/pulls/discussion.scala.html
new file mode 100644
index 0000000..76bb332
--- /dev/null
+++ b/src/main/twirl/pulls/discussion.scala.html
@@ -0,0 +1,124 @@
+@(issue: model.Issue,
+ pullreq: model.PullRequest,
+ comments: List[model.IssueComment],
+ collaborators: List[String],
+ milestones: List[(model.Milestone, Int, Int)],
+ hasConflict: Boolean,
+ hasWritePermission: Boolean,
+ repository: service.RepositoryService.RepositoryInfo,
+ requestRepositoryUrl: String)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+
+
+ @issues.html.issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository)
+ @issues.html.commentlist(comments, hasWritePermission, repository)
+
+ @if(hasWritePermission && !issue.closed){
+
+ }
+ @issues.html.commentform(issue, hasWritePermission, repository)
+
+
+ @if(issue.closed) {
+ @if(comments.exists(_.action == "merge")){
+
Merged
+ } else {
+
Closed
+ }
+ } else {
+
Open
+ }
+
+ @comments.size @plural(comments.size, "comment")
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/twirl/pulls/files.scala.html b/src/main/twirl/pulls/files.scala.html
new file mode 100644
index 0000000..a2f20d1
--- /dev/null
+++ b/src/main/twirl/pulls/files.scala.html
@@ -0,0 +1,48 @@
+@(issue: model.Issue,
+ pullreq: model.PullRequest,
+ diffs: Seq[util.JGitUtil.DiffInfo],
+ commitId: String,
+ hasWritePermission: Boolean,
+ repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@import org.eclipse.jgit.diff.DiffEntry.ChangeType
+
+
+
+
+ Showing @diffs.size changed @plural(diffs.size, "file")
+
+
+@helper.html.diff(diffs, repository, Some(commitId))
+
diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html
new file mode 100644
index 0000000..079ad20
--- /dev/null
+++ b/src/main/twirl/pulls/list.scala.html
@@ -0,0 +1,141 @@
+@(issues: List[(model.Issue, List[model.Label], Int)],
+ counts: List[service.PullRequestService.PullRequestCount],
+ filter: Option[String],
+ page: Int,
+ openCount: Int,
+ closedCount: Int,
+ allCount: Int,
+ condition: service.IssuesService.IssueSearchCondition,
+ repository: service.RepositoryService.RepositoryInfo,
+ hasWritePermission: Boolean)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Pull Requests - " + repository.owner + "/" + repository.name){
+ @html.header("pulls", repository)
+
+
+
+ @if(hasWritePermission){
+
+ @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL)
+
New pull request
+
+ }
+
+
+
+
+
+
+ @if(issues.isEmpty){
+
+ |
+ No pull requests to show.
+ |
+
+ }
+ @issues.map { case (issue, labels, commentCount) =>
+
+
+  )
+ @issue.title
+ #@issue.issueId
+
+ @issue.content.map { content =>
+ @cut(content, 90)
+ }.getOrElse {
+ No description available
+ }
+
+
+ @avatar(issue.openedUserName, 20) by @issue.openedUserName @datetime(issue.registeredDate)
+ @if(commentCount > 0){
+
+ }
+ |
+
+ }
+
+
+ @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 10, condition.toURL)
+
+
+
+}
+
diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html
new file mode 100644
index 0000000..caf78f1
--- /dev/null
+++ b/src/main/twirl/pulls/pullreq.scala.html
@@ -0,0 +1,39 @@
+@(issue: model.Issue,
+ pullreq: model.PullRequest,
+ comments: List[model.IssueComment],
+ collaborators: List[String],
+ milestones: List[(model.Milestone, Int, Int)],
+ commits: Seq[Seq[util.JGitUtil.CommitInfo]],
+ diffs: Seq[util.JGitUtil.DiffInfo],
+ commitId: String,
+ hasConflict: Boolean,
+ hasWritePermission: Boolean,
+ repository: service.RepositoryService.RepositoryInfo,
+ requestRepositoryUrl: String)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("%s - Pull Request #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
+ @html.header("pulls", repository)
+
+
+
+ @pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasConflict, hasWritePermission, repository, requestRepositoryUrl)
+
+
+ @pulls.html.commits(issue, pullreq, commits, hasWritePermission, repository)
+
+
+ @pulls.html.files(issue, pullreq, diffs, commitId, hasWritePermission, repository)
+
+
+}
+
\ No newline at end of file
diff --git a/src/main/twirl/repo/forked.scala.html b/src/main/twirl/repo/forked.scala.html
new file mode 100644
index 0000000..4efe751
--- /dev/null
+++ b/src/main/twirl/repo/forked.scala.html
@@ -0,0 +1,28 @@
+@(members: service.RepositoryService.RepositoryTreeNode,
+ repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
+
+
Members of the @repository.name Network
+
+}
+
+@renderTree(node: service.RepositoryService.RepositoryTreeNode) = {
+
+
+ @if(node.children.nonEmpty){
+
+ @node.children.map { child =>
+ @renderTree(child)
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
index 23650b1..d386ac3 100644
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -23,7 +23,10 @@