diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 15:27:58 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 15:27:58 +0000 |
| commit | 3a74ab29188bb692566a769363a37b781abf2867 (patch) | |
| tree | b110ddbd181f6368f3690ef496fa6cfd4c15800c /app/views | |
| parent | ac4529f700014671437e46497dcdf630e67aca73 (diff) | |
| parent | c207b9e0512f630b646d9e62f75ca13a188cf83b (diff) | |
| download | gitlab-ce-3a74ab29188bb692566a769363a37b781abf2867.tar.gz | |
Merge branch 'blank-state' into 'master'
Updated blank state for environments and deployments
## What does this MR do?
Adds a designed blank state to environments and deployments.
@markpundsack do we want to hide the new environments when empty? Looks weird otherwise with the green button at the top.
## What are the relevant issue numbers?
Closes #18661
## Screenshots (if relevant)
See merge request !4818
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/environments/index.html.haml | 16 | ||||
| -rw-r--r-- | app/views/projects/environments/new.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/environments/show.html.haml | 12 |
3 files changed, 24 insertions, 9 deletions
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index ae9e77e7d89..a03f117291f 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -3,16 +3,24 @@ = 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. + %br + = succeed "." do + = link_to "Read more about environments", help_page_path("ci", "environments") + - if can?(current_user, :create_environment, @project) + = link_to new_namespace_project_environment_path(@project.namespace, @project), class: 'btn btn-create' do + New environment - else .table-holder %table.table.environments diff --git a/app/views/projects/environments/new.html.haml b/app/views/projects/environments/new.html.haml index 54465828ba9..da325efecd2 100644 --- a/app/views/projects/environments/new.html.haml +++ b/app/views/projects/environments/new.html.haml @@ -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' diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 069b77b5adf..4c15e2759d6 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -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 |