From 5a1ab8d4850a4d0c971ca33d353f8b5ef2a4b388 Mon Sep 17 00:00:00 2001
From: Yota Ichino <www.irda@gmail.com>
Date: Mon, 12 Oct 2015 16:41:15 +0900
Subject: [PATCH] Set tabindex for the comment form.

---
 src/main/twirl/gitbucket/core/helper/preview.scala.html    | 2 ++
 .../twirl/gitbucket/core/issues/commentform.scala.html     | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/helper/preview.scala.html b/src/main/twirl/gitbucket/core/helper/preview.scala.html
index 7f8e5c42c..7402c85df 100644
--- a/src/main/twirl/gitbucket/core/helper/preview.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html
@@ -8,6 +8,7 @@
   styleClass: String = "",
   placeholder: String = "Leave a comment",
   elastic: Boolean = false,
+  tabIndex: Int = -2,
   uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core._
@@ -22,6 +23,7 @@
       <span id="error-content" class="error"></span>
       @textarea = {
         <textarea id="content@uid" name="content" placeholder="@placeholder"
+          @if(tabIndex > -2){ tabindex="@tabIndex"}
           @if(style.nonEmpty){ style="@style"}
           @if(styleClass.nonEmpty){ class="@styleClass" }>@content</textarea>
       }
diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
index aaf40fa1b..040b9e097 100644
--- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
@@ -18,14 +18,15 @@
           enableTaskList     = true,
           hasWritePermission = hasWritePermission,
           style              = "",
-          elastic            = true
+          elastic            = true,
+          tabIndex           = 1
         )
         <div style="text-align: right;">
           <input type="hidden" name="issueId" value="@issue.issueId"/>
           @if((reopenable || !issue.closed) && (hasWritePermission || issue.openedUserName == loginAccount.get.userName)){
-            <input type="submit" class="btn" formaction="@url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
+            <input type="submit" class="btn" tabindex="3" formaction="@url(repository)/issue_comments/state" value="@{if(issue.closed) "Reopen" else "Close"}" id="action"/>
           }
-          <input type="submit" class="btn btn-success" formaction="@url(repository)/issue_comments/new" value="Comment"/>
+          <input type="submit" class="btn btn-success" tabindex="2" formaction="@url(repository)/issue_comments/new" value="Comment"/>
         </div>
       </div>
     </div>