(refs #551)Adjust wiki buttons

This commit is contained in:
Naoki Takezoe
2014-11-17 17:08:51 +09:00
parent a8801e4e41
commit 4eb9f4a485
3 changed files with 21 additions and 16 deletions

View File

@@ -10,12 +10,12 @@
<h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
</li>
<li class="pull-right">
<div class="btn-group">
@if(page.isDefined){
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
}
<div>
@if(page.isDefined){
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
}
<a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
</div>
</li>
</ul>

View File

@@ -16,21 +16,29 @@
</h1>
</li>
<li class="pull-right">
<div class="btn-group">
<div>
@if(pageName.isEmpty){
@if(loginAccount.isDefined){
<a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
}
} else {
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
@if(loginAccount.isDefined){
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
<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">
<tr>
<th colspan="3">
<div class="pull-left" style="padding-top: 4px;">Revisions</div>
<div class="pull-right">
<input type="button" id="compare" value="Compare Revisions" class="btn btn-mini"/>
</div>
</th>
</tr>
@commits.map { commit =>
<tr>
<td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
@@ -41,8 +49,6 @@
</tr>
}
</table>
<input type="button" id="compare" value="Compare Revisions" class="btn"/>
<input type="button" id="top" value="Back to Top" class="btn"/>
<script>
$(function(){
$('input[name=commitId]').click(function(){

View File

@@ -16,13 +16,12 @@
</div>
</li>
<li class="pull-right">
<div class="btn-group">
@if(hasWritePermission){
<a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
@if(hasWritePermission){
<div>
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
}
<a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
</div>
<a class="btn btn-small btn-success" href="@url(repository)/wiki/_new">New Page</a>
</div>
}
</li>
</ul>
<div style="width: 200px;" class="pull-right">