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
461f1bc7
Commit
461f1bc7
authored
Nov 03, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorganize landing page for new users
parent
a18b06c1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
120 additions
and
94 deletions
+120
-94
app/assets/stylesheets/framework/blank.scss
app/assets/stylesheets/framework/blank.scss
+29
-18
app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
...s/dashboard/projects/_blank_state_admin_welcome.html.haml
+32
-31
app/views/dashboard/projects/_blank_state_welcome.html.haml
app/views/dashboard/projects/_blank_state_welcome.html.haml
+53
-44
app/views/dashboard/projects/_zero_authorized_projects.html.haml
...ws/dashboard/projects/_zero_authorized_projects.html.haml
+1
-1
changelogs/unreleased/3615-improve-welcome-screen.yml
changelogs/unreleased/3615-improve-welcome-screen.yml
+5
-0
No files found.
app/assets/stylesheets/framework/blank.scss
View file @
461f1bc7
...
...
@@ -7,29 +7,43 @@
width
:
100%
;
height
:
100%
;
padding-bottom
:
25px
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
}
}
.blank-state
{
padding-top
:
20px
;
padding-bottom
:
20px
;
.blank-state-welcome
{
text-align
:
center
;
padding
:
20px
0
40px
;
&
.blank-state-welcome
{
.blank-state-welcome-title
{
font-size
:
24px
;
}
.blank-state-welcome-title
{
font-size
:
24px
;
}
.blank-state-text
{
margin-bottom
:
0
;
}
.blank-state-text
{
margin-bottom
:
0
;
}
}
.blank-state-icon
{
padding-bottom
:
20px
;
.blank-state-link
{
display
:
block
;
color
:
$gl-text-color
;
&
:hover
{
background-color
:
$gray-light
;
text-decoration
:
none
;
color
:
$gl-text-color
;
}
}
.blank-state
{
display
:
flex
;
align-items
:
center
;
padding
:
50px
30px
;
margin-bottom
:
30px
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
.blank-state-icon
{
svg
{
display
:
block
;
margin
:
auto
;
...
...
@@ -38,14 +52,11 @@
.blank-state-title
{
margin-top
:
0
;
margin-bottom
:
10px
;
font-size
:
18px
;
}
.blank-state-text
{
max-width
:
$container-text-max-width
;
margin
:
0
auto
$gl-padding
;
font-size
:
14px
;
.blank-state-body
{
padding-left
:
20px
;
}
}
...
...
app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
View file @
461f1bc7
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_user"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Add user
%p
.blank-state-text
Add your team members and others to GitLab.
=
link_to
new_admin_user_path
,
class:
"btn btn-new"
do
New user
.row
.col-md-6
=
link_to
new_admin_user_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_user"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Add user
%p
.blank-state-text
Add your team members and others to GitLab.
.blank-state
.blank-state-icon
=
custom_icon
(
"configure_server"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Configure GitLab
%p
.blank-state-text
Make adjustments to how your GitLab instance is set up.
=
link_to
admin_root_path
,
class:
"btn btn-new"
do
Configure
-
if
current_user
.
can_create_group?
.col-md-6
=
link_to
admin_root_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_group"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Create a group
%p
.blank-state-text
Groups are a great way to organize projects and people.
-
if
current_user
.
can_create_group?
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_group"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Create a group
%p
.blank-state-text
Groups are a great way to organize projects and people.
=
link_to
new_group_path
,
class:
"btn btn-new"
do
New group
.col-md-6
=
link_to
admin_root_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
=
custom_icon
(
"configure_server"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Configure GitLab
%p
.blank-state-text
Make adjustments to how your GitLab instance is set up.
app/views/dashboard/projects/_blank_state_welcome.html.haml
View file @
461f1bc7
-
public_project_count
=
ProjectsFinder
.
new
(
current_user:
current_user
).
execute
.
count
-
if
current_user
.
can_create_group?
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_group"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Create a group for several dependent projects.
%p
.blank-state-text
Groups are the best way to manage projects and members.
=
link_to
new_group_path
,
class:
"btn btn-new"
do
New group
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_project"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Create a project
%p
.blank-state-text
-
if
current_user
.
can_create_project?
You don't have access to any projects right now.
You can create up to
%strong
=
number_with_delimiter
(
current_user
.
projects_limit
)
=
succeed
"."
do
=
"project"
.
pluralize
(
current_user
.
projects_limit
)
-
else
If you are added to a project, it will be displayed here.
.row
.col-md-6
-
if
current_user
.
can_create_project?
=
link_to
new_project_path
,
class:
"btn btn-new"
do
New project
=
link_to
new_project_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_project"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Create a project
%p
.blank-state-text
You don't have access to any projects right now.
You can create up to
%strong
=
number_with_delimiter
(
current_user
.
projects_limit
)
=
succeed
"."
do
=
"project"
.
pluralize
(
current_user
.
projects_limit
)
-
else
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_project"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Create a project
%p
.blank-state-text
If you are added to a project, it will be displayed here.
-
if
current_user
.
can_create_group?
.col-md-6
=
link_to
new_group_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
=
custom_icon
(
"add_new_group"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Create a group for several dependent projects.
%p
.blank-state-text
Groups are the best way to manage projects and members.
.clearfix
-
if
public_project_count
>
0
.blank-state
.blank-state-icon
=
custom_icon
(
"globe"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Explore public projects
%p
.blank-state-text
There are
=
number_with_delimiter
(
public_project_count
)
public projects on this server.
Public projects are an easy way to allow
everyone to have read-only access
.
=
link_to
trending_explore_projects_path
,
class:
"btn btn-new"
do
Browse projects
-
if
public_project_count
>
0
.col-md-6
=
link_to
trending_explore_projects_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
=
custom_icon
(
"globe"
,
size:
50
)
.blank-state-body
%h3
.blank-state-title
Explore public projects
%p
.blank-state-text
There are
=
number_with_delimiter
(
public_project_count
)
public projects on this server
.
Public projects are an easy way to allow
everyone to have read-only access.
app/views/dashboard/projects/_zero_authorized_projects.html.haml
View file @
461f1bc7
...
...
@@ -3,7 +3,7 @@
.row.blank-state-parent-container
{
class:
(
'has-start-trial-container'
if
admin_without_ee_license
)
}
.section-container.section-welcome
{
class:
(
'col-md-6'
if
admin_without_ee_license
)
}
.container.section-body
.blank-state
.blank-state
-welcome
.blank-state-welcome
%h2
.blank-state-welcome-title
Welcome to GitLab
%p
.blank-state-text
...
...
changelogs/unreleased/3615-improve-welcome-screen.yml
0 → 100644
View file @
461f1bc7
---
title
:
Reorganize welcome page for new users
merge_request
:
author
:
type
:
other
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