Improve group views

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

5 files changed, 22 insertions, 24 deletions

diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml
index 312a29b1e36..a0dd4fbb595 100644
--- a/app/views/groups/_new_group_member.html.haml
+++ b/app/views/groups/_new_group_member.html.haml
@@ -1,20 +1,18 @@
-= form_for @users_group, url: group_users_groups_path(@group) do |f|
-  %fieldset
-    %legend
-      New member(s) for
-      %strong #{@group.name}
-      group
+= form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal' } do |f|
+  %h4.append-bottom-20
+    New member(s) for
+    %strong #{@group.name}
+    group
 
-    %p 1. Choose users you want in the group
-    .form-group
-      = f.label :user_ids, "People"
-      .col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
+  %p 1. Choose users you want in the group
+  .form-group
+    = f.label :user_ids, "People", class: 'control-label'
+    .col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
 
-    %p 2. Set access level for them
-    .form-group
-      = f.label :group_access, "Group Access"
-      .col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
-
-    .form-actions
-      = f.submit 'Add users into group', class: "btn btn-create"
+  %p 2. Set access level for them
+  .form-group
+    = f.label :group_access, "Group Access", class: 'control-label'
+    .col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
 
+  .form-actions
+    = f.submit 'Add users into group', class: "btn btn-create"
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml
index 3e685d01b95..77734815b8a 100644
--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
@@ -20,18 +20,18 @@
             %strong= @group.name
             group settings:
           %div.form-holder
-            = form_for @group do |f|
+            = form_for @group, html: { class: "form-horizontal" } do |f|
               - if @group.errors.any?
                 .alert.alert-danger
                   %span= @group.errors.full_messages.first
               .form-group
-                = f.label :name do
+                = f.label :name, class: 'control-label' do
                   Group name
                 .col-sm-10
                   = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
 
               .form-group.group-description-holder
-                = f.label :description, "Details"
+                = f.label :description, "Details", class: 'control-label'
                 .col-sm-10
                   = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
 
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index e19a07250a4..e24df310910 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  Issues assigned to me
+  Issues
   %span.pull-right #{@issues.total_count} issues
 
 %p.light
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 83ffa579fdc..eaf85bbdbc8 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -3,9 +3,9 @@
   %span.pull-right #{@merge_requests.total_count} merge requests
 
 %p.light
-  Authored or assigned to you from
+  Only merge requests from
   %strong #{@group.name}
-  group. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
+  group are listed here. To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
 %hr
 .row
   .col-md-3
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index f4925b434d3..5332d383c4c 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -1,5 +1,5 @@
 .dashboard
-  .activities.col-md-8
+  .activities.col-md-8.hidden-sm
     = render "events/event_last_push", event: @last_push
     = link_to dashboard_path, class: 'btn btn-tiny' do
       ← To dashboard