diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index 0351442..9caf549 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -54,7 +54,7 @@ // TODO requires users only and readable repository checking get("/:owner/:repository/issues/new")( usersOnly { getRepository(params("owner"), params("repository"), baseUrl) - .map (issues.html.issueedit(_)) + .map (issues.html.create(_)) .getOrElse (NotFound) }) @@ -148,7 +148,7 @@ session.put(sessionKey, condition) getRepository(owner, repository, baseUrl).map { repositoryInfo => - issues.html.issues( + issues.html.list( searchIssue(owner, repository, condition, filter, userName, (page - 1) * IssueLimit, IssueLimit), page, getLabels(owner, repository), diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html new file mode 100644 index 0000000..4d1e4f2 --- /dev/null +++ b/src/main/twirl/issues/create.scala.html @@ -0,0 +1,52 @@ +@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) +@import context._ +@import view.helpers._ +@html.main("New Issue - " + repository.owner + "/" + repository.name){ + @html.header("issues", repository) + @tab("", repository) + +
+
+
+
+
+ + + @* + + *@ + @html.preview(repository, "", false, true, true, "width: 650px; height: 200px;") +
+
+ +
+
+
+ TODO Add Labels +
+
+} diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html index f070958..088336b 100644 --- a/src/main/twirl/issues/issue.scala.html +++ b/src/main/twirl/issues/issue.scala.html @@ -3,7 +3,7 @@ @import view.helpers._ @html.main("%s - Issue #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){ @html.header("issues", repository) - @issuestab("issues", repository) + @tab("issues", repository)