From 4276c0970ba21ac776b71db50f6c56c8098e9d00 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sun, 17 Jan 2016 00:18:23 +0900
Subject: [PATCH] Fix version and view

---
 .../resources/update/{3_10.sql => 3_11.sql}   |  0
 .../gitbucket/core/servlet/AutoUpdate.scala   |  1 +
 .../core/settings/branches.scala.html         |  4 ++--
 .../core/settings/branchprotection.scala.html | 23 ++++++++++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 rename src/main/resources/update/{3_10.sql => 3_11.sql} (100%)

diff --git a/src/main/resources/update/3_10.sql b/src/main/resources/update/3_11.sql
similarity index 100%
rename from src/main/resources/update/3_10.sql
rename to src/main/resources/update/3_11.sql
diff --git a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
index c8987fb38..6a284ee3c 100644
--- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
+++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
@@ -21,6 +21,7 @@ object AutoUpdate {
    * The history of versions. A head of this sequence is the current BitBucket version.
    */
   val versions = Seq(
+    new Version(3, 11),
     new Version(3, 10),
     new Version(3, 9),
     new Version(3, 8),
diff --git a/src/main/twirl/gitbucket/core/settings/branches.scala.html b/src/main/twirl/gitbucket/core/settings/branches.scala.html
index 8a731b0d6..eb4df5157 100644
--- a/src/main/twirl/gitbucket/core/settings/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branches.scala.html
@@ -18,7 +18,7 @@
       }else{
         @helper.html.information(info)
         <div class="panel panel-default">
-          <div class="panel-heading">Default branch</div>
+          <div class="panel-heading strong">Default branch</div>
           <div class="panel-body">
             <p>The default branch is considered the “base” branch in your repository, against which all pull requests and code commits are automatically made, unless you specify a different branch.</p>
             <form id="form" method="post" action="@url(repository)/settings/update_default_branch" validate="true" class="form-inline">
@@ -34,7 +34,7 @@
         </div>
 
         <div class="panel panel-default">
-          <div class="panel-heading">Protected branches</div>
+          <div class="panel-heading strong">Protected branches</div>
           <div class="panel-body">
             <p>Protect branches to disable force pushing, prevent branches from being deleted, and optionally require status checks before merging. New to protected branches?
               <form class="form-inline">
diff --git a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
index ae501112e..853b575f4 100644
--- a/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/branchprotection.scala.html
@@ -11,24 +11,34 @@
   @html.menu("settings", repository){
     @menu("branches", repository){
       @helper.html.information(info)
-        <div class="alert alert-info" style="display:none" id="saved-info">Branch protection options saved</div>
-        <form name="branchProtection" onsubmit="submitForm(event)"><div class="panel panel-default">
+      <div class="alert alert-info" style="display:none" id="saved-info">Branch protection options saved</div>
+      <form name="branchProtection" onsubmit="submitForm(event)">
+        <div class="panel panel-default">
           <div class="panel-heading">Branch protection for <b>@branch</b></div>
           <div class="panel-body">
 
             <div class="checkbox">
-              <label class="strong"><input type="checkbox" name="enabled" onclick="update()" @check(protection.enabled)>Protect this branch</label>
+              <label>
+                <input type="checkbox" name="enabled" onclick="update()" @check(protection.enabled)>
+                <span class="strong">Protect this branch</span>
+              </label>
               <p class="help-block">Disables force-pushes to this branch and prevents it from being deleted.</p>
             </div>
 
             <div class="checkbox js-enabled" style="display:none">
-              <label class="strong"><input type="checkbox" name="has_required_statuses" onclick="update()" @check(protection.status.enforcement_level.name!="off")>Require status checks to pass before merging</label>
+              <label>
+                <input type="checkbox" name="has_required_statuses" onclick="update()" @check(protection.status.enforcement_level.name!="off")>
+                <span class="strong">Require status checks to pass before merging</span>
+              </label>
               <p class="help-block">Choose which status checks must pass before branches can be merged into test.
               When enabled, commits must first be pushed to another branch, then merged or pushed directly to test after status checks have passed.</p>
 
               <div class="js-has_required_statuses" style="display:none">
                 <div class="checkbox">
-                  <label class="strong"><input type="checkbox" name="enforce_for_admins" onclick="update()" @check(protection.status.enforcement_level.name=="everyone")>Include administrators</label>
+                  <label>
+                    <input type="checkbox" name="enforce_for_admins" onclick="update()" @check(protection.status.enforcement_level.name=="everyone")>
+                    <span class="strong">Include administrators</span>
+                  </label>
                   <p class="help-block">Enforce required status checks for repository administrators.</p>
                 </div>
 
@@ -49,7 +59,8 @@
             </div>
             <input class="btn btn-success" type="submit" value="Save changes" />
           </div>
-        </div></form>
+        </div>
+      </form>
     }
   }
 }