From 03f4a63dbd6a06c83c8d3fa5d410366738304180 Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 2 May 2013 04:04:01 +0900 Subject: [PATCH] Create wiki page editing form. --- src/main/scala/app/WikiController.scala | 19 ++++++++++++ src/main/twirl/wiki.scala.html | 3 +- src/main/twirl/wikiedit.scala.html | 31 +++++++++++++++++++ .../webapp/assets/common/css/gitbucket.css | 1 + 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/main/twirl/wikiedit.scala.html diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala index 1edf66bf4..69208d694 100644 --- a/src/main/scala/app/WikiController.scala +++ b/src/main/scala/app/WikiController.scala @@ -13,4 +13,23 @@ class WikiController extends ControllerBase { JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } + get("/:owner/:repository/wiki/:page"){ + val owner = params("owner") + val repository = params("repository") + val page = params("page") + + html.wiki(page, + WikiUtil.getPage(owner, repository, page), + JGitUtil.getRepositoryInfo(owner, repository, servletContext)) + } + + get("/:owner/:repository/wiki/:page/_edit"){ + val owner = params("owner") + val repository = params("repository") + val page = params("page") + + html.wikiedit(page, + WikiUtil.getPage(owner, repository, page), + JGitUtil.getRepositoryInfo(owner, repository, servletContext)) + } } \ No newline at end of file diff --git a/src/main/twirl/wiki.scala.html b/src/main/twirl/wiki.scala.html index 8341b3924..089e14884 100644 --- a/src/main/twirl/wiki.scala.html +++ b/src/main/twirl/wiki.scala.html @@ -1,5 +1,6 @@ @(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context) @import view.helpers +@import context._ @main(pageName + " - " + repository.owner + "/" + repository.name){ @header("wiki", repository)