Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
cdd8e41e8054
Commit
a0b6c964
authored
Jun 18, 2013
by
Dmitriy Zaporozhets
Browse files
Proper naming for project members page
parent
e680cc77340e
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/views/projects/_settings_nav.html.haml
View file @
cdd8e41e
...
...
@@ -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
...
...
app/views/team_members/_group_members.html.haml
View file @
cdd8e41e
.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
app/views/team_members/_team.html.haml
View file @
cdd8e41e
...
...
@@ -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
app/views/team_members/index.html.haml
View file @
cdd8e41e
...
...
@@ -15,8 +15,6 @@
Read more about project permissions
%strong
=
link_to
"here"
,
help_permissions_path
,
class:
"vlink"
.clearfix
-
if
@group
...
...
features/steps/project/project_active_tab.rb
View file @
cdd8e41e
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment