diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 13:05:06 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 13:05:06 +0300 |
| commit | 31c963edb137055c1fe7a67c31b63fabbfd8c0bd (patch) | |
| tree | c0cedc4ea992039934915476eb598f4fc7a5f6c3 /app/views/admin/users/_form.html.haml | |
| parent | fc43c4e7fad0b958f4ba36a48ccecee82343ec2a (diff) | |
| download | gitlab-ce-31c963edb137055c1fe7a67c31b63fabbfd8c0bd.tar.gz | |
Improve admin/user form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/admin/users/_form.html.haml')
| -rw-r--r-- | app/views/admin/users/_form.html.haml | 15 |
1 files changed, 6 insertions, 9 deletions
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,17 +61,14 @@ .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 & 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' .form-group |