diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-09-22 11:39:47 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-22 11:39:47 +0300 |
commit | 55f772bb98a67ad346442a2cacb5646f6719b987 (patch) | |
tree | fdcda42d5ee9c746b5654a50fa88a0fd1464d3a8 /app/views/projects | |
parent | d103e95513704314a38ab8ae441851524031c4a1 (diff) |
Resolve "Better SVG Usage in the Frontend"
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/commit/_pipelines_list.haml | 2 | ||||
-rw-r--r-- | app/views/projects/environments/metrics.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/pipelines/index.html.haml | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/commit/_pipelines_list.haml b/app/views/projects/commit/_pipelines_list.haml index bef96786b73..49b0b314e1d 100644 --- a/app/views/projects/commit/_pipelines_list.haml +++ b/app/views/projects/commit/_pipelines_list.haml @@ -3,6 +3,8 @@ endpoint: endpoint, "help-page-path" => help_page_path('ci/quick_start/README'), "help-auto-devops-path" => help_page_path('topics/autodevops/index.md'), + "empty-state-svg-path" => image_path('illustrations/pipelines_empty.svg'), + "error-state-svg-path" => image_path('illustrations/pipelines_failed.svg'), } } - content_for :page_specific_javascripts do diff --git a/app/views/projects/environments/metrics.html.haml b/app/views/projects/environments/metrics.html.haml index e9e1ad9ef30..4a65b46f029 100644 --- a/app/views/projects/environments/metrics.html.haml +++ b/app/views/projects/environments/metrics.html.haml @@ -16,6 +16,9 @@ #prometheus-graphs{ data: { "settings-path": edit_project_service_path(@project, 'prometheus'), "documentation-path": help_page_path('administration/monitoring/prometheus/index.md'), + "empty-getting-started-svg-path": image_path('illustrations/monitoring/getting_started'), + "empty-loading-svg-path": image_path('illustrations/monitoring/loading'), + "empty-unable-to-connect-svg-path": image_path('illustrations/monitoring/unable_to_connect'), "additional-metrics": additional_metrics_project_environment_path(@project, @environment, format: :json), "has-metrics": "#{@environment.has_metrics?}", deployment_endpoint: project_environment_deployments_path(@project, @environment, format: :json) } } diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml index 9fc15d20f34..4f53efcf791 100644 --- a/app/views/projects/pipelines/index.html.haml +++ b/app/views/projects/pipelines/index.html.haml @@ -5,10 +5,11 @@ %div{ 'class' => container_class } - if show_auto_devops_callout?(@project) = render 'shared/auto_devops_callout' - #pipelines-list-vue{ data: { endpoint: project_pipelines_path(@project, format: :json), "help-page-path" => help_page_path('ci/quick_start/README'), "help-auto-devops-path" => help_page_path('topics/autodevops/index.md'), + "empty-state-svg-path" => image_path('illustrations/pipelines_empty.svg'), + "error-state-svg-path" => image_path('illustrations/pipelines_failed.svg'), "new-pipeline-path" => new_project_pipeline_path(@project), "can-create-pipeline" => can?(current_user, :create_pipeline, @project).to_s, "all-path" => project_pipelines_path(@project), @@ -17,7 +18,7 @@ "finished-path" => project_pipelines_path(@project, scope: :finished), "branches-path" => project_pipelines_path(@project, scope: :branches), "tags-path" => project_pipelines_path(@project, scope: :tags), - "has-ci" => @project.has_ci?, + "has-ci" => @repository.gitlab_ci_yml, "ci-lint-path" => ci_lint_path } } = page_specific_javascript_bundle_tag('common_vue') |