Download as
Browse Code »

Commit a0b6c964c5f3b69aa98411a2fc7815f6c3a37854

Authored by Dmitriy Zaporozhets
1 parent 32ef2f37
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Proper naming for project members page

Showing 5 changed files with 10 additions and 8 deletions   Show diff stats
app/views/projects/_settings_nav.html.haml
  Diff comments   View file @a0b6c96
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 = nav_link(controller: [:team_members, :teams]) do 6 = nav_link(controller: [:team_members, :teams]) do
7 = link_to project_team_index_path(@project), class: "team-tab tab" do 7 = link_to project_team_index_path(@project), class: "team-tab tab" do
8 %i.icon-group 8 %i.icon-group
9 - Project Members 9 + Members
10 = nav_link(controller: :deploy_keys) do 10 = nav_link(controller: :deploy_keys) do
11 = link_to project_deploy_keys_path(@project) do 11 = link_to project_deploy_keys_path(@project) do
12 %span 12 %span
app/views/team_members/_group_members.html.haml
  Diff comments   View file @a0b6c96
1 .ui-box 1 .ui-box
2 %h5.title 2 %h5.title
3 - = link_to people_group_path(@group) do  
4 - Members of #{@group.name} group 3 + %strong #{@group.name} Group
  4 + members (#{@group.users_groups.count})
  5 + .pull-right
  6 + = link_to people_group_path(@group), class: 'btn btn-small' do
  7 + %i.icon-edit
5 %ul.well-list 8 %ul.well-list
6 - @group.users_groups.order('group_access DESC').each do |member| 9 - @group.users_groups.order('group_access DESC').each do |member|
7 = render 'users_groups/users_group', member: member, show_controls: false 10 = render 'users_groups/users_group', member: member, show_controls: false
app/views/team_members/_team.html.haml
  Diff comments   View file @a0b6c96
@@ -2,7 +2,8 @@ @@ -2,7 +2,8 @@
2 - can_admin_project = (can? current_user, :admin_project, @project) 2 - can_admin_project = (can? current_user, :admin_project, @project)
3 .ui-box 3 .ui-box
4 %h5.title 4 %h5.title
5 - Project members (#{members.count}) 5 + %strong #{@project.name} Project
  6 + members (#{members.count})
6 %ul.well-list 7 %ul.well-list
7 - members.each do |team_member| 8 - members.each do |team_member|
8 = render 'team_members/team_member', member: team_member, current_user_can_admin_project: can_admin_project 9 = render 'team_members/team_member', member: team_member, current_user_can_admin_project: can_admin_project
app/views/team_members/index.html.haml
  Diff comments   View file @a0b6c96
@@ -15,8 +15,6 @@ @@ -15,8 +15,6 @@
15 Read more about project permissions 15 Read more about project permissions
16 %strong= link_to "here", help_permissions_path, class: "vlink" 16 %strong= link_to "here", help_permissions_path, class: "vlink"
17 17
18 -  
19 -  
20 .clearfix 18 .clearfix
21 19
22 - if @group 20 - if @group
features/steps/project/project_active_tab.rb
  Diff comments   View file @a0b6c96
@@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps @@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
45 # Sub Tabs: Home 45 # Sub Tabs: Home
46 46
47 Given 'I click the "Team" tab' do 47 Given 'I click the "Team" tab' do
48 - click_link('Project Members') 48 + click_link('Members')
49 end 49 end
50 50
51 Given 'I click the "Attachments" tab' do 51 Given 'I click the "Attachments" tab' do
@@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps @@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
73 end 73 end
74 74
75 Then 'the active sub tab should be Team' do 75 Then 'the active sub tab should be Team' do
76 - ensure_active_sub_tab('Project Members') 76 + ensure_active_sub_tab('Members')
77 end 77 end
78 78
79 Then 'the active sub tab should be Attachments' do 79 Then 'the active sub tab should be Attachments' do