Commit 10f205f8 authored by Filipa Lacerda's avatar Filipa Lacerda Committed by Kamil Trzcinski

Changes after UX review

parent e25a8e12
...@@ -12,3 +12,5 @@ ...@@ -12,3 +12,5 @@
.clusters-dropdown-menu { .clusters-dropdown-menu {
max-width: 100%; max-width: 100%;
} }
@include new-style-dropdown('.clusters-dropdown ');
- if can?(current_user, :admin_cluster, @cluster) - if can?(current_user, :admin_cluster, @cluster)
.append-bottom-20 - if @cluster.managed?
%label.append-bottom-10 .append-bottom-20
= s_('ClusterIntegration|Google Container Engine') %label.append-bottom-10
%p = s_('ClusterIntegration|Google Container Engine')
- link_gke = link_to(s_('ClusterIntegration|Google Container Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer') %p
= s_('ClusterIntegration|Manage your cluster by visiting %{link_gke}').html_safe % { link_gke: link_gke } - link_gke = link_to(s_('ClusterIntegration|Google Container Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer')
= s_('ClusterIntegration|Manage your cluster by visiting %{link_gke}').html_safe % { link_gke: link_gke }
.well.form-group .well.form-group
%label.text-danger %label.text-danger
......
%h4.prepend-top-0= s_('ClusterIntegration|Choose how to set up cluster integration') %h4.prepend-top-0= s_('ClusterIntegration|Choose how to set up cluster integration')
.dropdown .dropdown.clusters-dropdown
%button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', data: { toggle: 'dropdown' }, 'aria-haspopup': true, 'aria-expanded': false } %button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', data: { toggle: 'dropdown' }, 'aria-haspopup': true, 'aria-expanded': false }
%span.dropdown-toggle-text %span.dropdown-toggle-text
= dropdown_text = dropdown_text
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
.form-group .form-group
= platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)') = platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)')
= platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace'), readonly: true = platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace')
.form-group .form-group
= field.submit s_('ClusterIntegration|Save changes'), class: 'btn btn-save' = field.submit s_('ClusterIntegration|Save changes'), class: 'btn btn-save'
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%label.append-bottom-10{ for: 'cluster-name' } %label.append-bottom-10{ for: 'cluster-name' }
= s_('ClusterIntegration|Cluster name') = s_('ClusterIntegration|Cluster name')
.input-group .input-group
%input.form-control.cluster-name{ value: @cluster.name, readonly: true } %input.form-control.cluster-name{ value: @cluster.name }
%span.input-group-addon.clipboard-addon %span.input-group-addon.clipboard-addon
= clipboard_button(text: @cluster.name, title: s_('ClusterIntegration|Copy cluster name')) = clipboard_button(text: @cluster.name, title: s_('ClusterIntegration|Copy cluster name'))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment