diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-05 21:11:07 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-05 21:11:07 +0000 |
| commit | 7c8e7a8d1f4a65f8b55172c1ee53096b7baac493 (patch) | |
| tree | 920106a1e36f5cbf3573248b3f531f4c7d59d024 /app/views | |
| parent | c07b6b7793dd5414f4763240c462fe7cfe0b27da (diff) | |
| parent | 2fb167fa3bc1aa3d46f4edc551d1b37a9c038cac (diff) | |
| download | gitlab-ce-7c8e7a8d1f4a65f8b55172c1ee53096b7baac493.tar.gz | |
Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'
Add feature highlight blue dot to GKE "Clusters" sidebar item
Closes #41672
See merge request gitlab-org/gitlab-ce!16379
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index abd07d71bcc..e20e58d27e1 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -184,10 +184,34 @@ Environments - if project_nav_tab? :clusters + - show_cluster_hint = show_gke_cluster_integration_callout?(@project) = nav_link(controller: [:clusters, :user, :gcp]) do = link_to project_clusters_path(@project), title: 'Cluster', class: 'shortcuts-cluster' do %span Clusters + - if show_cluster_hint + .feature-highlight.js-feature-highlight{ disabled: true, + data: { trigger: 'manual', + container: 'body', + toggle: 'popover', + placement: 'right', + highlight: UserCalloutsHelper::GKE_CLUSTER_INTEGRATION, + highlight_priority: UserCallout.feature_names[:GKE_CLUSTER_INTEGRATION], + dismiss_endpoint: user_callouts_path } } + - if show_cluster_hint + .feature-highlight-popover-content + = image_tag 'illustrations/cluster_popover.svg', class: 'feature-highlight-illustration' + .feature-highlight-popover-sub-content + %p= _('Allows you to add and manage Kubernetes clusters.') + %p + = _('Protip:') + = link_to 'Auto DevOps', help_page_path('topics/autodevops/index.md') + %span= _('uses clusters to deploy your code!') + %hr + %button.btn.btn-create.btn-xs.dismiss-feature-highlight{ type: 'button' } + %span= _("Got it!") + = sprite_icon('thumb-up') + - if @project.feature_available?(:builds, current_user) && !@project.empty_repo? = nav_link(path: 'pipelines#charts') do |