From 4eb9f4a48509da49890b74b23c469929d4d01ff7 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 17 Nov 2014 17:08:51 +0900
Subject: [PATCH] (refs #551)Adjust wiki buttons

---
 src/main/twirl/wiki/edit.scala.html    | 12 ++++++------
 src/main/twirl/wiki/history.scala.html | 14 ++++++++++----
 src/main/twirl/wiki/page.scala.html    | 11 +++++------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html
index 36a61dc12..b918cc089 100644
--- a/src/main/twirl/wiki/edit.scala.html
+++ b/src/main/twirl/wiki/edit.scala.html
@@ -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>
diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html
index 2052f4ce0..a7731603d 100644
--- a/src/main/twirl/wiki/history.scala.html
+++ b/src/main/twirl/wiki/history.scala.html
@@ -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(){
diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html
index 74dabb2b5..8c96edc7a 100644
--- a/src/main/twirl/wiki/page.scala.html
+++ b/src/main/twirl/wiki/page.scala.html
@@ -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">