Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 15:35:59 +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

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

@@ -5,45 +5,41 @@
@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> @if(page.isDefined){
<h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1> <a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
</li> <a class="btn btn-small btn-danger" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
<li class="pull-right"> }
<div> <a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
@if(page.isDefined){ </div>
<a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a> <h1><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
<a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a> <div style="overflow: hidden;">
} <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
<a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a> <span id="error-pageName" class="error"></span>
<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(
repository = repository,
content = page.map(_.content).getOrElse(""),
enableWikiLink = true,
enableRefsLink = false,
enableLineBreaks = false,
enableTaskList = false,
hasWritePermission = false,
style = "height: 400px;",
styleClass = "monospace",
placeholder = ""
)
<div class="form-group">
<label for="message">Edit Message</label>
<input type="text" id="message" name="message" value="" class="form-control" placeholder="Write a small message here explaining this change. (Optional)"/>
</div> </div>
</li> <div class="form-group pull-right">
</ul> <input type="hidden" name="currentPageName" value="@pageName"/>
<form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true"> <input type="hidden" name="id" value="@page.map(_.id)"/>
<span id="error-pageName" class="error"></span> <input type="submit" value="Save" class="btn btn-success">
<input type="text" name="pageName" value="@pageName" class="form-control input-lg" style="font-weight: bold;" placeholder="Input a page name."/> </div>
@helper.html.preview( </form>
repository = repository, </div>
content = page.map(_.content).getOrElse(""),
enableWikiLink = true,
enableRefsLink = false,
enableLineBreaks = false,
enableTaskList = false,
hasWritePermission = false,
style = "height: 400px;",
styleClass = "monospace",
placeholder = ""
)
<div class="form-group">
<label for="message">Edit Message</label>
<input type="text" id="message" name="message" value="" class="form-control" placeholder="Write a small message here explaining this change. (Optional)"/>
</div>
<div class="form-group pull-right">
<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">
</div>
</form>
} }
} }
<script> <script>

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

@@ -5,31 +5,25 @@
@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> @if(pageName.isEmpty){
<h1 class="wiki-title"> @if(loginAccount.isDefined){
@if(pageName.isEmpty){ <a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
<span class="muted">History</span> }
} else { } else {
<span class="muted">History for</span> @pageName.get @if(loginAccount.isDefined){
} <a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
</h1> <a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
</li> }
<li class="pull-right"> }
<div> </div>
@if(pageName.isEmpty){ <h1 class="wiki-title">
@if(loginAccount.isDefined){ @if(pageName.isEmpty){
<a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a> <span class="muted">History</span>
} } else {
} else { <span class="muted">History for</span> @pageName.get
@if(loginAccount.isDefined){ }
<a class="btn btn-small btn-default" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a> </h1>
<a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
}
}
</div>
</li>
</ul>
<table class="table table-bordered fill-width pull-left"> <table class="table table-bordered fill-width pull-left">
<thead> <thead>
<tr> <tr>