1 files changed, 25 insertions, 25 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 589f4557b52..db4783f46d0 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -1,30 +1,30 @@
-= form_for [:admin, @group], html: { class: "form-horizontal" } do |f|
-  = form_errors(@group)
-  = render 'shared/group_form', f: f
+.row.prepend-top-default
+  .col-lg-3.profile-settings-sidebar
+    %h4.prepend-top-0
+      New Group
+    %p
+      A group is a collection of several projects.
+      Groups can be private, public or limited to any logged in users.
+      You can move existing projects to a group.
+  .col-lg-9
+    = form_for [:admin, @group], html: { class: "form-horizontal" } do |f|
+      = form_errors(@group)
+      = render 'shared/group_form', f: f
 
-  .form-group.group-description-holder
-    = f.label :avatar, "Group avatar", class: 'control-label'
-    .col-sm-10
-      = render 'shared/choose_group_avatar_button', f: f
+      .form-group.col-xs-12
+        = f.label :avatar, 'Group avatar', class: 'label-light label-block'
+        = render 'shared/choose_group_avatar_button', f: f
 
-  = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group
+      .form-group.col-xs-12.project-visibility-level-holder
+        = f.label :visibility_level, class: 'label-light' do
+          Visibility Level
+          = link_to icon('question-circle'), help_page_path("public_access/public_access")
+        = render('shared/visibility_radios', model_method: :visibility_level, form: f, can_change_visibility_level: can_change_group_visibility_level?(@group), selected_level: visibility_level, form_model: @group)
 
-  .form-group
-    .col-sm-offset-2.col-sm-10
-      = render 'shared/allow_request_access', form: f
+      .form-group.col-xs-12
+        = render 'shared/allow_request_access', form: f
 
-  = render 'groups/group_lfs_settings', f: f
+      = render 'groups/group_lfs_settings', f: f
 
-  - if @group.new_record?
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .alert.alert-info
-          = render 'shared/group_tips'
-    .form-actions
-      = f.submit 'Create group', class: "btn btn-create"
-      = link_to  'Cancel', admin_groups_path, class: "btn btn-cancel"
-
-  - else
-    .form-actions
-      = f.submit 'Save changes', class: "btn btn-save"
-      = link_to  'Cancel', admin_group_path(@group), class: "btn btn-cancel"
+      = f.submit "#{@group.new_record? ? 'Create group' : 'Save changes'}", class: 'btn btn-create'
+      = link_to  'Cancel', @group.new_record? ? admin_groups_path : admin_group_path(@group), class: 'btn btn-cancel'