Skip to content

add notification #224

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
vgmartinez wants to merge 1 commit into from
Closed

add notification #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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",
"angular-ui-notification": "0.0.11"
},
"devDependencies": {
"angular-mocks": "1.3.8"
Expand Down
3 changes: 2 additions & 1 deletion 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',
'ui-notification',
])
.filter('breakFilter', function() {
return function (text) {
Expand Down
13 changes: 13 additions & 0 deletions zeppelin-web/src/app/notebook/notebook.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,19 @@
font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
}

.ui-notification{
position:fixed;
z-index:9999;
width:100px;
cursor:pointer;
-webkit-transition:all ease .5s;
-o-transition:all ease .5s;
transition:all ease .5s;
color:#fff;
background:#337ab7;
box-shadow:5px 5px 10px rgba(0,0,0,.3)
}

.ace_marker-layer .ace_selection {
z-index: 0 !important;
}
Expand Down
4 changes: 2 additions & 2 deletions zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

angular.module('zeppelinWebApp')
.controller('ParagraphCtrl', function($scope,$rootScope, $route, $window, $element, $routeParams, $location,
$timeout, $compile, websocketMsgSrv) {
$timeout, $compile, websocketMsgSrv, Notification) {
Copy link

@djoelz djoelz Aug 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is Notification defined?

Copy link
Contributor Author

@vgmartinez vgmartinez Aug 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is defined in bower_components/angular-ui-notification/dist/angular-ui-notification.min.js

Copy link

@djoelz djoelz Aug 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! I can't find it under zeppelin-web\bower_components\angular-ui-notification folder. am I missing something?

Copy link
Contributor

@Madhuka Madhuka Aug 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@djoelz : Run the build then it will find it.
OR run bower install in zeppelin-web


$scope.paragraph = null;
$scope.editor = null;
Expand Down Expand Up @@ -258,6 +258,7 @@ angular.module('zeppelinWebApp')
return;
}
commitParagraph($scope.paragraph.title, $scope.dirtyText, $scope.paragraph.config, $scope.paragraph.settings.params);
Notification.info({message: 'Saved', positionY: 'bottom', positionX: 'right'});
$scope.dirtyText = undefined;
};

Expand Down Expand Up @@ -434,7 +435,6 @@ angular.module('zeppelinWebApp')
$scope.editor.setShowFoldWidgets(false);
$scope.editor.setHighlightActiveLine(false);
$scope.editor.setHighlightGutterLine(false);
$scope.editor.setTheme('ace/theme/github');
$scope.editor.setTheme('ace/theme/chrome');
$scope.editor.focus();
var hight = $scope.editor.getSession().getScreenLength() * $scope.editor.renderer.lineHeight + $scope.editor.renderer.scrollBar.getWidth();
Expand Down
2 changes: 2 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/angular-ui-notification/dist/angular-ui-notification.min.css" />
<!-- endbower -->
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/all.css" />
<!-- endbuild -->
Expand Down Expand Up @@ -110,6 +111,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/angular-ui-notification/dist/angular-ui-notification.min.js"></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js({.tmp,src}) scripts/scripts.js -->
Expand Down
4 changes: 3 additions & 1 deletion zeppelin-web/test/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ module.exports = function(config) {
'bower_components/ace-builds/src-noconflict/mode-scala.js',
'bower_components/ace-builds/src-noconflict/mode-sql.js',
'bower_components/ace-builds/src-noconflict/mode-markdown.js',
'bower_components/ace-builds/src-noconflict/mode-sh.js',
'bower_components/ace-builds/src-noconflict/keybinding-emacs.js',
'bower_components/ace-builds/src-noconflict/ext-language_tools.js',
'bower_components/ace-builds/src-noconflict/theme-github.js',
'bower_components/ace-builds/src-noconflict/theme-chrome.js',
'bower_components/angular-ui-ace/ui-ace.js',
'bower_components/jquery.scrollTo/jquery.scrollTo.js',
'bower_components/d3/d3.js',
Expand All @@ -52,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/angular-ui-notification/dist/angular-ui-notification.min.js',
'bower_components/angular-mocks/angular-mocks.js',
// endbower
'src/app/app.js',
Expand Down