You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/11/15 08:18:38 UTC
incubator-zeppelin git commit: [ZEPPELIN-328] Interpreter page should
clarify the % magic syntax for interpreter group.name
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master c3892d56e -> 66e5433d2
[ZEPPELIN-328] Interpreter page should clarify the % magic syntax for interpreter group.name
* Display %interpreterGroup.interpreterName instead of %settingName.interpreterName
Before
<img width="538" alt="2015-11-09 10 54 43" src="https://cloud.githubusercontent.com/assets/8503346/11035667/354425b6-8737-11e5-82f7-e76376ec6140.png">
After
<img width="415" alt="2015-11-09 10 54 18" src="https://cloud.githubusercontent.com/assets/8503346/11035670/3bf56992-8737-11e5-89e6-85c5562ba196.png">
* Clarify available interpreter as `%group.name` in each notebook when interpreter group name is different from interpreter name.
* %hql -> %hive.hql
* %tql -> %tajo.tql
* %ignite, %ignitesql -> %ignite, %ignite.ignitesql
Before
<img width="1225" alt="2015-11-09 10 51 16" src="https://cloud.githubusercontent.com/assets/8503346/11035678/45f186c4-8737-11e5-8178-d5c57f5a663e.png">
After
<img width="1225" alt="2015-11-09 10 55 45" src="https://cloud.githubusercontent.com/assets/8503346/11035683/4c8fca72-8737-11e5-99da-043686bde3a4.png">
Author: Mina Lee <mi...@nflabs.com>
Closes #411 from minahlee/ZEPPELIN-328 and squashes the following commits:
26fad51 [Mina Lee] Omit interpreter name when it is the first interpreter of interpreter group
4ea2a29 [Mina Lee] [ZEPPELIN-328] Interpreter page should clarify the % magic syntax for interpreter group.name
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/66e5433d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/66e5433d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/66e5433d
Branch: refs/heads/master
Commit: 66e5433d27fa07c064ea6813648e175a15fc8c43
Parents: c3892d5
Author: Mina Lee <mi...@nflabs.com>
Authored: Tue Nov 10 08:12:32 2015 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Sun Nov 15 16:19:01 2015 +0900
----------------------------------------------------------------------
zeppelin-web/src/app/interpreter/interpreter.html | 11 ++++++-----
zeppelin-web/src/app/notebook/notebook.html | 13 ++++++++++++-
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/66e5433d/zeppelin-web/src/app/interpreter/interpreter.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index 3d6cbc9..f9f7585 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -41,12 +41,13 @@ limitations under the License.
<div class="col-md-12">
<h3 class="interpreter-title">{{setting.name}}
<small>
- <span ng-repeat="interpreter in setting.interpreterGroup"
+ <span style="display:inline-block" ng-repeat="interpreter in setting.interpreterGroup"
title="{{interpreter.class}}">
- <span ng-show="$parent.$first && $first">%{{setting.name}} (default)</span>
- <span ng-show="$parent.$first && !$first">, %{{interpreter.name}}</span>
- <span ng-show="!$parent.$first && $first">%{{setting.name}}</span>
- <span ng-show="!$parent.$first && !$first">, %{{setting.name}}.{{interpreter.name}}</span>
+ <span ng-show="!$first">, </span>
+ %<span ng-show="!$parent.$first || $first">{{setting.group}}</span
+ ><span ng-show="(!$parent.$first || $first) && !$first">.</span
+ ><span ng-show="!$first">{{interpreter.name}}</span>
+ <span ng-show="$parent.$first && $first">(default)</span>
</span>
</small>
</h3>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/66e5433d/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 9c5440d..2341160 100644
--- a/zeppelin-web/src/app/notebook/notebook.html
+++ b/zeppelin-web/src/app/notebook/notebook.html
@@ -157,7 +157,18 @@ limitations under the License.
<div as-sortable-item-handle
ng-click="item.selected = !item.selected"
class="btn"
- ng-class="{'btn-info': item.selected, 'btn-default': !item.selected}"><font style="font-size:16px">{{item.name}}</font> <small><span ng-repeat="intp in item.interpreters"><span ng-show="!$first">, </span>%{{intp.name}}</span></small></div>
+ ng-class="{'btn-info': item.selected, 'btn-default': !item.selected}">
+ <font style="font-size:16px">{{item.name}}</font>
+ <small>
+ <span style="display:inline-block" ng-repeat="intp in item.interpreters">
+ <span ng-show="!$first">, </span>
+ %<span ng-show="!$parent.$first || $first">{{item.group}}</span
+ ><span ng-show="(!$parent.$first || $first) && !$first">.</span
+ ><span ng-show="!$first">{{intp.name}}</span>
+ <span ng-show="$parent.$first && $first">(default)</span>
+ </span>
+ </small>
+ </div>
</div>
</div>
</div>