From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 30 Jan 2014 11:49:18 +0000 (+0200)
Subject: Fix protected branches page UI
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=57001c23326c94cb846bc74b9734e1b1b683f5dd;p=wvm%2Fgitlab.git

Fix protected branches page UI
---

diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index e0d058de7..a32679a18 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -3,7 +3,7 @@
   .col-md-3
     = render "projects/branches/filter"
   .col-md-9
-    .alert.alert-info
+    .bs-callout.bs-callout-info
       %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
       %p This ability allows:
       %ul
@@ -12,18 +12,18 @@
       %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined_link"}
 
     - if can? current_user, :admin_project, @project
-      = form_for [@project, @protected_branch] do |f|
+      = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f|
         -if @protected_branch.errors.any?
           .alert.alert-danger
             %ul
               - @protected_branch.errors.full_messages.each do |msg|
                 %li= msg
 
-        .entry.clearfix
-          = f.label :name, "Branch"
-          .col-md-3
-            = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2 span3"})
-          &nbsp;
+        .form-group
+          = f.label :name, "Branch", class: 'control-label'
+          .col-sm-10
+            = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2"})
+        .form-actions
           = f.submit 'Protect', class: "btn-create btn"
     - unless @branches.empty?
       %h5 Already Protected: