diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-12-06 14:55:41 -0600 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-12-17 09:50:53 +1300 |
| commit | aa86223a4a24396a23db00ba88e3950dc77b8410 (patch) | |
| tree | 58f5b88f04ae253d0413e96e01bef51252b00848 /app/views/clusters | |
| parent | 9dc67bf10cf9a00825a1895c2dc37b6df91c7246 (diff) | |
| download | gitlab-ce-aa86223a4a24396a23db00ba88e3950dc77b8410.tar.gz | |
Cleans cluster views a bit
- Moves logic into ClustersHelp
- Add CSS to ensure compatibility with EE view.
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/_buttons.html.haml | 2 | ||||
| -rw-r--r-- | app/views/clusters/clusters/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/clusters/clusters/_buttons.html.haml b/app/views/clusters/clusters/_buttons.html.haml index 9daf5a95e79..9238903aa10 100644 --- a/app/views/clusters/clusters/_buttons.html.haml +++ b/app/views/clusters/clusters/_buttons.html.haml @@ -1,7 +1,7 @@ -# This partial is overridden in EE .nav-controls - if clusterable.can_create_cluster? && clusterable.clusters.empty? - = link_to s_('ClusterIntegration|Add Kubernetes cluster'), clusterable.new_path, class: 'btn btn-success' + = link_to s_('ClusterIntegration|Add Kubernetes cluster'), clusterable.new_path, class: 'btn btn-success js-add-cluster' - else %span.btn.btn-add-cluster.disabled.js-add-cluster = s_("ClusterIntegration|Add Kubernetes cluster") diff --git a/app/views/clusters/clusters/index.html.haml b/app/views/clusters/clusters/index.html.haml index 219f71f7751..94565e53e06 100644 --- a/app/views/clusters/clusters/index.html.haml +++ b/app/views/clusters/clusters/index.html.haml @@ -12,7 +12,7 @@ = s_("ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project") = render 'clusters/clusters/buttons' - - if @clusters.length > clusterable.clusters.length + - if display_clusters_callout?(@clusters, clusterable) .bs-callout.bs-callout-info = s_("ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters.") %strong |