Repository: zeppelin Updated Branches: refs/heads/master 46cd56ad2 -> f2a5c594d
[MINOR] Hide "Currently there are no properties ~" msg & "edit", "restart" and "remove" btn in edit mode ### What is this PR for? "Currently there are no properties and dependencies set for this interpreter" message is shown when there are no properties & dependencies in interpreter setting page. But this message can be seen even in the edit mode. It's quite wired. This message needs to be shown only in non-editable mode. The `edit`, `restart` and `remove` button are same. - `edit` button doesn't do any work after changing to edit mode - `restart` button: it doesn't make sense that someone is editing and restarting interpreter at the same time - `remove` button: Maybe someone wants to remove the interpreter while he is editing the interpreter. But it would be better this button is shown only in non-editable mode for the consistency with the other buttons. For the above reasons, I changed those buttons to be shown in non-editable mode only. `Save` & `Cancel` buttons are enough to the edit page I think. Please see the attached gif image. ### What type of PR is it? Bug Fix ### What is the Jira issue? ### How should this be tested? 1. After applying this patch and build only `zeppelin-web` with `./grunt build` under `zeppelin-web`. 2. You can quickly check this change in dev mode with `./grunt serve`. 3. Go to `Interpreter` menu and click "edit" button on Angular interpreter to see "Currently there are no properties and dependencies set for this interpreter" message. Can also check the existence of `edit`, `restart` and `remove` buttons. ### 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: AhyoungRyu <fbdkdu...@hanmail.net> Author: AhyoungRyu <ahyoung...@apache.org> Closes #1434 from AhyoungRyu/fix/editMode and squashes the following commits: 4433f86 [AhyoungRyu] Make same width 'properties'&'dependencies' table 2e50f5d [AhyoungRyu] Revert 'form' 0c6c937 [AhyoungRyu] Fix minor issues in interpreter setting edit mode Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f2a5c594 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f2a5c594 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f2a5c594 Branch: refs/heads/master Commit: f2a5c594dc8e0810b22cb66b6db06ccb4f8927f4 Parents: 46cd56a Author: AhyoungRyu <fbdkdu...@hanmail.net> Authored: Tue Sep 20 16:41:00 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Thu Sep 22 09:55:03 2016 +0900 ---------------------------------------------------------------------- zeppelin-web/src/app/interpreter/interpreter.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f2a5c594/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 d7f3440..fe38c16 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.html +++ b/zeppelin-web/src/app/interpreter/interpreter.html @@ -124,7 +124,7 @@ limitations under the License. </small> </h3> - <span style="float:right"> + <span style="float:right" ng-show="!valueform.$visible" > <button class="btn btn-default btn-xs" ng-click="valueform.$show(); copyOriginInterpreterSettingProperties(setting.id)"> @@ -134,7 +134,7 @@ limitations under the License. <span class="fa fa-refresh"></span> restart</button> <button class="btn btn-default btn-xs" ng-click="removeInterpreterSetting(setting.id)"> - <span class="fa fa-remove"></span> remove</button> + <span class="fa fa-trash"></span> remove</button> </span> </div> </div> @@ -229,12 +229,12 @@ limitations under the License. </div> </div> </div> + </div> - <div ng-show="_.isEmpty(setting.properties) && _.isEmpty(setting.dependencies) || valueform.$hidden" class="col-md-12 gray40-message"> + <div class="row interpreter" style="margin-top:20px !important"> + <div ng-show="_.isEmpty(setting.properties) && _.isEmpty(setting.dependencies) && !valueform.$visible" class="col-md-12 gray40-message"> <em>Currently there are no properties and dependencies set for this interpreter</em> </div> - </div> - <div class="row interpreter"> <div class="col-md-12" ng-show="!_.isEmpty(setting.properties) || valueform.$visible"> <h5>Properties</h5> <table class="table table-striped"> @@ -285,8 +285,8 @@ limitations under the License. <thead> <tr> <th style="width:40%">artifact</th> - <th>exclude</th> - <th ng-if="valueform.$visible">action</th> + <th style="width:40%">exclude</th> + <th style="width:20%" ng-if="valueform.$visible">action</th> </tr> </thead> <tr ng-repeat="dep in setting.dependencies">
