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
Boxiang Sun
gitlab-ce
Commits
d9749c8d
Commit
d9749c8d
authored
Nov 24, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve UI for group members page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
4cfc3df5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
32 deletions
+43
-32
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+5
-0
app/assets/stylesheets/framework/pagination.scss
app/assets/stylesheets/framework/pagination.scss
+4
-0
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+2
-2
app/views/groups/group_members/_group_member.html.haml
app/views/groups/group_members/_group_member.html.haml
+2
-2
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+30
-28
No files found.
app/assets/stylesheets/framework/lists.scss
View file @
d9749c8d
...
@@ -127,3 +127,8 @@ ul.content-list {
...
@@ -127,3 +127,8 @@ ul.content-list {
}
}
}
}
.panel
>
.content-list
{
li
{
margin
:
0
;
}
}
app/assets/stylesheets/framework/pagination.scss
View file @
d9749c8d
...
@@ -32,3 +32,7 @@
...
@@ -32,3 +32,7 @@
}
}
}
}
}
}
.panel
>
.gl-pagination
{
margin
:
0
;
}
app/assets/stylesheets/pages/groups.scss
View file @
d9749c8d
.new-group-member-holder
{
.new-group-member-holder
{
margin-top
:
5
0px
;
margin-top
:
1
0px
;
padding-top
:
20px
;
padding-top
:
20px
;
}
}
...
...
app/views/groups/group_members/_group_member.html.haml
View file @
d9749c8d
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%li
{
class:
"#{dom_class(member)} js-toggle-container"
,
id:
dom_id
(
member
)}
%li
{
class:
"#{dom_class(member)} js-toggle-container"
,
id:
dom_id
(
member
)}
%span
{
class:
(
"list-item-name"
if
show_controls
)}
%span
{
class:
(
"list-item-name"
if
show_controls
)}
-
if
member
.
user
-
if
member
.
user
=
image_tag
avatar_icon
(
user
,
16
),
class:
"avatar s16
"
,
alt:
''
=
image_tag
avatar_icon
(
user
,
24
),
class:
"avatar s24
"
,
alt:
''
%strong
%strong
=
link_to
user
.
name
,
user_path
(
user
)
=
link_to
user
.
name
,
user_path
(
user
)
%span
.cgray
=
user
.
username
%span
.cgray
=
user
.
username
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
%label
.label.label-danger
%label
.label.label-danger
%strong
Blocked
%strong
Blocked
-
else
-
else
=
image_tag
avatar_icon
(
member
.
invite_email
,
16
),
class:
"avatar s16
"
,
alt:
''
=
image_tag
avatar_icon
(
member
.
invite_email
,
24
),
class:
"avatar s24
"
,
alt:
''
%strong
%strong
=
member
.
invite_email
=
member
.
invite_email
%span
.cgray
%span
.cgray
...
...
app/views/groups/group_members/index.html.haml
View file @
d9749c8d
-
@blank_container
=
true
-
page_title
"Members"
-
page_title
"Members"
-
header_title
group_title
(
@group
,
"Members"
,
group_group_members_path
(
@group
))
-
header_title
group_title
(
@group
,
"Members"
,
group_group_members_path
(
@group
))
-
if
should_user_see_group_roles?
(
current_user
,
@group
)
%p
.light
Members of group have access to all group projects.
Read more about permissions
%strong
=
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
.clearfix.js-toggle-container
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form'
do
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing member by name'
,
class:
'form-control search-text-input'
,
spellcheck:
false
}
=
button_tag
'Search'
,
class:
'btn'
-
if
current_user
&&
current_user
.
can?
(
:admin_group_member
,
@group
)
.pull-right
=
button_tag
class:
'btn btn-new js-toggle-button'
,
type:
'button'
do
Add members
%i
.fa.fa-chevron-down
.js-toggle-content.hide.new-group-member-holder
.group-members-page
-
if
current_user
&&
current_user
.
can?
(
:admin_group_member
,
@group
)
.panel.panel-default
.panel-heading
Add new user to group
.panel-body
-
if
should_user_see_group_roles?
(
current_user
,
@group
)
%p
.light
Members of group have access to all group projects.
Read more about permissions
%strong
=
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
.new-group-member-holder
=
render
"new_group_member"
=
render
"new_group_member"
.panel.panel-default.prepend-top-20
.panel.panel-default
.panel-heading
.panel-heading
%strong
#{
@group
.
name
}
%strong
#{
@group
.
name
}
group members
group members
%small
%small
(
#{
@members
.
total_count
}
)
(
#{
@members
.
total_count
}
)
%ul
.well-list
.pull-right
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form'
do
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing member by name'
,
class:
'form-control'
,
spellcheck:
false
}
=
button_tag
class:
'btn'
do
=
icon
(
"search"
)
%ul
.content-list
-
@members
.
each
do
|
member
|
-
@members
.
each
do
|
member
|
=
render
'groups/group_members/group_member'
,
member:
member
,
show_controls:
true
=
render
'groups/group_members/group_member'
,
member:
member
,
show_controls:
true
=
paginate
@members
,
theme:
'gitlab'
=
paginate
@members
,
theme:
'gitlab'
:javascript
:javascript
$
(
'
form.member-search-form
'
).
on
(
'
submit
'
,
function
(
event
)
{
$
(
'
form.member-search-form
'
).
on
(
'
submit
'
,
function
(
event
)
{
...
...
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