From b5a718d1d793dd0dde38d598b5594d40873874cd Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 21 Jun 2016 09:54:15 +0100 Subject: Updated blank state for environments and deployments Closes #18661 --- app/assets/stylesheets/framework.scss | 1 + app/assets/stylesheets/framework/blank.scss | 23 +++++++++++++++++++++++ app/views/projects/environments/index.html.haml | 11 +++++++---- app/views/projects/environments/new.html.haml | 5 ++++- app/views/projects/environments/show.html.haml | 12 ++++++++---- 5 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 app/assets/stylesheets/framework/blank.scss diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 3cbddc59f11..a306b8f3f29 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -37,3 +37,4 @@ @import "framework/timeline.scss"; @import "framework/typography.scss"; @import "framework/zen.scss"; +@import "framework/blank"; diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss new file mode 100644 index 00000000000..40b5171a8c6 --- /dev/null +++ b/app/assets/stylesheets/framework/blank.scss @@ -0,0 +1,23 @@ +.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; +} diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index ae9e77e7d89..bfd8a11ce93 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -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 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 -- cgit v1.2.1 From 85a5e42576fdbdef804dcab9b4ed2ad1d2bda23e Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 21 Jun 2016 11:12:28 +0100 Subject: Moved new environment link to below blank state text --- app/views/projects/environments/index.html.haml | 6 +++++- spec/features/environments_spec.rb | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index bfd8a11ce93..89b0e1b39e0 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -15,7 +15,11 @@ 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" + %br + = succeed "." do + = link_to "Read more about environments", help_page_path("ci", "environments") + = 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/spec/features/environments_spec.rb b/spec/features/environments_spec.rb index 40fea5211e9..f9e066ade54 100644 --- a/spec/features/environments_spec.rb +++ b/spec/features/environments_spec.rb @@ -20,7 +20,7 @@ feature 'Environments', feature: true do context 'without environments' do scenario 'does show no environments' do - expect(page).to have_content('No environments to show') + expect(page).to have_content('You don\'t have any environments right now.') end end @@ -33,7 +33,7 @@ feature 'Environments', feature: true do context 'without deployments' do scenario 'does show no deployments' do - expect(page).to have_content('No deployments yet') + expect(page).to have_content('You don\'t have any deployments right now.') end end @@ -61,7 +61,7 @@ feature 'Environments', feature: true do context 'without deployments' do scenario 'does show no deployments' do - expect(page).to have_content('No deployments for') + expect(page).to have_content('You don\'t have any deployments right now.') end end -- cgit v1.2.1 From c207b9e0512f630b646d9e62f75ca13a188cf83b Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 21 Jun 2016 11:52:51 +0100 Subject: Tests update --- app/views/projects/environments/index.html.haml | 5 +++-- spec/features/environments_spec.rb | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 89b0e1b39e0..a03f117291f 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -18,8 +18,9 @@ %br = succeed "." do = link_to "Read more about environments", help_page_path("ci", "environments") - = link_to new_namespace_project_environment_path(@project.namespace, @project), class: 'btn btn-create' do - New environment + - 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/spec/features/environments_spec.rb b/spec/features/environments_spec.rb index f9e066ade54..7fb28f4174b 100644 --- a/spec/features/environments_spec.rb +++ b/spec/features/environments_spec.rb @@ -33,7 +33,7 @@ feature 'Environments', feature: true do context 'without deployments' do scenario 'does show no deployments' do - expect(page).to have_content('You don\'t have any deployments right now.') + expect(page).to have_content('No deployments yet') end end @@ -108,7 +108,7 @@ feature 'Environments', feature: true do end scenario 'does create a new pipeline' do - expect(page).to have_content('production') + expect(page).to have_content('Production') end end -- cgit v1.2.1