Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-11-07 15:28:02 +0300
committerEric Eastwood <contact@ericeastwood.com>2017-11-07 15:28:02 +0300
commit1bd1d462dab33997c19432b00c867070fb6b1214 (patch)
tree7869e45fba576ac95b4cae98bce36eb642cf1aa2 /app
parent0c27de5f45aa1dc9841d10d348292324546685f2 (diff)
Use flash for dismissable alerts
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/clusters/clusters_bundle.js6
-rw-r--r--app/views/projects/clusters/show.html.haml3
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index c486208175f..5f421ea58ba 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -163,12 +163,10 @@ export default class Clusters {
.map(appId => newApplicationMap[appId].title);
if (appTitles.length > 0) {
- this.successApplicationContainer.textContent = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your cluster'), {
+ const text = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your cluster'), {
appList: appTitles.join(', '),
});
- this.successApplicationContainer.classList.remove('hidden');
- } else {
- this.successApplicationContainer.classList.add('hidden');
+ Flash(text, 'notice', this.successApplicationContainer);
}
}
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index f116c4f7dba..be6784058ae 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -13,7 +13,8 @@
help_path: help_page_path('user/project/clusters/index.md', anchor: 'installing-applications') } }
- .hidden.js-cluster-application-notice.alert.alert-info.alert-block.append-bottom-10{ role: 'alert' }
+ .js-cluster-application-notice
+ .flash-container
%section.settings.no-animate.expanded
%h4= s_('ClusterIntegration|Enable cluster integration')