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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
e36b6daa
Commit
e36b6daa
authored
Sep 28, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better empty state for Groups view.
parent
71345998
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
52 additions
and
6 deletions
+52
-6
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+35
-1
app/views/dashboard/groups/_empty_state.html.haml
app/views/dashboard/groups/_empty_state.html.haml
+7
-0
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+8
-5
app/views/shared/icons/_icon_empty_groups.svg
app/views/shared/icons/_icon_empty_groups.svg
+1
-0
No files found.
CHANGELOG
View file @
e36b6daa
...
...
@@ -28,6 +28,7 @@ v 8.13.0 (unreleased)
- Fix Long commit messages overflow viewport in file tree
- Revert avoid touching file system on Build#artifacts?
- Add broadcast messages and alerts below sub-nav
- Better empty state for Groups view
- Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
- Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
- Add organization field to user profile
...
...
app/assets/stylesheets/pages/groups.scss
View file @
e36b6daa
...
...
@@ -57,7 +57,6 @@
}
.groups-header
{
@media
(
min-width
:
$screen-sm-min
)
{
.nav-links
{
width
:
35%
;
...
...
@@ -68,3 +67,38 @@
}
}
}
.groups-empty-state
{
padding
:
50px
100px
;
overflow
:
hidden
;
@media
(
max-width
:
$screen-md-min
)
{
padding
:
50px
0
;
}
svg
{
float
:
right
;
@media
(
max-width
:
$screen-md-min
)
{
float
:
none
;
display
:
block
;
width
:
250px
;
position
:
relative
;
left
:
50%
;
margin-left
:
-125px
;
}
}
.text-content
{
float
:
left
;
width
:
460px
;
margin-top
:
120px
;
@media
(
max-width
:
$screen-md-min
)
{
float
:
none
;
margin-top
:
60px
;
width
:
auto
;
text-align
:
center
;
}
}
}
app/views/dashboard/groups/_empty_state.html.haml
0 → 100644
View file @
e36b6daa
.groups-empty-state
=
custom_icon
(
"icon_empty_groups"
)
.text-content
%h4
A group is a collection of several projects.
%p
If you organize your projects under a group, it works like a folder.
%p
You can manage your group member’s permissions and access to each project in the group.
app/views/dashboard/groups/index.html.haml
View file @
e36b6daa
...
...
@@ -2,9 +2,12 @@
-
header_title
"Groups"
,
dashboard_groups_path
=
render
'dashboard/groups_head'
%ul
.content-list
-
@group_members
.
each
do
|
group_member
|
-
group
=
group_member
.
group
=
render
'shared/groups/group'
,
group:
group
,
group_member:
group_member
-
if
@group_members
.
empty?
=
render
'empty_state'
-
else
%ul
.content-list
-
@group_members
.
each
do
|
group_member
|
-
group
=
group_member
.
group
=
render
'shared/groups/group'
,
group:
group
,
group_member:
group_member
=
paginate
@group_members
,
theme:
'gitlab'
=
paginate
@group_members
,
theme:
'gitlab'
app/views/shared/icons/_icon_empty_groups.svg
0 → 100644
View file @
e36b6daa
<svg
width=
"249"
height=
"368"
viewBox=
"891 156 249 368"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
><defs><rect
id=
"a"
width=
"131"
height=
"162"
rx=
"10"
/><mask
id=
"e"
x=
"0"
y=
"0"
width=
"131"
height=
"162"
fill=
"#fff"
><use
xlink:href=
"#a"
/></mask><path
d=
"M218.616 127.958V108.96c0-4.416-3.584-8-8.005-8h-23.985c-2.778 0-5.98 2.014-7.18 4.5l-5.07 10.5h-49.763c-5.527 0-9.996 4.475-9.996 9.997v53.005c0 5.513 4.475 9.997 9.996 9.997h84.01c5.525 0 9.994-4.477 9.994-9.998v-51.004z"
id=
"b"
/><mask
id=
"f"
x=
"0"
y=
"0"
width=
"104"
height=
"88"
fill=
"#fff"
><use
xlink:href=
"#b"
/></mask><path
d=
"M47 25h.996C53.52 25 58 29.472 58 34.99v20.02C58 60.526 53.52 65 47.996 65H10.004C4.48 65 0 60.528 0 55.01V34.99C0 29.474 4.48 25 10.004 25H11v-7c0-9.94 8.06-18 18-18s18 8.06 18 18v7zm-6 0H17v-7c0-6.627 5.373-12 12-12s12 5.373 12 12v7z"
id=
"c"
/><mask
id=
"g"
x=
"0"
y=
"0"
width=
"58"
height=
"65"
fill=
"#fff"
><use
xlink:href=
"#c"
/></mask><path
d=
"M0 10.008C0 4.48 4.476 0 10 0h218c5.523 0 10 4.473 10 10.008v140.94c0 5.53-4.062 11.882-9.08 14.196l-100.84 46.5c-5.015 2.31-13.142 2.312-18.16 0l-100.84-46.5C4.064 162.832 0 156.484 0 150.95V10.007z"
id=
"d"
/><mask
id=
"h"
x=
"0"
y=
"0"
width=
"238"
height=
"213.417"
fill=
"#fff"
><use
xlink:href=
"#d"
/></mask></defs><g
fill=
"none"
fill-rule=
"evenodd"
transform=
"translate(891 156)"
><g
transform=
"rotate(8 -266.528 490.3)"
><use
stroke=
"#E5E5E5"
mask=
"url(#e)"
stroke-width=
"8"
fill=
"#FFF"
xlink:href=
"#a"
/><rect
fill=
"#FC8A51"
x=
"20"
y=
"31"
width=
"12"
height=
"4"
rx=
"2"
/><rect
fill=
"#FC8A51"
x=
"60"
y=
"31"
width=
"12"
height=
"4"
rx=
"2"
/><rect
fill=
"#FDE5D8"
x=
"36"
y=
"31"
width=
"20"
height=
"4"
rx=
"2"
/><rect
fill=
"#6B4FBB"
x=
"20"
y=
"65"
width=
"20"
height=
"4"
rx=
"2"
/><rect
fill=
"#FDE5D8"
x=
"44"
y=
"65"
width=
"20"
height=
"4"
rx=
"2"
/><rect
fill=
"#FC8A51"
x=
"36"
y=
"80"
width=
"20"
height=
"4"
rx=
"2"
/><rect
fill=
"#FDE5D8"
x=
"20"
y=
"80"
width=
"12"
height=
"4"
rx=
"2"
/><rect
fill=
"#FDE5D8"
x=
"20"
y=
"48"
width=
"12"
height=
"4"
rx=
"2"
/><rect
fill=
"#FC8A51"
x=
"36"
y=
"48"
width=
"12"
height=
"4"
rx=
"2"
/><rect
fill=
"#FDE5D8"
x=
"60"
y=
"80"
width=
"12"
height=
"4"
rx=
"2"
/><rect
fill=
"#6B4FBB"
x=
"52"
y=
"48"
width=
"12"
height=
"4"
rx=
"2"
/><rect
fill=
"#FDE5D8"
x=
"68"
y=
"48"
width=
"12"
height=
"4"
rx=
"2"
/></g><use
stroke=
"#B5A7DD"
mask=
"url(#f)"
stroke-width=
"8"
fill=
"#FFF"
transform=
"rotate(5 166.616 144.96)"
xlink:href=
"#b"
/><path
d=
"M58 132c0-9.94 8.06-18 18-18s18 8.06 18 18-8.06 18-18 18-18-8.06-18-18z"
fill=
"#C1E7D0"
/><path
d=
"M90.143 132c0-7.81-6.332-14.143-14.143-14.143-7.81 0-14.143 6.332-14.143 14.143 0 7.81 6.332 14.143 14.143 14.143 7.81 0 14.143-6.332 14.143-14.143z"
fill=
"#FFF"
/><path
d=
"M74.686 133.875l-3.18-3.18c-.29-.29-.77-.296-1.06-.005l-1.55 1.55c-.287.287-.29.766.004 1.06l4.92 4.92c.504.504 1.32.504 1.823 0l.654-.653 7.804-7.804c.3-.3.29-.77-.005-1.067l-1.578-1.58c-.302-.3-.775-.298-1.068-.004l-6.764 6.763z"
fill=
"#31AF64"
/><path
d=
"M4 66c0-9.94 8.06-18 18-18s18 8.06 18 18-8.06 18-18 18S4 75.94 4 66z"
fill=
"#D5ECF7"
/><path
d=
"M36.143 66c0-7.81-6.332-14.143-14.143-14.143-7.81 0-14.143 6.332-14.143 14.143 0 7.81 6.332 14.143 14.143 14.143 7.81 0 14.143-6.332 14.143-14.143z"
fill=
"#FFF"
/><path
d=
"M22 55.714c5.68 0 10.286 4.605 10.286 10.286 0 5.68-4.605 10.286-10.286 10.286-3.45 0-6.505-1.7-8.37-4.307L22 66V55.714z"
fill=
"#2D9FD8"
/><g
transform=
"rotate(-8 748.533 18.147)"
><use
stroke=
"#FDE5D8"
mask=
"url(#g)"
stroke-width=
"8"
fill=
"#FFF"
xlink:href=
"#c"
/><path
d=
"M31 46.584c1.766-.772 3-2.534 3-4.584 0-2.76-2.24-5-5-5s-5 2.24-5 5c0 2.05 1.234 3.812 3 4.584v3.42c0 1.1.895 1.996 2 1.996 1.112 0 2-.894 2-1.997v-3.42z"
fill=
"#FC8A51"
/></g><g
transform=
"translate(0 154)"
><use
stroke=
"#E5E5E5"
mask=
"url(#h)"
stroke-width=
"8"
fill=
"#FFF"
xlink:href=
"#d"
/><g
fill=
"#E5E5E5"
><path
d=
"M119.49 122.98l8.997-27.664h-17.993l8.996 27.664M97.886 95.316l-2.737 8.405c-.25.765.02 1.607.673 2.083l23.657 17.177-21.594-27.664zM97.886 95.316h12.608l-5.416-16.662c-.278-.852-1.488-.852-1.776 0l-5.416 16.662zM141.084 95.316l2.737 8.405c.25.765-.018 1.607-.673 2.083L119.49 122.98l21.594-27.664zM141.084 95.316h-12.607l5.416-16.662c.277-.852 1.487-.852 1.775 0l5.416 16.662z"
/></g><path
d=
"M57 18.29c1.105 0 2-.818 2-1.828 0-1.01-.895-1.83-2-1.83H41c-1.105 0-2 .82-2 1.83 0 1.01.895 1.83 2 1.83h16zm36 0c1.105 0 2-.818 2-1.828 0-1.01-.895-1.83-2-1.83H77c-1.105 0-2 .82-2 1.83 0 1.01.895 1.83 2 1.83h16zm36 0c1.105 0 2-.818 2-1.828 0-1.01-.895-1.83-2-1.83h-16c-1.105 0-2 .82-2 1.83 0 1.01.895 1.83 2 1.83h16zm36 0c1.105 0 2-.818 2-1.828 0-1.01-.895-1.83-2-1.83h-16c-1.105 0-2 .82-2 1.83 0 1.01.895 1.83 2 1.83h16zm36 0c1.105 0 2-.818 2-1.828 0-1.01-.895-1.83-2-1.83h-16c-1.105 0-2 .82-2 1.83 0 1.01.895 1.83 2 1.83h16zm17 24.693c0 1.01.895 1.83 2 1.83s2-.82 2-1.83V28.35c0-1.01-.895-1.83-2-1.83s-2 .82-2 1.83v14.633zm-202 0c0 1.01.895 1.83 2 1.83s2-.82 2-1.83V28.35c0-1.01-.895-1.83-2-1.83s-2 .82-2 1.83v14.633zm202 32.923c0 1.01.895 1.83 2 1.83s2-.82 2-1.83V61.274c0-1.01-.895-1.83-2-1.83s-2 .82-2 1.83v14.632zm-202 0c0 1.01.895 1.83 2 1.83s2-.82 2-1.83V61.274c0-1.01-.895-1.83-2-1.83s-2 .82-2 1.83v14.632zm202 32.923c0 1.01.895 1.828 2 1.828s2-.82 2-1.83V94.2c0-1.012-.895-1.83-2-1.83s-2 .818-2 1.83v14.63zm-202 0c0 1.01.895 1.828 2 1.828s2-.82 2-1.83V94.2c0-1.012-.895-1.83-2-1.83s-2 .818-2 1.83v14.63zm202 32.922c0 1.01.895 1.83 2 1.83s2-.82 2-1.83V127.12c0-1.01-.895-1.83-2-1.83s-2 .82-2 1.83v14.632zm-202 0c0 1.01.895 1.83 2 1.83s2-.82 2-1.83V127.12c0-1.01-.895-1.83-2-1.83s-2 .82-2 1.83v14.632zm179.023 19.555c-.988.452-1.388 1.55-.894 2.454.493.904 1.694 1.27 2.682.82l14.31-6.545c.99-.452 1.39-1.55.896-2.454-.494-.902-1.696-1.27-2.684-.817l-14.31 6.544zm-32.2 14.723c-.987.452-1.388 1.55-.894 2.454.493.904 1.695 1.27 2.683.818l14.31-6.544c.99-.45 1.39-1.55.895-2.454-.494-.903-1.695-1.27-2.683-.818l-14.31 6.544zm-32.2 14.724c-.987.45-1.387 1.55-.893 2.454.494.903 1.695 1.27 2.683.818l14.31-6.544c.99-.452 1.39-1.55.896-2.454-.495-.904-1.697-1.27-2.685-.818l-14.31 6.544zm-23.67-2.023l-12.186-5.57c-.987-.452-2.19-.086-2.683.817-.494.904-.093 2.003.895 2.454l12.185 5.573c.754.345 1.57.645 2.438.898 1.052.307 2.177-.224 2.513-1.187.335-.962-.246-1.99-1.298-2.298-.677-.197-1.302-.426-1.864-.684zM62.57 168.437c-.988-.452-2.19-.086-2.683.818-.494.903-.094 2.002.894 2.454l14.31 6.544c.988.45 2.19.085 2.683-.818.494-.904.094-2.003-.894-2.454l-14.312-6.544zm-32.2-14.723c-.988-.452-2.19-.086-2.683.818-.494.904-.093 2.003.895 2.454l14.31 6.544c.988.452 2.19.086 2.684-.818.494-.903.093-2.002-.895-2.454l-14.312-6.543z"
fill=
"#EEE"
/></g><g><path
d=
"M104 18c0-9.94 8.06-18 18-18s18 8.06 18 18-8.06 18-18 18-18-8.06-18-18z"
fill=
"#FADFD9"
/><path
d=
"M136.143 18c0-7.81-6.332-14.143-14.143-14.143-7.81 0-14.143 6.332-14.143 14.143 0 7.81 6.332 14.143 14.143 14.143 7.81 0 14.143-6.332 14.143-14.143z"
fill=
"#FFF"
/><path
d=
"M119.43 8.994c0-.707.57-1.28 1.283-1.28h2.574c.71 0 1.284.57 1.284 1.28v10.298c0 .706-.57 1.28-1.283 1.28h-2.574c-.71 0-1.284-.57-1.284-1.28V8.994zm0 15.433c0-.71.57-1.284 1.283-1.284h2.574c.71 0 1.284.57 1.284 1.284V27c0 .71-.57 1.286-1.283 1.286h-2.574c-.71 0-1.284-.57-1.284-1.285v-2.573z"
fill=
"#E75E40"
/></g><g><path
d=
"M213 89c0-9.94 8.06-18 18-18s18 8.06 18 18-8.06 18-18 18-18-8.06-18-18z"
fill=
"#F6D4DC"
/><path
d=
"M245.143 89c0-7.81-6.332-14.143-14.143-14.143-7.81 0-14.143 6.332-14.143 14.143 0 7.81 6.332 14.143 14.143 14.143 7.81 0 14.143-6.332 14.143-14.143z"
fill=
"#FFF"
/><path
d=
"M231 86.348l-3.603-3.602c-.288-.29-.766-.286-1.063.01l-1.578 1.578c-.3.302-.3.773-.01 1.063L228.348 89l-3.602 3.603c-.29.288-.286.766.01 1.063l1.578 1.578c.302.3.773.3 1.063.01L231 91.652l3.603 3.602c.288.29.766.286 1.063-.01l1.578-1.578c.3-.302.3-.773.01-1.063L233.652 89l3.602-3.603c.29-.288.286-.766-.01-1.063l-1.578-1.578c-.302-.3-.773-.3-1.063-.01L231 86.348z"
fill=
"#D22852"
/></g></g></svg>
\ No newline at end of file
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