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
b5a718d1
Commit
b5a718d1
authored
Jun 21, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated blank state for environments and deployments
Closes #18661
parent
a8957458
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
9 deletions
+43
-9
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+1
-0
app/assets/stylesheets/framework/blank.scss
app/assets/stylesheets/framework/blank.scss
+23
-0
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+7
-4
app/views/projects/environments/new.html.haml
app/views/projects/environments/new.html.haml
+4
-1
app/views/projects/environments/show.html.haml
app/views/projects/environments/show.html.haml
+8
-4
No files found.
app/assets/stylesheets/framework.scss
View file @
b5a718d1
...
...
@@ -37,3 +37,4 @@
@import
"framework/timeline.scss"
;
@import
"framework/typography.scss"
;
@import
"framework/zen.scss"
;
@import
"framework/blank"
;
app/assets/stylesheets/framework/blank.scss
0 → 100644
View file @
b5a718d1
.blank-state
{
padding-top
:
20px
;
padding-bottom
:
20px
;
text-align
:
center
;
}
.blank-state-no-icon
{
padding-top
:
40px
;
padding-bottom
:
40px
;
}
.blank-state-title
{
margin-top
:
0
;
margin-bottom
:
5px
;
font-size
:
19px
;
font-weight
:
normal
;
}
.blank-state-text
{
margin-top
:
0
;
margin-bottom
:
$gl-padding
;
font-size
:
15px
;
}
app/views/projects/environments/index.html.haml
View file @
b5a718d1
...
...
@@ -3,16 +3,19 @@
=
render
"projects/pipelines/head"
%div
{
class:
(
container_class
)
}
-
if
can?
(
current_user
,
:create_environment
,
@project
)
-
if
can?
(
current_user
,
:create_environment
,
@project
)
&&
!
@environments
.
blank?
.top-area
.nav-controls
=
link_to
new_namespace_project_environment_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
New environment
-
if
@environments
.
blank?
%ul
.content-list.environments
%li
.nothing-here-block
No environments to show
.blank-state.blank-state-no-icon
%h2
.blank-state-title
You don't have any environments right now.
%p
.blank-state-text
Environments are places where code gets deployed, such as staging or production.
=
link_to
"Read more"
,
help_page_path
(
"ci"
,
"environments"
),
class:
"btn btn-success"
-
else
.table-holder
%table
.table.environments
...
...
app/views/projects/environments/new.html.haml
View file @
b5a718d1
...
...
@@ -4,6 +4,9 @@
.col-lg-3
%h4
.prepend-top-0
New Environment
%p
Environments allow you to track deployments of your application
%p
Environments allow you to track deployments of your application
=
succeed
"."
do
=
link_to
"Read more about environments"
,
help_page_path
(
"ci"
,
"environments"
)
=
render
'form'
app/views/projects/environments/show.html.haml
View file @
b5a718d1
...
...
@@ -13,10 +13,14 @@
=
link_to
'Destroy'
,
namespace_project_environment_path
(
@project
.
namespace
,
@project
,
@environment
),
data:
{
confirm:
'Are you sure you want to delete this environment?'
},
class:
'btn btn-danger'
,
method: :delete
-
if
@deployments
.
blank?
%ul
.content-list.environments
%li
.nothing-here-block
No deployments for
%strong
=
@environment
.
name
.blank-state.blank-state-no-icon
%h2
.blank-state-title
You don't have any deployments right now.
%p
.blank-state-text
Define environments in the deploy stage(s) in
%code
.gitlab-ci.yml
to track deployments here.
=
link_to
"Read more"
,
help_page_path
(
"ci"
,
"environments"
),
class:
"btn btn-success"
-
else
.table-holder
%table
.table.environments
...
...
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