From b48b775a6bc6295dcefefb2f11ab54085b625632 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Thu, 9 Apr 2015 14:19:40 +0900 Subject: [PATCH 1/4] [ZEPPELIN-35] Icons should have tool tips Specify angular version to avoid side effect Resotre angular-bootstrap version --- zeppelin-web/bower.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 2ee00326c7b..be7f89730c3 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -2,24 +2,24 @@ "name": "zeppelin-web", "version": "0.0.0", "dependencies": { - "angular": "1.3.8", + "angular": "1.2.28", "json3": "~3.3.1", "es5-shim": "~3.1.0", "bootstrap": "~3.2.0", - "angular-cookies": "1.3.8", - "angular-sanitize": "1.3.8", - "angular-animate": "1.3.8", - "angular-touch": "1.3.8", - "angular-route": "1.3.8", + "angular-cookies": "1.2.28", + "angular-sanitize": "1.2.28", + "angular-animate": "1.2.28", + "angular-touch": "1.2.28", + "angular-route": "1.2.28", "angular-bootstrap": "~0.11.0", - "angular-websocket": "~1.0.13", + "angular-websocket": "~0.0.5", "ace-builds": "1.1.8", "angular-ui-ace": "0.1.1", "jquery.scrollTo": "~1.4.13", "nvd3": "~1.1.15-beta", "angular-dragdrop": "~1.0.8", "perfect-scrollbar": "~0.5.4", - "ng-sortable": "~1.1.9", + "ng-sortable": "1.1.6", "angular-elastic": "~2.4.2", "angular-elastic-input": "~2.0.1", "angular-xeditable": "0.1.8", @@ -28,8 +28,8 @@ "angular-filter": "~0.5.4" }, "devDependencies": { - "angular-mocks": "1.3.8", - "angular-scenario": "1.3.8" + "angular-mocks": "1.2.28", + "angular-scenario": "1.2.28" }, "appPath": "src", "resolutions": { From a9a8308fff7625820a2aa33ebbcdaaa73918521d Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Wed, 3 Jun 2015 16:01:38 +0900 Subject: [PATCH 2/4] Add tooltip on scheduler button --- zeppelin-web/src/app/notebook/notebook.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index 4830a9d737e..3d965ec6ed6 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -23,7 +23,7 @@

class="btn btn-default btn-xs" ng-click="runNote()" ng-if="!isNoteRunning()" - tooltip-placement="top" tooltip="Run all the note"> + tooltip-placement="top" tooltip="Run all the notes"> @@ -54,7 +54,8 @@

+ ng-class="{ 'btn-info' : note.config.cron, 'btn-danger' : note.info.cron, 'btn-default' : !note.config.cron}" + tooltip-placement="top" tooltip="Run scheduler"> {{getCronOptionNameFromValue(note.config.cron)}}