Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 15:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix wiki styles

Browse Source
This commit is contained in:
takezoe
2014-05-11 01:38:12 +09:00
parent 743b9b759a
commit 259637ce3c
5 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/app/WikiController.scala
View File

@@ -36,7 +36,8 @@ trait WikiControllerBase extends ControllerBase {
get("/:owner/:repository/wiki")(referrersOnly { repository =>
getWikiPage(repository.owner, repository.name, "Home").map { page =>
wiki.html.page("Home", page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
wiki.html.page("Home", page, getWikiPageList(repository.owner, repository.name),
repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
} getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
})
@@ -44,7 +45,8 @@ trait WikiControllerBase extends ControllerBase {
val pageName = StringUtil.urlDecode(params("page"))
getWikiPage(repository.owner, repository.name, pageName).map { page =>
wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
wiki.html.page(pageName, page, getWikiPageList(repository.owner, repository.name),
repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
} getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
})

6
src/main/twirl/wiki/edit.scala.html
View File

@@ -22,9 +22,9 @@
</ul>
<form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
<span id="error-pageName" class="error"></span>
<input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
@helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, "width: 900px; height: 400px;", "")
<input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
<input type="text" name="pageName" value="@pageName" style="width: 850px; font-weight: bold;" placeholder="Input a page name."/>
@helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, "width: 850px; height: 400px;", "")
<input type="text" name="message" value="" style="width: 850px;" placeholder="Write a small message here explaining this change. (Optional)"/>
<input type="hidden" name="currentPageName" value="@pageName"/>
<input type="hidden" name="id" value="@page.map(_.id)"/>
<input type="submit" value="Save" class="btn btn-success">

53
src/main/twirl/wiki/page.scala.html
View File

@@ -1,8 +1,10 @@
@(pageName: String,
page: service.WikiService.WikiPageInfo,
pages: List[String],
repository: service.RepositoryService.RepositoryInfo,
hasWritePermission: Boolean)(implicit context: app.Context)
@import context._
@import service.WikiService._
@import view.helpers._
@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){
@@ -21,11 +23,54 @@
</div>
</li>
</ul>
<div class="markdown-body">
@markdown(page.content, repository, true, false)
<div style="width: 200px;" class="pull-right">
<table class="table table-bordered">
<tr>
<th class="metal">Pages</th>
</tr>
<tr>
<td>
<ul style="margin-left: 0px; margin-bottom: 0px;">
@pages.map { page =>
<li style="margin-left:0px; list-style-type: none;"><a href="@url(repository)/wiki/@urlEncode(page)">@page</a></li>
}
</ul>
</td>
</tr>
</table>
<div class="small">
<strong>Clone this wiki locally</strong>
</div>
@helper.html.copy("repository-url-copy", repository.httpUrl){
<input type="text" value="@httpUrl(repository)" id="repository-url" style="width: 160px;" readonly>
}
@if(settings.ssh && loginAccount.isDefined){
<div class="small">
<span class="mute">You can clone <a href="javascript:void(0);" id="repository-url-http">HTTP</a> or <a href="javascript:void(0);" id="repository-url-ssh">SSH</a>.</span>
</div>
}
</div>
<div class="small">
<span class="muted">Last edited by @page.committer at @datetime(page.time)</span>
<div style="margin-right: 200px;">
<div class="markdown-body">
@markdown(page.content, repository, true, false)
</div>
<div class="small">
<span class="muted">Last edited by @page.committer at @datetime(page.time)</span>
</div>
</div>
}
}
@if(settings.ssh && loginAccount.isDefined){
<script>
$(function(){
$('#repository-url-http').click(function(){
$('#repository-url').val('@httpUrl(repository)');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
});
$('#repository-url-ssh').click(function(){
$('#repository-url').val('@sshUrl(repository, settings, loginAccount.get.userName)');
$('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
});
});
</script>
}

2
src/main/twirl/wiki/pages.scala.html
View File

@@ -18,7 +18,7 @@
</div>
</li>
</ul>
<ul>
<ul class="pull-left">
@pages.map { page =>
<li><a href="@url(repository)/wiki/@urlEncode(page)">@page</a></li>
}

2
src/main/twirl/wiki/tab.scala.html
View File

@@ -3,6 +3,7 @@
@import context._
@import service.WikiService._
@import view.helpers._
@*
<ul class="nav nav-tabs pull-left fill-width">
<li@if(active == "home" ){ class="active"}><a href="@url(repository)/wiki">Home</a></li>
<li@if(active == "pages" ){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li>
@@ -34,3 +35,4 @@ $(function(){
});
</script>
}
*@