diff options
Diffstat (limited to 'app/views/clusters')
7 files changed, 20 insertions, 27 deletions
diff --git a/app/views/clusters/clusters/_advanced_settings_tab.html.haml b/app/views/clusters/clusters/_advanced_settings_tab.html.haml index b491a64e43d..8c9d98604dd 100644 --- a/app/views/clusters/clusters/_advanced_settings_tab.html.haml +++ b/app/views/clusters/clusters/_advanced_settings_tab.html.haml @@ -1,6 +1,5 @@ - active = params[:tab] == 'settings' - if can_admin_cluster?(current_user, @cluster) - %li.nav-item{ role: 'presentation' } - %a#cluster-settings-tab.nav-link{ class: active_when(active), href: clusterable.cluster_path(@cluster.id, params: {tab: 'settings'}) } - %span= _('Advanced Settings') + = gl_tab_link_to clusterable.cluster_path(@cluster.id, params: { tab: 'settings' }), { item_active: active } do + = _('Advanced Settings') diff --git a/app/views/clusters/clusters/_details_tab.html.haml b/app/views/clusters/clusters/_details_tab.html.haml index 564c5103d34..734910686e7 100644 --- a/app/views/clusters/clusters/_details_tab.html.haml +++ b/app/views/clusters/clusters/_details_tab.html.haml @@ -1,5 +1,4 @@ - active = params[:tab] == 'details' || !params[:tab].present? -%li.nav-item{ role: 'presentation' } - %a#cluster-details-tab.nav-link.qa-details{ class: active_when(active), href: clusterable.cluster_path(@cluster.id, params: {tab: 'details'}) } - %span= _('Details') += gl_tab_link_to clusterable.cluster_path(@cluster.id, params: { tab: 'details' }), { item_active: active } do + = _('Details') diff --git a/app/views/clusters/clusters/_health_tab.html.haml b/app/views/clusters/clusters/_health_tab.html.haml index fda392693f6..4292066cc6f 100644 --- a/app/views/clusters/clusters/_health_tab.html.haml +++ b/app/views/clusters/clusters/_health_tab.html.haml @@ -1,5 +1,4 @@ - active = params[:tab] == 'health' -%li.nav-item{ role: 'presentation' } - %a#cluster-health-tab.nav-link.qa-health{ class: active_when(active), href: clusterable.cluster_path(@cluster.id, params: {tab: 'health'}) } - %span= _('Health') += gl_tab_link_to clusterable.cluster_path(@cluster.id, params: { tab: 'health' }), { item_active: active, data: { testid: 'cluster-health-tab' } } do + = _('Health') diff --git a/app/views/clusters/clusters/_integrations_tab.html.haml b/app/views/clusters/clusters/_integrations_tab.html.haml index 77b8b6ca3e6..e229c1fbe1e 100644 --- a/app/views/clusters/clusters/_integrations_tab.html.haml +++ b/app/views/clusters/clusters/_integrations_tab.html.haml @@ -1,6 +1,4 @@ -- tab_name = 'integrations' -- active = params[:tab] == tab_name +- active = params[:tab] == 'integrations' -%li.nav-item{ role: 'presentation' } - %a#cluster-apps-tab.nav-link{ class: active_when(active), href: clusterable.cluster_path(@cluster.id, params: {tab: tab_name}) } - %span= _('Integrations') += gl_tab_link_to clusterable.cluster_path(@cluster.id, params: { tab: 'integrations' }), { item_active: active } do + = _('Integrations') diff --git a/app/views/clusters/clusters/_namespace.html.haml b/app/views/clusters/clusters/_namespace.html.haml index 9b728e7a89b..6412972e195 100644 --- a/app/views/clusters/clusters/_namespace.html.haml +++ b/app/views/clusters/clusters/_namespace.html.haml @@ -1,7 +1,6 @@ - managed_namespace_help_text = s_('ClusterIntegration|Set a prefix for your namespaces. If not set, defaults to your project path. If modified, existing environments will use their current namespaces until the cluster cache is cleared.') - non_managed_namespace_help_text = s_('ClusterIntegration|The namespace associated with your project. This will be used for deploy boards, logs, and Web terminals.') -- managed_namespace_help_link = link_to _('More information'), help_page_path('user/project/clusters/index.md', - anchor: 'gitlab-managed-clusters'), target: '_blank' +- managed_namespace_help_link = link_to _('More information'), help_page_path('user/project/clusters/gitlab_managed_clusters.md'), target: '_blank' .js-namespace-prefixed = platform_field.text_field :namespace, diff --git a/app/views/clusters/clusters/aws/_new.html.haml b/app/views/clusters/clusters/aws/_new.html.haml index 93db7db06b3..f6d50410e9a 100644 --- a/app/views/clusters/clusters/aws/_new.html.haml +++ b/app/views/clusters/clusters/aws/_new.html.haml @@ -12,6 +12,6 @@ 'role-arn' => @aws_role.role_arn, 'instance-types' => @instance_types, 'kubernetes-integration-help-path' => help_page_path('user/project/clusters/index'), - 'account-and-external-ids-help-path' => help_page_path('user/project/clusters/add_eks_clusters.md', anchor: 'create-a-new-certificate-based-eks-cluster'), - 'create-role-arn-help-path' => help_page_path('user/project/clusters/add_eks_clusters.md', anchor: 'create-a-new-certificate-based-eks-cluster'), + 'account-and-external-ids-help-path' => help_page_path('user/project/clusters/add_eks_clusters.md', anchor: 'how-to-create-a-new-cluster-on-eks-through-cluster-certificates-deprecated'), + 'create-role-arn-help-path' => help_page_path('user/project/clusters/add_eks_clusters.md', anchor: 'how-to-create-a-new-cluster-on-eks-through-cluster-certificates-deprecated'), 'external-link-icon' => sprite_icon('external-link') } } diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 0a482f1eb01..2a09d8d8cc0 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -15,7 +15,7 @@ provider_type: @cluster.provider_type, help_path: help_page_path('user/project/clusters/index.md'), environments_help_path: help_page_path('ci/environments/index.md', anchor: 'create-a-static-environment'), - clusters_help_path: help_page_path('user/project/clusters/index.md', anchor: 'deploying-to-a-kubernetes-cluster'), + clusters_help_path: help_page_path('user/project/clusters/deploy_to_cluster.md'), deploy_boards_help_path: help_page_path('user/project/deploy_boards.md', anchor: 'enabling-deploy-boards'), cluster_id: @cluster.id } } @@ -24,11 +24,10 @@ .js-serverless-survey-banner{ data: { user_name: current_user.name, user_email: current_user.email } } - .d-flex.my-3 - %p.badge.badge-light.p-2.mr-2 + %h4.gl-my-5 + = @cluster.name + %span.badge.badge-info.badge-pill.gl-badge.md.gl-vertical-align-middle = cluster_type_label(@cluster.cluster_type) - %h4.m-0 - = @cluster.name = render 'banner' @@ -42,12 +41,12 @@ - if cluster_created?(@cluster) .js-toggle-container - %ul.nav-links.mobile-separator.nav.nav-tabs{ role: 'tablist' } - = render 'details_tab' + = gl_tabs_nav do + = render 'clusters/clusters/details_tab' = render_if_exists 'clusters/clusters/environments_tab' = render 'clusters/clusters/health_tab' - = render 'integrations_tab' - = render 'advanced_settings_tab' + = render 'clusters/clusters/integrations_tab' + = render 'clusters/clusters/advanced_settings_tab' .tab-content.py-3 .tab-pane.active{ role: 'tabpanel' } |