Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
bacb05c5
Commit
bacb05c5
authored
Mar 15, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small improvements to group/project member rows
parent
aad3cbee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
app/views/groups/group_members/_group_member.html.haml
app/views/groups/group_members/_group_member.html.haml
+1
-0
app/views/projects/project_members/_group_members.html.haml
app/views/projects/project_members/_group_members.html.haml
+2
-1
app/views/projects/project_members/_project_member.html.haml
app/views/projects/project_members/_project_member.html.haml
+2
-1
No files found.
app/views/groups/group_members/_group_member.html.haml
View file @
bacb05c5
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
title:
'Edit access level'
,
type:
'button'
do
title:
'Edit access level'
,
type:
'button'
do
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
-
if
can?
(
current_user
,
:destroy_group_member
,
member
)
-
if
can?
(
current_user
,
:destroy_group_member
,
member
)
-
if
current_user
==
user
-
if
current_user
==
user
=
link_to
leave_group_group_members_path
(
@group
),
data:
{
confirm:
leave_group_message
(
@group
.
name
)},
method: :delete
,
class:
"btn-xs btn btn-remove"
,
title:
'Remove user from group'
do
=
link_to
leave_group_group_members_path
(
@group
),
data:
{
confirm:
leave_group_message
(
@group
.
name
)},
method: :delete
,
class:
"btn-xs btn btn-remove"
,
title:
'Remove user from group'
do
%i
.fa.fa-minus.fa-inverse
%i
.fa.fa-minus.fa-inverse
...
...
app/views/projects/project_members/_group_members.html.haml
View file @
bacb05c5
...
@@ -4,9 +4,10 @@
...
@@ -4,9 +4,10 @@
group members
group members
%small
%small
(
#{
members
.
count
}
)
(
#{
members
.
count
}
)
.p
ull-right
.p
anel-head-actions
=
link_to
group_group_members_path
(
@group
),
class:
'btn btn-sm'
do
=
link_to
group_group_members_path
(
@group
),
class:
'btn btn-sm'
do
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
Edit group members
%ul
.well-list
%ul
.well-list
-
members
.
each
do
|
member
|
-
members
.
each
do
|
member
|
=
render
'groups/group_members/group_member'
,
member:
member
,
show_controls:
false
=
render
'groups/group_members/group_member'
,
member:
member
,
show_controls:
false
...
...
app/views/projects/project_members/_project_member.html.haml
View file @
bacb05c5
...
@@ -20,13 +20,14 @@
...
@@ -20,13 +20,14 @@
title:
'Edit access level'
,
type:
'button'
do
title:
'Edit access level'
,
type:
'button'
do
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
-
if
current_user
==
user
-
if
current_user
==
user
=
link_to
leave_namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
data:
{
confirm:
"Leave project?"
},
method: :delete
,
class:
"btn-xs btn btn-remove"
,
title:
'Leave project'
do
=
link_to
leave_namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
data:
{
confirm:
"Leave project?"
},
method: :delete
,
class:
"btn-xs btn btn-remove"
,
title:
'Leave project'
do
%i
.fa.fa-minus.fa-inverse
%i
.fa.fa-minus.fa-inverse
-
else
-
else
=
link_to
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
user
),
data:
{
confirm:
remove_from_project_team_message
(
@project
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-xs btn btn-remove"
,
title:
'Remove user from team'
do
=
link_to
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
user
),
data:
{
confirm:
remove_from_project_team_message
(
@project
,
user
)
},
method: :delete
,
remote:
true
,
class:
"btn-xs btn btn-remove"
,
title:
'Remove user from team'
do
%i
.fa.fa-minus.fa-inverse
%i
.fa.fa-minus.fa-inverse
.edit-member.hide.js-toggle-content
.edit-member.hide.js-toggle-content
=
form_for
member
,
as: :project_member
,
url:
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
member
.
user
),
remote:
true
do
|
f
|
=
form_for
member
,
as: :project_member
,
url:
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
member
.
user
),
remote:
true
do
|
f
|
.alert.prepend-top-20
.alert.prepend-top-20
...
...
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