From 31c963edb137055c1fe7a67c31b63fabbfd8c0bd Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 3 Jun 2014 13:05:06 +0300
Subject: [PATCH] Improve admin/user form

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/generic/forms.scss |  4 ++++
 app/views/admin/users/_form.html.haml     | 15 ++++++---------
 app/views/admin/users/edit.html.haml      |  7 ++++---
 app/views/admin/users/new.html.haml       |  1 -
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss
index 36551f85b6a..bd9d4bceb83 100644
--- a/app/assets/stylesheets/generic/forms.scss
+++ b/app/assets/stylesheets/generic/forms.scss
@@ -98,3 +98,7 @@ label {
     z-index: 2;
   }
 }
+
+.fieldset-form fieldset {
+  margin-bottom: 20px;
+}
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index b9e6382ea88..d00772d4dfe 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -1,5 +1,5 @@
 .user_new
-  = form_for [:admin, @user], html: { class: 'form-horizontal' } do |f|
+  = form_for [:admin, @user], html: { class: 'form-horizontal fieldset-form' } do |f|
     -if @user.errors.any?
       #error_explanation
         .alert.alert-danger
@@ -61,16 +61,13 @@
           .col-sm-10 You cannot remove your own admin rights
         - else
           .col-sm-10= f.check_box :admin
-      - unless @user.new_record? || current_user == @user
-        .alert.alert-danger
-          - if @user.blocked?
-            %p This user is blocked and is not able to login to GitLab
-            = link_to 'Unblock User', unblock_admin_user_path(@user), method: :put, class: "btn btn-small"
-          - else
-            %p Blocked users will be removed from all projects &amp; will not be able to login to GitLab.
-            = link_to 'Block User', block_admin_user_path(@user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-small btn-remove"
     %fieldset
       %legend Profile
+      .form-group
+        = f.label :avatar, class: 'control-label'
+        .col-sm-10
+          = f.file_field :avatar
+
       .form-group
         = f.label :skype, class: 'control-label'
         .col-sm-10= f.text_field :skype, class: 'form-control'
diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml
index 2a4f8c60546..d71d8189c51 100644
--- a/app/views/admin/users/edit.html.haml
+++ b/app/views/admin/users/edit.html.haml
@@ -1,6 +1,7 @@
 %h3.page-title
-  #{@user.name} &rarr;
-  %i.icon-edit
-  Edit user
+  Edit user: #{@user.name}
+.back-link
+  = link_to admin_user_path(@user) do
+    &larr; Back to user page
 %hr
 = render 'form'
diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml
index a1c90c48946..8fbb757f424 100644
--- a/app/views/admin/users/new.html.haml
+++ b/app/views/admin/users/new.html.haml
@@ -1,5 +1,4 @@
 %h3.page-title
-  %i.icon-plus
   New user
 %hr
 = render 'form'