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

Fix layout of wiki editing form and history

Browse Source
This commit is contained in:
Naoki Takezoe
2016-03-31 18:10:16 +09:00
parent cad2daa2f9
commit 19d97c93ce
2 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/twirl/gitbucket/core/wiki/edit.scala.html
View File

@@ -5,23 +5,18 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){ @html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){ @html.menu("wiki", repository){
<ul class="nav nav-tabs fill-width"> <div class="pull-right">
<li>
<h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
</li>
<li class="pull-right">
<div>
@if(page.isDefined){ @if(page.isDefined){
<a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
<a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a> <a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
<a class="btn btn-small btn-danger" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
} }
<a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a> <a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
</div> </div>
</li> <h1><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
</ul> <div style="overflow: hidden;">
<form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true"> <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
<span id="error-pageName" class="error"></span> <span id="error-pageName" class="error"></span>
<input type="text" name="pageName" value="@pageName" class="form-control input-lg" style="font-weight: bold;" placeholder="Input a page name."/> <input type="text" name="pageName" value="@pageName" class="form-control" style="font-weight: bold; margin-bottom: 10px;" placeholder="Input a page name."/>
@helper.html.preview( @helper.html.preview(
repository = repository, repository = repository,
content = page.map(_.content).getOrElse(""), content = page.map(_.content).getOrElse(""),
@@ -44,6 +39,7 @@
<input type="submit" value="Save" class="btn btn-success"> <input type="submit" value="Save" class="btn btn-success">
</div> </div>
</form> </form>
</div>
} }
} }
<script> <script>

22
src/main/twirl/gitbucket/core/wiki/history.scala.html
View File

@@ -5,18 +5,7 @@
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){ @html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
@html.menu("wiki", repository){ @html.menu("wiki", repository){
<ul class="nav nav-tabs fill-width"> <div class="pull-right">
<li>
<h1 class="wiki-title">
@if(pageName.isEmpty){
<span class="muted">History</span>
} else {
<span class="muted">History for</span> @pageName.get
}
</h1>
</li>
<li class="pull-right">
<div>
@if(pageName.isEmpty){ @if(pageName.isEmpty){
@if(loginAccount.isDefined){ @if(loginAccount.isDefined){
<a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a> <a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
@@ -28,8 +17,13 @@
} }
} }
</div> </div>
</li> <h1 class="wiki-title">
</ul> @if(pageName.isEmpty){
<span class="muted">History</span>
} else {
<span class="muted">History for</span> @pageName.get
}
</h1>
<table class="table table-bordered fill-width pull-left"> <table class="table table-bordered fill-width pull-left">
<thead> <thead>
<tr> <tr>