zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mina...@apache.org
Subject incubator-zeppelin git commit: [ZEPPELIN-35] Icons should have tool tips
Date Thu, 30 Jul 2015 09:55:17 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 5b89ba98f -> ab138b81e


[ZEPPELIN-35] Icons should have tool tips

Fix the issue that tooltip doesn't show by forcing angular version to 1.2.x.
angular-bootstrap doesn't support angular 1.3 for now.
Also downgraded ng-sortable to 1.1.6 since current one requires angular 1.3.

Author: Mina Lee <minalee@nflabs.com>

Closes #34 from minahlee/fix/tooltip and squashes the following commits:

a652e1a [Mina Lee] Bump angular-bootstrap version to 0.13.x
4f3589a [Mina Lee] Revert all commits on zeppelin-web/bower.json file
a9a8308 [Mina Lee] Add tooltip on scheduler button
b48b775 [Mina Lee] [ZEPPELIN-35] Icons should have tool tips


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/ab138b81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/ab138b81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/ab138b81

Branch: refs/heads/master
Commit: ab138b81e22587f960419d5cb136c82b6a71d7db
Parents: 5b89ba9
Author: Mina Lee <minalee@nflabs.com>
Authored: Fri Jul 24 15:52:59 2015 +0900
Committer: Mina Lee <minalee@nflabs.com>
Committed: Thu Jul 30 18:55:00 2015 +0900

----------------------------------------------------------------------
 zeppelin-web/bower.json                        | 2 +-
 zeppelin-web/src/app/notebook/notebook.html    | 5 +++--
 zeppelin-web/src/components/navbar/navbar.html | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ab138b81/zeppelin-web/bower.json
----------------------------------------------------------------------
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index 2ee0032..0de4a1f 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -11,7 +11,7 @@
     "angular-animate": "1.3.8",
     "angular-touch": "1.3.8",
     "angular-route": "1.3.8",
-    "angular-bootstrap": "~0.11.0",
+    "angular-bootstrap": "~0.13.0",
     "angular-websocket": "~1.0.13",
     "ace-builds": "1.1.8",
     "angular-ui-ace": "0.1.1",

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ab138b81/zeppelin-web/src/app/notebook/notebook.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html
index 4830a9d..3d965ec 100644
--- a/zeppelin-web/src/app/notebook/notebook.html
+++ b/zeppelin-web/src/app/notebook/notebook.html
@@ -23,7 +23,7 @@ limitations under the License.
                     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">
               <i class="icon-control-play"></i>
             </button>
 
@@ -54,7 +54,8 @@ limitations under the License.
               <div class="btn btn-default btn-xs dropdown-toggle"
                    type="button"
                    data-toggle="dropdown"
-                   ng-class="{ 'btn-info' : note.config.cron, 'btn-danger' : note.info.cron,
'btn-default' : !note.config.cron}">
+                   ng-class="{ 'btn-info' : note.config.cron, 'btn-danger' : note.info.cron,
'btn-default' : !note.config.cron}"
+                   tooltip-placement="top" tooltip="Run scheduler">
                 <span class="fa fa-clock-o"></span> {{getCronOptionNameFromValue(note.config.cron)}}
               </div>
               <ul class="dropdown-menu" role="menu" style="width:300px">

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ab138b81/zeppelin-web/src/components/navbar/navbar.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index ebdd1fb..e583098 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -26,8 +26,8 @@ limitations under the License.
 
     <div class="collapse navbar-collapse" ng-controller="NavCtrl as navbar">
       <ul class="nav navbar-nav">
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle">Notebook <span class="caret"></span></a>
+        <li class="dropdown" dropdown>
+          <a href="#" class="dropdown-toggle" dropdown-toggle>Notebook <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
             <li><a href="javascript:void(0);" ng-click="navbar.websocketMsgSrv.createNotebook()"><i
class="fa fa-plus"></i> Create new note</a></li>
             <li class="divider"></li>
@@ -51,4 +51,4 @@ limitations under the License.
       </ul>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>


Mime
View raw message