Proper naming for project members page

diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml
index 346bbd2..272c5e4 100644 (file)
--- a/app/views/projects/_settings_nav.html.haml
+++ b/app/views/projects/_settings_nav.html.haml
@@ -6,7 +6,7 @@
   = nav_link(controller: [:team_members, :teams]) do
     = link_to project_team_index_path(@project), class: "team-tab tab" do
       %i.icon-group
-      Project Members
+      Members
   = nav_link(controller: :deploy_keys) do
     = link_to project_deploy_keys_path(@project) do
       %span

diff --git a/app/views/team_members/_group_members.html.haml b/app/views/team_members/_group_members.html.haml
index 256e6ce..7d9333d 100644 (file)
--- a/app/views/team_members/_group_members.html.haml
+++ b/app/views/team_members/_group_members.html.haml
@@ -1,7 +1,10 @@
 .ui-box
   %h5.title
-    = link_to people_group_path(@group) do
-      Members of #{@group.name} group
+    %strong #{@group.name} Group
+    members (#{@group.users_groups.count})
+    .pull-right
+      = link_to people_group_path(@group), class: 'btn btn-small' do
+        %i.icon-edit
   %ul.well-list
     - @group.users_groups.order('group_access DESC').each do |member|
       = render 'users_groups/users_group', member: member, show_controls: false

diff --git a/app/views/team_members/_team.html.haml b/app/views/team_members/_team.html.haml
index 3c7686c..2a663bd 100644 (file)
--- a/app/views/team_members/_team.html.haml
+++ b/app/views/team_members/_team.html.haml
@@ -2,7 +2,8 @@
   - can_admin_project = (can? current_user, :admin_project, @project)
   .ui-box
     %h5.title
-      Project members (#{members.count})
+      %strong #{@project.name} Project
+      members (#{members.count})
     %ul.well-list
       - members.each do |team_member|
         = render 'team_members/team_member', member: team_member, current_user_can_admin_project: can_admin_project

diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml
index 5df2281..bae7215 100644 (file)
--- a/app/views/team_members/index.html.haml
+++ b/app/views/team_members/index.html.haml
@@ -15,8 +15,6 @@
   Read more about project permissions
   %strong= link_to "here", help_permissions_path, class: "vlink"
 
-
-
 .clearfix
 
 - if @group

diff --git a/features/steps/project/project_active_tab.rb b/features/steps/project/project_active_tab.rb
index 5170ab8..a0ee32b 100644 (file)
--- a/features/steps/project/project_active_tab.rb
+++ b/features/steps/project/project_active_tab.rb
@@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
   # Sub Tabs: Home
 
   Given 'I click the "Team" tab' do
-    click_link('Project Members')
+    click_link('Members')
   end
 
   Given 'I click the "Attachments" tab' do
@@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
   end
 
   Then 'the active sub tab should be Team' do
-    ensure_active_sub_tab('Project Members')
+    ensure_active_sub_tab('Members')
   end
 
   Then 'the active sub tab should be Attachments' do