From 19d97c93ce6df958eef60d52625b2093d04f3c7d Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Thu, 31 Mar 2016 18:10:16 +0900
Subject: [PATCH] Fix layout of wiki editing form and history

---
 .../twirl/gitbucket/core/wiki/edit.scala.html | 72 +++++++++----------
 .../gitbucket/core/wiki/history.scala.html    | 44 +++++-------
 2 files changed, 53 insertions(+), 63 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
index 787e03e3a..26ee0d36a 100644
--- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
@@ -5,45 +5,41 @@
 @import gitbucket.core.view.helpers._
 @html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("wiki", repository){
-    <ul class="nav nav-tabs fill-width">
-      <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){
-            <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-success" href="@url(repository)/wiki/_new">New Page</a>
+    <div class="pull-right">
+      @if(page.isDefined){
+        <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>
+    </div>
+    <h1><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
+    <div style="overflow: hidden;">
+      <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" 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>
-      </li>
-    </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" class="form-control input-lg" style="font-weight: bold;" 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 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>
+        <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>
+    </div>
   }
 }
 <script>
diff --git a/src/main/twirl/gitbucket/core/wiki/history.scala.html b/src/main/twirl/gitbucket/core/wiki/history.scala.html
index 4461640be..b71f2cdca 100644
--- a/src/main/twirl/gitbucket/core/wiki/history.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/history.scala.html
@@ -5,31 +5,25 @@
 @import gitbucket.core.view.helpers._
 @html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
   @html.menu("wiki", repository){
-    <ul class="nav nav-tabs fill-width">
-      <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(loginAccount.isDefined){
-              <a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
-            }
-          } else {
-            @if(loginAccount.isDefined){
-              <a class="btn btn-small btn-default" 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>
+    <div class="pull-right">
+    @if(pageName.isEmpty){
+      @if(loginAccount.isDefined){
+        <a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
+      }
+    } else {
+      @if(loginAccount.isDefined){
+        <a class="btn btn-small btn-default" 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>
+    <h1 class="wiki-title">
+    @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">
       <thead>
         <tr>