diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala index b237ac8..9c6162d 100644 --- a/src/main/scala/app/WikiController.scala +++ b/src/main/scala/app/WikiController.scala @@ -19,7 +19,7 @@ val owner = params("owner") val repository = params("repository") - html.wiki("Home", + wiki.html.wiki("Home", WikiUtil.getPage(owner, repository, "Home"), JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } @@ -29,7 +29,7 @@ val repository = params("repository") val page = params("page") - html.wiki(page, + wiki.html.wiki(page, WikiUtil.getPage(owner, repository, page), JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } @@ -40,7 +40,7 @@ val page = params("page") val git = Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)) - html.wikihistory(Some(page), + wiki.html.wikihistory(Some(page), JGitUtil.getCommitLog(git, "master", path = page + ".md")._1, JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } @@ -54,7 +54,7 @@ println(commitId(0)) println(commitId(1)) - html.wikicompare(Some(page), + wiki.html.wikicompare(Some(page), WikiUtil.getDiffs(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), commitId(0), commitId(1)), JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } @@ -67,7 +67,7 @@ println(commitId(0)) println(commitId(1)) - html.wikicompare(None, + wiki.html.wikicompare(None, WikiUtil.getDiffs(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), commitId(0), commitId(1)), JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } @@ -77,7 +77,7 @@ val repository = params("repository") val page = params("page") - html.wikiedit(page, + wiki.html.wikiedit(page, WikiUtil.getPage(owner, repository, page), JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } @@ -96,7 +96,7 @@ val owner = params("owner") val repository = params("repository") - html.wikiedit("", None, + wiki.html.wikiedit("", None, JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } @@ -104,7 +104,7 @@ val owner = params("owner") val repository = params("repository") - html.wikipages(WikiUtil.getPageList(owner, repository), + wiki.html.wikipages(WikiUtil.getPageList(owner, repository), JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } @@ -112,7 +112,7 @@ val owner = params("owner") val repository = params("repository") - html.wikihistory(None, + wiki.html.wikihistory(None, JGitUtil.getCommitLog(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), "master")._1, JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } diff --git a/src/main/twirl/wiki.scala.html b/src/main/twirl/wiki.scala.html deleted file mode 100644 index 6f0583e..0000000 --- a/src/main/twirl/wiki.scala.html +++ /dev/null @@ -1,27 +0,0 @@ -@(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) - @wikitab((if(pageName == "Home") "home" else ""), repository) - @page.map { page => - -
- @helpers.markdown(page.content) -
-
- Last edited by @page.committer at @helpers.datetime(page.time) -
- } -} \ No newline at end of file diff --git a/src/main/twirl/wiki/wiki.scala.html b/src/main/twirl/wiki/wiki.scala.html new file mode 100644 index 0000000..7c12a7d --- /dev/null +++ b/src/main/twirl/wiki/wiki.scala.html @@ -0,0 +1,27 @@ +@(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context) +@import view.helpers +@import context._ +@html.main(pageName + " - " + repository.owner + "/" + repository.name){ + @html.header("wiki", repository) + @wikitab((if(pageName == "Home") "home" else ""), repository) + @page.map { page => + +
+ @helpers.markdown(page.content) +
+
+ Last edited by @page.committer at @helpers.datetime(page.time) +
+ } +} \ No newline at end of file diff --git a/src/main/twirl/wiki/wikicompare.scala.html b/src/main/twirl/wiki/wikicompare.scala.html new file mode 100644 index 0000000..a606d5d --- /dev/null +++ b/src/main/twirl/wiki/wikicompare.scala.html @@ -0,0 +1,24 @@ +@(pageName: Option[String], diffs: Seq[app.DiffInfo], repository: app.RepositoryInfo)(implicit context: app.Context) +@import view.helpers +@import context._ +@import org.eclipse.jgit.diff.DiffEntry.ChangeType +@html.main("Compare Revisions - " + repository.owner + "/" + repository.name){ + @html.header("wiki", repository) + @wikitab("history", repository) + + @html.diff(diffs, repository, None) +} diff --git a/src/main/twirl/wiki/wikiedit.scala.html b/src/main/twirl/wiki/wikiedit.scala.html new file mode 100644 index 0000000..7f97320 --- /dev/null +++ b/src/main/twirl/wiki/wikiedit.scala.html @@ -0,0 +1,31 @@ +@(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context) +@import view.helpers +@import context._ +@html.main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){ + @html.header("wiki", repository) + @wikitab("", repository) + +
+ + + + + + + + +
+} \ No newline at end of file diff --git a/src/main/twirl/wiki/wikihistory.scala.html b/src/main/twirl/wiki/wikihistory.scala.html new file mode 100644 index 0000000..fa1cbd3 --- /dev/null +++ b/src/main/twirl/wiki/wikihistory.scala.html @@ -0,0 +1,61 @@ +@(pageName: Option[String], commits: List[app.CommitInfo], repository: app.RepositoryInfo)(implicit context: app.Context) +@import view.helpers +@import context._ +@html.main("History - " + repository.owner + "/" + repository.name){ + @html.header("wiki", repository) + @wikitab(if(pageName.isEmpty) "history" else "", repository) + + + @commits.map { commit => + + + + + + } +
@commit.committer + @helpers.datetime(commit.time): + @commit.message +
+ + + +} \ No newline at end of file diff --git a/src/main/twirl/wiki/wikipages.scala.html b/src/main/twirl/wiki/wikipages.scala.html new file mode 100644 index 0000000..59e591e --- /dev/null +++ b/src/main/twirl/wiki/wikipages.scala.html @@ -0,0 +1,23 @@ +@(pages: List[String], repository: app.RepositoryInfo)(implicit context: app.Context) +@import view.helpers +@import context._ +@html.main("Pages - " + repository.owner + "/" + repository.name){ + @html.header("wiki", repository) + @wikitab("pages", repository) + + + +} \ No newline at end of file diff --git a/src/main/twirl/wiki/wikitab.scala.html b/src/main/twirl/wiki/wikitab.scala.html new file mode 100644 index 0000000..399281f --- /dev/null +++ b/src/main/twirl/wiki/wikitab.scala.html @@ -0,0 +1,13 @@ +@(active: String, repository: app.RepositoryInfo)(implicit context: app.Context) +@import context._ + diff --git a/src/main/twirl/wikicompare.scala.html b/src/main/twirl/wikicompare.scala.html deleted file mode 100644 index ca5deea..0000000 --- a/src/main/twirl/wikicompare.scala.html +++ /dev/null @@ -1,24 +0,0 @@ -@(pageName: Option[String], diffs: Seq[app.DiffInfo], repository: app.RepositoryInfo)(implicit context: app.Context) -@import view.helpers -@import context._ -@import org.eclipse.jgit.diff.DiffEntry.ChangeType -@main("Compare Revisions - " + repository.owner + "/" + repository.name){ - @header("wiki", repository) - @wikitab("history", repository) - - @diff(diffs, repository, None) -} diff --git a/src/main/twirl/wikiedit.scala.html b/src/main/twirl/wikiedit.scala.html deleted file mode 100644 index 1fd1975..0000000 --- a/src/main/twirl/wikiedit.scala.html +++ /dev/null @@ -1,31 +0,0 @@ -@(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context) -@import view.helpers -@import context._ -@main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){ - @header("wiki", repository) - @wikitab("", repository) - -
- - - - - - - - -
-} \ No newline at end of file diff --git a/src/main/twirl/wikihistory.scala.html b/src/main/twirl/wikihistory.scala.html deleted file mode 100644 index 66bd80e..0000000 --- a/src/main/twirl/wikihistory.scala.html +++ /dev/null @@ -1,61 +0,0 @@ -@(pageName: Option[String], commits: List[app.CommitInfo], repository: app.RepositoryInfo)(implicit context: app.Context) -@import view.helpers -@import context._ -@main("History - " + repository.owner + "/" + repository.name){ - @header("wiki", repository) - @wikitab(if(pageName.isEmpty) "history" else "", repository) - - - @commits.map { commit => - - - - - - } -
@commit.committer - @helpers.datetime(commit.time): - @commit.message -
- - - -} \ No newline at end of file diff --git a/src/main/twirl/wikipages.scala.html b/src/main/twirl/wikipages.scala.html deleted file mode 100644 index 2c59e5e..0000000 --- a/src/main/twirl/wikipages.scala.html +++ /dev/null @@ -1,23 +0,0 @@ -@(pages: List[String], repository: app.RepositoryInfo)(implicit context: app.Context) -@import view.helpers -@import context._ -@main("Pages - " + repository.owner + "/" + repository.name){ - @header("wiki", repository) - @wikitab("pages", repository) - - - -} \ No newline at end of file diff --git a/src/main/twirl/wikitab.scala.html b/src/main/twirl/wikitab.scala.html deleted file mode 100644 index 399281f..0000000 --- a/src/main/twirl/wikitab.scala.html +++ /dev/null @@ -1,13 +0,0 @@ -@(active: String, repository: app.RepositoryInfo)(implicit context: app.Context) -@import context._ -