summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-11-03 06:41:13 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-11-03 06:41:13 -0500
commit8f3a69235ca7bdf9082f05f4fcaefbe7b5c2c598 (patch)
tree853e622cfd25171641d23591926f68b1312c6efc
parentf580e49713c611094029424e779f25bd9807c7cf (diff)
downloadgitlab-ce-39771-fix-clusters-settings-expanded-options.tar.gz
Fix clusters description text collapsing away on page-load39771-fix-clusters-settings-expanded-options
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39771 Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13363
-rw-r--r--app/views/projects/clusters/show.html.haml12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index b127e06030e..dbe6f8beb95 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -10,9 +10,9 @@
cluster_status: @cluster.status_name,
cluster_status_reason: @cluster.status_reason } }
- %section.settings
+ %section.settings.no-animate.expanded
%h4= s_('ClusterIntegration|Enable cluster integration')
- .settings-content.expanded
+ .settings-content
.hidden.js-cluster-error.alert.alert-danger.alert-block.append-bottom-10{ role: 'alert' }
= s_('ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine')
@@ -49,14 +49,14 @@
.form-group
= field.submit _('Save'), class: 'btn btn-success'
- %section.settings#js-cluster-details
+ %section.settings.no-animate#js-cluster-details{ class: ('expanded' if expanded) }
.settings-header
%h4= s_('ClusterIntegration|Cluster details')
%button.btn.js-settings-toggle
= expanded ? 'Collapse' : 'Expand'
%p= s_('ClusterIntegration|See and edit the details for your cluster')
- .settings-content.no-animate{ class: ('expanded' if expanded) }
+ .settings-content
.form_group.append-bottom-20
%label.append-bottom-10{ for: 'cluter-name' }
@@ -66,11 +66,11 @@
%span.input-group-addon.clipboard-addon
= clipboard_button(text: @cluster.gcp_cluster_name, title: s_('ClusterIntegration|Copy cluster name'))
- %section.settings#js-cluster-advanced-settings
+ %section.settings.no-animate#js-cluster-advanced-settings{ class: ('expanded' if expanded) }
.settings-header
%h4= _('Advanced settings')
%button.btn.js-settings-toggle
= expanded ? 'Collapse' : 'Expand'
%p= s_('ClusterIntegration|Manage Cluster integration on your GitLab project')
- .settings-content.no-animate{ class: ('expanded' if expanded) }
+ .settings-content
= render 'advanced_settings'