Commit a855718341bfc96379127fb8cb583830f1c9c01f
1 parent
d6cebe34
Exists in
master
and in
4 other branches
Redesign team.members pages
Showing
2 changed files
with
41 additions
and
44 deletions
Show diff stats
app/views/teams/members/_show.html.haml
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | - allow_admin = can? current_user, :manage_user_team, @team | 2 | - allow_admin = can? current_user, :manage_user_team, @team |
| 3 | %li{id: dom_id(member), class: "team_member_row user_#{user.id}"} | 3 | %li{id: dom_id(member), class: "team_member_row user_#{user.id}"} |
| 4 | .row | 4 | .row |
| 5 | - .span5 | 5 | + .span4 |
| 6 | = link_to user_path(user.username), title: user.name, class: "dark" do | 6 | = link_to user_path(user.username), title: user.name, class: "dark" do |
| 7 | = image_tag gravatar_icon(user.email, 40), class: "avatar s32" | 7 | = image_tag gravatar_icon(user.email, 40), class: "avatar s32" |
| 8 | = link_to user_path(user.username), title: user.name, class: "dark" do | 8 | = link_to user_path(user.username), title: user.name, class: "dark" do |
| @@ -10,21 +10,22 @@ | @@ -10,21 +10,22 @@ | ||
| 10 | %br | 10 | %br |
| 11 | %small.cgray= user.username | 11 | %small.cgray= user.username |
| 12 | 12 | ||
| 13 | - .span4 | 13 | + .span7.pull-right |
| 14 | - if allow_admin | 14 | - if allow_admin |
| 15 | - = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f| | ||
| 16 | - = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium trigger-submit" | ||
| 17 | - %br | ||
| 18 | - = label_tag do | ||
| 19 | - = f.check_box :group_admin, class: 'trigger-submit' | ||
| 20 | - %span Admin access | ||
| 21 | - .pull-right | ||
| 22 | - - if current_user == user | ||
| 23 | - %span.btn.disabled This is you! | ||
| 24 | - - if @team.owner == user | ||
| 25 | - %span.btn.disabled Owner | ||
| 26 | - - elsif user.blocked? | ||
| 27 | - %span.btn.disabled.blocked Blocked | ||
| 28 | - - elsif allow_admin | ||
| 29 | - = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do | ||
| 30 | - %i.icon-minus.icon-white | 15 | + .pull-left |
| 16 | + = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f| | ||
| 17 | + = label_tag do | ||
| 18 | + = f.check_box :group_admin, class: 'trigger-submit' | ||
| 19 | + %span Admin access | ||
| 20 | + | ||
| 21 | + = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium trigger-submit" | ||
| 22 | + .pull-right | ||
| 23 | + - if current_user == user | ||
| 24 | + %span.btn.disabled This is you! | ||
| 25 | + - if @team.owner == user | ||
| 26 | + %span.btn.disabled Owner | ||
| 27 | + - elsif user.blocked? | ||
| 28 | + %span.btn.disabled.blocked Blocked | ||
| 29 | + - elsif allow_admin | ||
| 30 | + = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do | ||
| 31 | + %i.icon-minus.icon-white |
app/views/teams/members/new.html.haml
| 1 | %h3.page_title | 1 | %h3.page_title |
| 2 | Team: #{@team.name} | 2 | Team: #{@team.name} |
| 3 | 3 | ||
| 4 | -%fieldset | ||
| 5 | - %legend Members (#{@team.members.count}) | ||
| 6 | - = form_tag team_members_path(@team), id: "team_members", class: "bulk_import", method: :post do | ||
| 7 | - %table#members_list | ||
| 8 | - %thead | ||
| 9 | - %tr | ||
| 10 | - %th User name | ||
| 11 | - %th Default project access | ||
| 12 | - %th Team access | ||
| 13 | - %th | ||
| 14 | - - @team.members.each do |member| | ||
| 15 | - %tr.member | ||
| 16 | - %td | ||
| 17 | - = member.name | ||
| 18 | - %small= "(#{member.username})" | ||
| 19 | - %td= @team.human_default_projects_access(member) | ||
| 20 | - %td= @team.admin?(member) ? "Admin" : "Member" | ||
| 21 | - %td | ||
| 22 | - %tr | ||
| 23 | - %td | ||
| 24 | - = users_select_tag(:user_ids, multiple: true) | ||
| 25 | - %td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" } | ||
| 26 | - %td | ||
| 27 | - %span= check_box_tag :group_admin | ||
| 28 | - %span Admin? | ||
| 29 | - %td= submit_tag 'Add User', class: "btn btn-create", id: :add_members_to_team | 4 | +%hr |
| 5 | + | ||
| 6 | += form_tag team_members_path(@team), id: "team_members", class: "bulk_import", method: :post do | ||
| 7 | + %h6 1. Choose people you want in the team | ||
| 8 | + .clearfix | ||
| 9 | + = label_tag :user_ids, "People" | ||
| 10 | + .input | ||
| 11 | + = users_select_tag(:user_ids, multiple: true) | ||
| 12 | + | ||
| 13 | + %h6 2. Set access level for them | ||
| 14 | + .clearfix | ||
| 15 | + = label_tag :project_access, "Project Access" | ||
| 16 | + .input= select_tag :default_project_access, options_for_select(Project.access_options), class: "project-access-select chosen" | ||
| 17 | + | ||
| 18 | + .clearfix | ||
| 19 | + = label_tag :group_admin do | ||
| 20 | + %span Team Admin? | ||
| 21 | + .input= check_box_tag :group_admin | ||
| 22 | + | ||
| 23 | + .actions | ||
| 24 | + = submit_tag 'Add users', class: "btn btn-create", id: :add_members_to_team | ||
| 25 | + = link_to "Cancel", team_members_path(@team), class: "btn btn-cancel" |