Commit 21c70354f609c292d302c433f9f9bcea31674ab9

Authored by Dmitriy Zaporozhets
1 parent 65eddc00

Restyle group members page a bit

app/views/groups/_new_group_member.html.haml
1 = form_for @users_group, url: group_users_groups_path(@group) do |f| 1 = form_for @users_group, url: group_users_groups_path(@group) do |f|
2 %fieldset 2 %fieldset
3 - %legend= "New Group member(s) for #{@group.name}" 3 + %legend
  4 + New member(s) for
  5 + %strong #{@group.name}
  6 + group
4 7
5 - %h6 1. Choose users you want in the group 8 + %p 1. Choose users you want in the group
6 .clearfix 9 .clearfix
7 = f.label :user_ids, "People" 10 = f.label :user_ids, "People"
8 .input= users_select_tag(:user_ids, multiple: true, class: 'input-large') 11 .input= users_select_tag(:user_ids, multiple: true, class: 'input-large')
9 12
10 - %h6 2. Set access level for them 13 + %p 2. Set access level for them
11 .clearfix 14 .clearfix
12 = f.label :group_access, "Group Access" 15 = f.label :group_access, "Group Access"
13 .input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen" 16 .input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
app/views/groups/members.html.haml
  1 +%h3.page-title
  2 + Group members
  3 +%p.light
  4 + Members of group have access to all group projects.
  5 +%hr
1 - can_manage_group = current_user.can? :manage_group, @group 6 - can_manage_group = current_user.can? :manage_group, @group
2 -.row  
3 - .span6  
4 - - if can_manage_group  
5 - = render "new_group_member"  
6 - - else  
7 - .light-well  
8 - %h4.nothing_here_message  
9 - Only group owners can manage group members  
10 - .span6  
11 - .ui-box  
12 - .title  
13 - %strong #{@group.name}  
14 - Group Members  
15 - %small  
16 - (#{@members.count})  
17 - %ul.well-list  
18 - - @members.each do |member|  
19 - = render 'users_groups/users_group', member: member, show_controls: can_manage_group  
20 - %p.light  
21 - Group members get access to all projects in this group 7 +.ui-box
  8 + .title
  9 + %strong #{@group.name}
  10 + group members
  11 + %small
  12 + (#{@members.count})
  13 + %ul.well-list
  14 + - @members.each do |member|
  15 + = render 'users_groups/users_group', member: member, show_controls: can_manage_group
  16 +- if can_manage_group
  17 + = render "new_group_member"