You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2016/09/23 09:44:58 UTC
zeppelin git commit: [ZEPPELIN-1446] Fix broken layout of `Create new
interpreter` UI.
Repository: zeppelin
Updated Branches:
refs/heads/master a3ca80031 -> 2cb39f92e
[ZEPPELIN-1446] Fix broken layout of `Create new interpreter` UI.
### What is this PR for?
This PR fixes broken layout of `Create new interpreter` UI.
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1446
### How should this be tested?
- Try to create new interpreter on the Interpreters menu.
### 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: astroshim <hs...@nflabs.com>
Closes #1431 from astroshim/ZEPPELIN-1446 and squashes the following commits:
729215b [astroshim] Merge branch 'master' into ZEPPELIN-1446
69cc1a0 [astroshim] Merge branch 'master' into ZEPPELIN-1446
fada36b [astroshim] fix spaces
2d3ec76 [astroshim] fix space
5f0a461 [astroshim] fix align checkboxs.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2cb39f92
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2cb39f92
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2cb39f92
Branch: refs/heads/master
Commit: 2cb39f92e5e1b3872e0b2e880b3bceff57769d42
Parents: a3ca800
Author: astroshim <hs...@nflabs.com>
Authored: Thu Sep 22 14:41:03 2016 +0900
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Fri Sep 23 18:44:42 2016 +0900
----------------------------------------------------------------------
.../interpreter-create/interpreter-create.html | 230 ++++++++++---------
1 file changed, 122 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2cb39f92/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 1550126..d0e0749 100644
--- a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
+++ b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
@@ -35,8 +35,8 @@ limitations under the License.
</select>
</div>
- <b>Option</b>
<div>
+ <h5>Option</h5>
<span class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle"
data-toggle="dropdown">
@@ -68,130 +68,144 @@ limitations under the License.
</span>
<span>Interpreter for note</span>
</div>
- <br />
- <div class="col-md-12" style="padding-left:0px">
- <div class="checkbox">
- <span class="input-group" style="line-height:30px;">
- <label><input type="checkbox" style="width:20px" ng-model="newInterpreterSetting.option.isExistingProcess"/> Connect to existing process </label>
- </span>
+ <div class="row interpreter" style="margin-top: 5px;">
+ <div class="col-md-12">
+ <div class="checkbox remove-margin-top-bottom">
+ <span class="input-group" style="line-height:30px;">
+ <label>
+ <input type="checkbox" style="width:20px" id="isExistingProcess" ng-model="newInterpreterSetting.option.isExistingProcess"/>
+ Connect to existing process
+ </label>
+ </span>
+ </div>
</div>
</div>
- <div ng-show="newInterpreterSetting.option.isExistingProcess" class="form-group" style="width:200px">
- <b>Host</b>
+ <div class="row interpreter" ng-show="newInterpreterSetting.option.isExistingProcess" >
+ <div class="col-md-12">
+ <b>Host</b>
<input id="newInterpreterSettingHost" input pu-elastic-input
- pu-elastic-input-minwidth="180px" ng-model="newInterpreterSetting.option.host" />
- </div>
- <div ng-show="newInterpreterSetting.option.isExistingProcess" class="form-group" style="width:200px">
- <b>Port</b>
- <input id="newInterpreterSettingPort" input pu-elastic-input
- pu-elastic-input-minwidth="180px" ng-model="newInterpreterSetting.option.port" />
+ pu-elastic-input-minwidth="180px" ng-model="newInterpreterSetting.option.host"/>
+ </div>
+ <div class="col-md-12">
+ <b>Port</b>
+ <input id="newInterpreterSettingPort" input pu-elastic-input
+ pu-elastic-input-minwidth="180px" ng-model="newInterpreterSetting.option.port"/>
+ </div>
</div>
-
- <div class="col-md-12">
- <div class="checkbox">
+ <div class="row interpreter">
+ <div class="col-md-12">
+ <div class="checkbox remove-margin-top-bottom">
<span class="input-group" style="line-height:30px;">
- <label><input type="checkbox" style="width:18px !important" id="idShowPermission" ng-click="togglePermissions('newInterpreter')" ng-model="newInterpreterSetting.option.setPermission"/>
- Set permission </label>
+ <label>
+ <input type="checkbox" style="width:20px !important" id="idShowPermission" ng-click="togglePermissions('newInterpreter')" ng-model="newInterpreterSetting.option.setPermission"/>
+ Set permission
+ </label>
</span>
+ </div>
</div>
</div>
+ <br/>
- <div class="col-md-12">
- <!-- permissions -->
- <div ng-show="newInterpreterSetting.option.setPermission" class="permissionsForm">
- <div>
- <p>
- Enter comma separated users in the fields. <br />
- Empty field (*) implies anyone can run this interpreter.
- </p>
+ <div class="row interpreter">
+ <div class="col-md-12">
+ <!-- permissions -->
+ <div ng-show="newInterpreterSetting.option.setPermission" class="permissionsForm">
<div>
-
- <span class="owners">Owners </span>
- <select id="newInterpreterUsers" class="form-control" multiple="multiple">
- <option ng-repeat="user in newInterpreterSetting.option.users" selected="selected">{{user}}</option>
- </select>
+ <p>
+ Enter comma separated users in the fields. <br />
+ Empty field (*) implies anyone can run this interpreter.
+ </p>
+ <div>
+ <span class="owners">Owners </span>
+ <select id="newInterpreterUsers" class="form-control" multiple="multiple">
+ <option ng-repeat="user in newInterpreterSetting.option.users" selected="selected">{{user}}</option>
+ </select>
+ </div>
</div>
</div>
</div>
</div>
+ <div>
+ <h5>Properties</h5>
+ <table class="table table-striped properties">
+ <tr>
+ <th>name</th>
+ <th>value</th>
+ <th>description</th>
+ <th>action</th>
+ </tr>
+ <tr ng-repeat="(key, value) in newInterpreterSetting.properties">
+ <td>{{key}}</td>
+ <td><textarea msd-elastic ng-model="value.value"></textarea></td>
+ <td>{{value.description}}</td>
+ <td>
+ <button class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
+ </button>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <input pu-elastic-input pu-elastic-input-minwidth="180px"
+ ng-model="newInterpreterSetting.propertyKey" />
+ </td>
+ <td><textarea msd-elastic ng-model="newInterpreterSetting.propertyValue"></textarea></td>
+ <td></td>
+ <td>
+ <button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
+ </button>
+ </td>
+ </tr>
+ </table>
+ </div>
- <b>Properties</b>
- <table class="table table-striped properties">
- <tr>
- <th>name</th>
- <th>value</th>
- <th>description</th>
- <th>action</th>
- </tr>
- <tr ng-repeat="(key, value) in newInterpreterSetting.properties">
- <td>{{key}}</td>
- <td><textarea msd-elastic ng-model="value.value"></textarea></td>
- <td>{{value.description}}</td>
- <td>
- <button class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
- </button>
- </td>
- </tr>
-
- <tr>
- <td>
- <input pu-elastic-input pu-elastic-input-minwidth="180px"
- ng-model="newInterpreterSetting.propertyKey" />
- </td>
- <td><textarea msd-elastic ng-model="newInterpreterSetting.propertyValue"></textarea></td>
- <td></td>
- <td>
- <button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
- </button>
- </td>
- </tr>
- </table>
-
- <b>Dependencies</b>
- <table class="table table-striped properties">
- <tr>
- <th>artifact</th>
- <th>exclude</th>
- <th>action</th>
- </tr>
-
- <tr ng-repeat="dep in newInterpreterSetting.dependencies">
- <td>
- <input ng-model="dep.groupArtifactVersion" style="width:100%" />
- </td>
- <td>
- <textarea msd-elastic ng-model="dep.exclusions"
- ng-list
- placeholder="(Optional) comma separated groupId:artifactId list">
- </textarea>
- </td>
- <td>
- <button class="btn btn-default btn-sm fa fa-remove"
- ng-click="removeInterpreterDependency(dep.groupArtifactVersion)">
- </button>
- </td>
- </tr>
-
- <tr>
- <td>
- <input ng-model="newInterpreterSetting.depArtifact"
- placeholder="groupId:artifactId:version or local file path"
- style="width: 100%" />
- </td>
- <td>
- <textarea msd-elastic ng-model="newInterpreterSetting.depExclude"
- ng-list
- placeholder="(Optional) comma separated groupId:artifactId list">
- </textarea>
- </td>
- <td>
- <button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterDependency()">
- </button>
- </td>
- </tr>
- </table>
+ <div>
+ <h5>Dependencies</h5>
+ <table class="table table-striped properties">
+ <tr>
+ <th>artifact</th>
+ <th>exclude</th>
+ <th>action</th>
+ </tr>
+
+ <tr ng-repeat="dep in newInterpreterSetting.dependencies">
+ <td>
+ <input ng-model="dep.groupArtifactVersion" style="width:100%" />
+ </td>
+ <td>
+ <textarea msd-elastic ng-model="dep.exclusions"
+ ng-list
+ placeholder="(Optional) comma separated groupId:artifactId list">
+ </textarea>
+ </td>
+ <td>
+ <button class="btn btn-default btn-sm fa fa-remove"
+ ng-click="removeInterpreterDependency(dep.groupArtifactVersion)">
+ </button>
+ </td>
+ </tr>
+
+ <tr>
+ <td>
+ <input ng-model="newInterpreterSetting.depArtifact"
+ placeholder="groupId:artifactId:version or local file path"
+ style="width: 100%" />
+ </td>
+ <td>
+ <textarea msd-elastic ng-model="newInterpreterSetting.depExclude"
+ ng-list
+ placeholder="(Optional) comma separated groupId:artifactId list">
+ </textarea>
+ </td>
+ <td>
+ <button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterDependency()">
+ </button>
+ </td>
+ </tr>
+ </table>
+ </div>
<span class="btn btn-primary" ng-click="addNewInterpreterSetting()">
Save