mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-07 14:05:52 +01:00
Add wiki pages.
This commit is contained in:
@@ -60,4 +60,12 @@ class WikiController extends ControllerBase {
|
|||||||
html.wikiedit("", None,
|
html.wikiedit("", None,
|
||||||
JGitUtil.getRepositoryInfo(owner, repository, servletContext))
|
JGitUtil.getRepositoryInfo(owner, repository, servletContext))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get("/:owner/:repository/wiki/_pages"){
|
||||||
|
val owner = params("owner")
|
||||||
|
val repository = params("repository")
|
||||||
|
|
||||||
|
html.wikipages(WikiUtil.getPageList(owner, repository),
|
||||||
|
JGitUtil.getRepositoryInfo(owner, repository, servletContext))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -68,8 +68,12 @@ object WikiUtil {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO
|
def getPageList(owner: String, repository: String): List[String] = {
|
||||||
// def getPageList(owner: String, repository: String): List[WikiPageHistoryInfo]
|
JGitUtil.getFileList(Git.open(getWikiRepositoryDir(owner, repository)), "master", ".")
|
||||||
|
.filter(_.name.endsWith(".md"))
|
||||||
|
.map(_.name.replaceFirst("\\.md$", ""))
|
||||||
|
.sortBy(x => x)
|
||||||
|
}
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
//def getPageHistory(owner: String, repository: String, pageName: String): List[WikiPageHistoryInfo]
|
//def getPageHistory(owner: String, repository: String, pageName: String): List[WikiPageHistoryInfo]
|
||||||
|
|||||||
@@ -3,12 +3,7 @@
|
|||||||
@import context._
|
@import context._
|
||||||
@main(pageName + " - " + repository.owner + "/" + repository.name){
|
@main(pageName + " - " + repository.owner + "/" + repository.name){
|
||||||
@header("wiki", repository)
|
@header("wiki", repository)
|
||||||
<ul class="nav nav-tabs">
|
@wikitab((if(pageName == "Home") "home" else ""), repository)
|
||||||
<li class="active"><a href="">Home</a></li>
|
|
||||||
<li><a href="">Pages</a></li>
|
|
||||||
<li><a href="">Wiki History</a></li>
|
|
||||||
<li><a href="">Git Access</a></li>
|
|
||||||
</ul>
|
|
||||||
@page.map { page =>
|
@page.map { page =>
|
||||||
<ul class="nav nav-tabs">
|
<ul class="nav nav-tabs">
|
||||||
<li>
|
<li>
|
||||||
|
|||||||
@@ -3,12 +3,7 @@
|
|||||||
@import context._
|
@import context._
|
||||||
@main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
|
@main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
|
||||||
@header("wiki", repository)
|
@header("wiki", repository)
|
||||||
<ul class="nav nav-tabs">
|
@wikitab("", repository)
|
||||||
<li><a href="">Home</a></li>
|
|
||||||
<li><a href="">Pages</a></li>
|
|
||||||
<li><a href="">Wiki History</a></li>
|
|
||||||
<li><a href="">Git Access</a></li>
|
|
||||||
</ul>
|
|
||||||
<ul class="nav nav-tabs">
|
<ul class="nav nav-tabs">
|
||||||
<li>
|
<li>
|
||||||
<h1 class="wiki-title"><span class="description">Editing</span> @if(pageName == ""){New Page} else {@pageName}</h1>
|
<h1 class="wiki-title"><span class="description">Editing</span> @if(pageName == ""){New Page} else {@pageName}</h1>
|
||||||
|
|||||||
23
src/main/twirl/wikipages.scala.html
Normal file
23
src/main/twirl/wikipages.scala.html
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
@(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)
|
||||||
|
<ul class="nav nav-tabs">
|
||||||
|
<li>
|
||||||
|
<h1 class="wiki-title"><span class="description">Pages</span></h1>
|
||||||
|
</li>
|
||||||
|
<li class="pull-right">
|
||||||
|
<div class="btn-group">
|
||||||
|
<a class="btn" href="@path/@repository.owner/@repository.name/wiki/_new">New Page</a>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<ul>
|
||||||
|
@pages.map { page =>
|
||||||
|
<li><a href="@path/@repository.owner/@repository.name/wiki/@page">@page</a></li>
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
}
|
||||||
8
src/main/twirl/wikitab.scala.html
Normal file
8
src/main/twirl/wikitab.scala.html
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
@(active: String, repository: app.RepositoryInfo)(implicit context: app.Context)
|
||||||
|
@import context._
|
||||||
|
<ul class="nav nav-tabs">
|
||||||
|
<li@if(active == "home"){ class="active"}><a href="@path/@repository.owner/@repository.name/wiki">Home</a></li>
|
||||||
|
<li@if(active == "pages"){ class="active"}><a href="@path/@repository.owner/@repository.name/wiki/_pages">Pages</a></li>
|
||||||
|
<li@if(active == "history"){ class="active"}><a href="">Wiki History</a></li>
|
||||||
|
<li@if(active == "git"){ class="active"}><a href="">Git Access</a></li>
|
||||||
|
</ul>
|
||||||
Reference in New Issue
Block a user