configure and style ngToast

corneadoug · corneadoug · commit 3ece1ebe51f6 · 2015-09-01T16:28:42.000+09:00
diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js
@@ -40,7 +40,7 @@ angular.module('zeppelinWebApp', [
       }
     };
   })
-  .config(function ($routeProvider) {
+  .config(function ($routeProvider, ngToastProvider) {
     $routeProvider
       .when('/', {
         templateUrl: 'app/home/home.html',
@@ -61,4 +61,10 @@ angular.module('zeppelinWebApp', [
       .otherwise({
         redirectTo: '/'
       });
+  
+    ngToastProvider.configure({
+      dismissButton: true,
+      dismissOnClick: false,
+      timeout: 6000
+    });
   });
diff --git a/zeppelin-web/src/app/home/home.css b/zeppelin-web/src/app/home/home.css
@@ -285,6 +285,28 @@ kbd {
   min-height: 400px;
 }
 
+/* ngToast style */
+
+.ng-toast .alert {
+  color: white !important;
+  border: none !important;
+}
+
+.ng-toast .alert-danger {
+  background-color: #A94442 !important;
+}
+
+.ng-toast .alert-warning {
+  background-color: #CE9532 !important;
+}
+
+.ng-toast .alert-info {
+  background-color: #589EC1 !important;
+}
+
+.ng-toast .alert-success {
+  background-color: #428443 !important;
+}
 
 /*
 temporary fix for bootstrap issue (https://github.com/twbs/bootstrap/issues/5865)
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
@@ -42,7 +42,6 @@
     <link rel="stylesheet" href="bower_components/ng-sortable/dist/ng-sortable.css" />
     <link rel="stylesheet" href="bower_components/angular-xeditable/dist/css/xeditable.css" />
     <link rel="stylesheet" href="bower_components/highlightjs/styles/github.css" />
-    <link rel="stylesheet" href="bower_components/angular-ui-notification/dist/angular-ui-notification.min.css" />
     <link rel="stylesheet" href="bower_components/ngtoast/dist/ngToast.css" />
     <!-- endbower -->
     <link rel="stylesheet" href="bower_components/jquery-ui/themes/base/all.css" />
@@ -115,7 +114,6 @@
     <script src="bower_components/highlightjs/highlight.pack.js"></script>
     <script src="bower_components/lodash/lodash.js"></script>
     <script src="bower_components/angular-filter/dist/angular-filter.min.js"></script>
-    <script src="bower_components/angular-ui-notification/dist/angular-ui-notification.min.js"></script>
     <script src="bower_components/ngtoast/dist/ngToast.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
diff --git a/zeppelin-web/test/karma.conf.js b/zeppelin-web/test/karma.conf.js
@@ -53,6 +53,7 @@ module.exports = function(config) {
       'bower_components/highlightjs/highlight.pack.js',
       'bower_components/lodash/lodash.js',
       'bower_components/angular-filter/dist/angular-filter.min.js',
+      'bower_components/ngtoast/dist/ngToast.js',
       'bower_components/angular-mocks/angular-mocks.js',
       // endbower
       'src/app/app.js',
