Admin area -> user form

1 files changed, 62 insertions, 54 deletions

diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 5e68a23f494..2014472375b 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -2,68 +2,76 @@
   = form_for [:admin, @admin_user] do |f|
     -if @admin_user.errors.any?
       #error_explanation
-        %ul
+        %ul.unstyled.alert.alert-error
           - @admin_user.errors.full_messages.each do |msg|
             %li= msg
 
     .row
-      .span6
-        .clearfix
-          = f.label :name
-          .input
-            = f.text_field :name
-            %span.help-inline * required
-        .clearfix
-          = f.label :email
-          .input
-            = f.text_field :email
-            %span.help-inline * required
-        %hr
-
-        -if f.object.new_record?
-          .clearfix 
-            = f.label :admin, class: "checkbox" do
-              = f.check_box :force_random_password, {}, true, nil
-            %span Generate random password
-        
-        %div.password-fields
+      .span7
+        .ui-box
+          %br
           .clearfix
-            = f.label :password
-            .input= f.password_field :password, disabled: f.object.force_random_password 
+            = f.label :name
+            .input
+              = f.text_field :name
+              %span.help-inline * required
           .clearfix
-            = f.label :password_confirmation
-            .input= f.password_field :password_confirmation, disabled: f.object.force_random_password
-        %hr
-        .clearfix
-          = f.label :skype
-          .input= f.text_field :skype
-        .clearfix
-          = f.label :linkedin
-          .input= f.text_field :linkedin
-        .clearfix
-          = f.label :twitter
-          .input= f.text_field :twitter
-      .span6
-        .clearfix
-          = f.label :projects_limit
-          .input= f.text_field :projects_limit, class: "small_input"
+            = f.label :email
+            .input
+              = f.text_field :email
+              %span.help-inline * required
+          %hr
+          -if f.object.new_record?
+            .clearfix
+              = f.label :force_random_password do
+                %span Generate random password
+              .input= f.check_box :force_random_password, {}, true, nil
+          
+          %div.password-fields
+            .clearfix
+              = f.label :password
+              .input= f.password_field :password, disabled: f.object.force_random_password 
+            .clearfix
+              = f.label :password_confirmation
+              .input= f.password_field :password_confirmation, disabled: f.object.force_random_password
+          %hr
+          .clearfix
+            = f.label :skype
+            .input= f.text_field :skype
+          .clearfix
+            = f.label :linkedin
+            .input= f.text_field :linkedin
+          .clearfix
+            = f.label :twitter
+            .input= f.text_field :twitter
+      .span5
+        .ui-box
+          %br
+          .clearfix
+            = f.label :projects_limit
+            .input= f.number_field :projects_limit
 
-        .alert
           .clearfix
-            %p Make the user a GitLab administrator.
-            = f.label :admin, class: "checkbox" do
-              = f.check_box :admin
-              %span Administrator
-        - unless @admin_user.new_record?
-          .alert.alert-error
-            - if @admin_user.blocked
-              %span
-                = link_to 'Unblock', unblock_admin_user_path(@admin_user), method: :put, class: "btn small"
-                This user is blocked and is not able to login to GitLab
-            - else
-              %span
-                = link_to 'Block', block_admin_user_path(@admin_user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small danger"
-                Blocked users will be removed from all projects & will not be able to login to GitLab.
+            = f.label :admin do
+              %strong.cred Administrator
+            .input= f.check_box :admin
+          - unless @admin_user.new_record?
+            %hr
+            .padded.cred
+              - if @admin_user.blocked
+                %span
+                  This user is blocked and is not able to login to GitLab
+                  .clearfix
+                    = link_to 'Unblock User', unblock_admin_user_path(@admin_user), method: :put, class: "btn small right"
+              - else
+                %span
+                  Blocked users will be removed from all projects & will not be able to login to GitLab.
+                  .clearfix
+                    = link_to 'Block User', block_admin_user_path(@admin_user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small right danger"
+
+    .row
+      .span6
+      .span6
     .actions
       = f.submit 'Save', class: "btn primary"
       - if @admin_user.new_record?