Repository: zeppelin Updated Branches: refs/heads/master b5e039fe1 -> 62d953901
[ZEPPELIN-2700] Provide a link to interpreter binding mode doc ### What is this PR for? Provide a link to the interpreter binding mode documentation page in the interpreter page to help understand what this feature is for (`usage/interpreter/interpreter_binding_mode.html`) - **documentation is not deployed to web yet. So clicking this icon will redirect you to 404 page** ### What type of PR is it? [Improvement | Documentation] ### Todos DONE ### What is the Jira issue? [ZEPPELIN-2700](https://issues.apache.org/jira/browse/ZEPPELIN-2700) ### How should this be tested? 1. Open the interpreter page 2. Check the links (URL, icon, ..) ### Screenshots (if appropriate) #### Before   #### After   ### Questions: * Does the licenses files need update? - NO * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <1am...@gmail.com> Closes #2447 from 1ambda/ZEPPELIN-2700/provide-link-for-interpreter-binding-mode-doc and squashes the following commits: 69158536 [1ambda] fix: Provide more descriptive tooltip message 41261239 [1ambda] feat: Add link to interpreter mode doc 72d6c063 [1ambda] fix: Remove useless margin-bottom 2291e63a [1ambda] style: reindent html Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/62d95390 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/62d95390 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/62d95390 Branch: refs/heads/master Commit: 62d9539012031d2d6447837f8344c0540c92b7e0 Parents: b5e039f Author: 1ambda <1am...@gmail.com> Authored: Thu Jun 29 12:46:38 2017 +0900 Committer: 1ambda <1am...@gmail.com> Committed: Mon Jul 3 21:56:06 2017 +0900 ---------------------------------------------------------------------- .../interpreter-create/interpreter-create.html | 12 ++++++------ .../src/app/interpreter/interpreter.controller.js | 5 +++++ zeppelin-web/src/app/interpreter/interpreter.css | 7 +++++++ zeppelin-web/src/app/interpreter/interpreter.html | 15 ++++++++++----- 4 files changed, 28 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/62d95390/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html index 58e3558..ab86a0d 100644 --- a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html +++ b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html @@ -42,8 +42,7 @@ limitations under the License. The interpreter will be instantiated <span class="btn-group"> <button type="button" class="btn btn-default btn-xs dropdown-toggle" - data-toggle="dropdown" - > + data-toggle="dropdown"> {{getInterpreterRunningOption(setting.id)}} <span class="caret"></span> </button> <ul class="dropdown-menu" role="menu"> @@ -125,7 +124,11 @@ limitations under the License. </li> </ul> </span> - process. + process + <a class="fa fa-info-circle interpreter-binding-mode-info-link" + aria-hidden="true" + uib-tooltip="Can manage interpreter sessions differently by setting this option. Click this button to learn more" + ng-href="{{getInterpreterBindingModeDocsLink()}}" target="_blank"></a> <span ng-if="getInterpreterRunningOption(setting.id) === 'Per User' && ticket.principal !== 'anonymous'"> <span ng-if="getPerNoteOption(setting.id) === 'shared'"> <button type="button" class="btn btn-default btn-xs" @@ -136,9 +139,6 @@ limitations under the License. </span> </span> </div> - <div class="col-md-6"> - - </div> </div> <div class="row interpreter" style="margin-top: 6px;" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/62d95390/zeppelin-web/src/app/interpreter/interpreter.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/interpreter/interpreter.controller.js b/zeppelin-web/src/app/interpreter/interpreter.controller.js index c9a840b..df2b216 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.controller.js +++ b/zeppelin-web/src/app/interpreter/interpreter.controller.js @@ -738,5 +738,10 @@ function InterpreterCtrl ($rootScope, $scope, $http, baseUrlSrv, ngToast, $timeo }) } + $scope.getInterpreterBindingModeDocsLink = function() { + const currentVersion = $rootScope.zeppelinVersion + return `https://zeppelin.apache.org/docs/${currentVersion}/usage/interpreter/interpreter_binding_mode.html` + } + init() } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/62d95390/zeppelin-web/src/app/interpreter/interpreter.css ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/interpreter/interpreter.css b/zeppelin-web/src/app/interpreter/interpreter.css index e1562a4..bc4dc06 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.css +++ b/zeppelin-web/src/app/interpreter/interpreter.css @@ -123,3 +123,10 @@ margin-top: 0px !important; margin-bottom: 0px !important; } + +.interpreter-binding-mode-info-link { + color: #3071a9; + vertical-align: middle; + margin-left: 2px; + text-decoration: none !important; +} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/62d95390/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 58d90b2..f9d4252 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.html +++ b/zeppelin-web/src/app/interpreter/interpreter.html @@ -234,7 +234,11 @@ limitations under the License. </li> </ul> </span> - process. + process + <a class="fa fa-info-circle interpreter-binding-mode-info-link" + aria-hidden="true" + uib-tooltip="Can manage interpreter sessions differently by setting this option. Click this button to learn more" + ng-href="{{getInterpreterBindingModeDocsLink()}}" target="_blank"></a> <span ng-if="getInterpreterRunningOption(setting.id) === 'Per User' && ticket.principal !== 'anonymous'"> <span ng-if="getPerNoteOption(setting.id) === 'shared'"> <button type="button" class="btn btn-default btn-xs" @@ -246,9 +250,6 @@ limitations under the License. </span> </span> </div> - <div class="col-md-6"> - - </div> </div> <div class="row interpreter" style="margin-top: 6px;" @@ -296,7 +297,11 @@ limitations under the License. </li> </ul> </span> - process. + process + <a class="fa fa-info-circle interpreter-binding-mode-info-link" + aria-hidden="true" + uib-tooltip="Can manage interpreter sessions differently by setting this option. Click this button to learn more" + ng-href="{{getInterpreterBindingModeDocsLink()}}" target="_blank"></a> <button type="button" class="btn btn-default btn-xs" ng-disabled="!valueform.$visible" ng-click="setPerNoteOption(setting.id, 'shared')"
