Skip to content

ZEPPELIN-269 : Adding Notifications Service for Zeppelin #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Madhuka wants to merge 6 commits into from
Closed

ZEPPELIN-269 : Adding Notifications Service for Zeppelin #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0baf57
Adding Error Msg and Notifications feature
Madhuka Aug 28, 2015
9b131f2
using bower to update
Madhuka Aug 28, 2015
35d7469
fixing hover, delay time and cleaning error msg
Madhuka Sep 1, 2015
460d364
Remove angular-ui-notification for ngToast
corneadoug Sep 1, 2015
3ece1eb
configure and style ngToast
corneadoug Sep 1, 2015
6d5cf4d
Merge pull request #1 from corneadoug/change/errorMsgDirective
Madhuka Sep 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion zeppelin-web/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"angular-xeditable": "0.1.8",
"highlightjs": "~8.4.0",
"lodash": "~3.9.3",
"angular-filter": "~0.5.4"
"angular-filter": "~0.5.4",
"ngtoast": "~1.5.5"
},
"devDependencies": {
"angular-mocks": "1.3.8"
Expand Down
11 changes: 9 additions & 2 deletions zeppelin-web/src/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ angular.module('zeppelinWebApp', [
'angular.filter',
'monospaced.elastic',
'puElasticInput',
'xeditable'
'xeditable',
'ngToast'
])
.filter('breakFilter', function() {
return function (text) {
Expand All @@ -39,7 +40,7 @@ angular.module('zeppelinWebApp', [
}
};
})
.config(function ($routeProvider) {
.config(function ($routeProvider, ngToastProvider) {
$routeProvider
.when('/', {
templateUrl: 'app/home/home.html',
Expand All @@ -60,4 +61,10 @@ angular.module('zeppelinWebApp', [
.otherwise({
redirectTo: '/'
});

ngToastProvider.configure({
dismissButton: true,
dismissOnClick: false,
timeout: 6000
});
});
22 changes: 22 additions & 0 deletions zeppelin-web/src/app/home/home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-web/src/assets/styles/looknfeel/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ body {
.executionTime,
.nv-controlsWrap {
display:block;
}
}
3 changes: 3 additions & 0 deletions zeppelin-web/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<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/ngtoast/dist/ngToast.css" />
<!-- endbower -->
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/all.css" />
<!-- endbuild -->
Expand All @@ -60,6 +61,7 @@
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<toast></toast>
<div ng-include src="'components/navbar/navbar.html'"></div>
<!-- Add your site or application content here -->
<div id="main" class="container">
Expand Down Expand Up @@ -112,6 +114,7 @@
<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/ngtoast/dist/ngToast.js"></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js({.tmp,src}) scripts/scripts.js -->
Expand Down
1 change: 1 addition & 0 deletions zeppelin-web/test/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down