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/08 22:57:59 UTC
zeppelin git commit: [ZEPPELIN-1404] invalid html structure for
bootstrap in interpreter setting page
Repository: zeppelin
Updated Branches:
refs/heads/master 724ef6ff0 -> 9bce03ce0
[ZEPPELIN-1404] invalid html structure for bootstrap in interpreter setting page
### What is this PR for?
invalid html structure for bootstrap in interpreter setting page.
for example :
correct
```html
<div class="row">
<div class="col-md-12">
</div>
</div>
```
invalid now.
```html
<div class="row">
<div class="col-md-12">
</div>
</div>
<div class="col-md-12">
</div>
```
There occurs a problem with the current designers, and shape.
Please, check to Screenshots in this pr.
### What type of PR is it?
Bug Fix
### Todos
- [x] Fixed html structure
- [x] modification to margin for checkbox.
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1404
### How should this be tested?
click to interpreter menu in web ui.
### Screenshots (if appropriate)
#### before wide screen.
#### after wide screen.
- active stripe table, and fixed margin, and other layout.
#### before mobile size screen
#### after mobile size screen
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: CloverHearts <cl...@gmail.com>
Closes #1395 from cloverhearts/dev/interpreter-tag-fixed and squashes the following commits:
305664c [CloverHearts] Merge branch 'master' into dev/interpreter-tag-fixed
c725381 [CloverHearts] revert - style margin-top-0 and removed margin-top in paragraph.css
cd6db05 [CloverHearts] Property between Table - removed margin
5c6e476 [CloverHearts] revert to e-form
771c901 [CloverHearts] fixed to correct html(bootstrap) syntax for interpreter setting page.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9bce03ce
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9bce03ce
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9bce03ce
Branch: refs/heads/master
Commit: 9bce03ce04cbe9e7dcc4d23d1b8c7d6b8899d367
Parents: 724ef6f
Author: CloverHearts <cl...@gmail.com>
Authored: Thu Sep 8 14:26:45 2016 +0900
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Fri Sep 9 07:57:52 2016 +0900
----------------------------------------------------------------------
.../src/app/interpreter/interpreter.css | 5 ++
.../src/app/interpreter/interpreter.html | 69 ++++++++++++--------
.../src/app/notebook/paragraph/paragraph.css | 1 -
3 files changed, 46 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bce03ce/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 ee4f81d..554ecbc 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.css
+++ b/zeppelin-web/src/app/interpreter/interpreter.css
@@ -109,3 +109,8 @@
color: #000;
opacity: .5;
}
+
+.remove-margin-top-bottom {
+ margin-top: 0px !important;
+ margin-bottom: 0px !important;
+}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bce03ce/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 7ac1872..d7f3440 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -38,13 +38,17 @@ limitations under the License.
</div>
</div>
- <div class="input-group col-md-4" style="margin-top: 10px">
- <input type="text" ng-model="searchInterpreter" class="form-control ng-pristine ng-untouched ng-valid ng-empty" placeholder="Search interpreters"/>
- <span class="input-group-btn">
- <button type="submit" class="btn btn-default" ng-disabled="!navbar.connected">
- <i class="glyphicon glyphicon-search"></i>
- </button>
- </span>
+ <div class="row">
+ <div class="col-md-4">
+ <div class="input-group" style="margin-top: 10px">
+ <input type="text" ng-model="searchInterpreter" class="form-control ng-pristine ng-untouched ng-valid ng-empty" placeholder="Search interpreters"/>
+ <span class="input-group-btn">
+ <button type="submit" class="btn btn-default" ng-disabled="!navbar.connected">
+ <i class="glyphicon glyphicon-search"></i>
+ </button>
+ </span>
+ </div>
+ </div>
</div>
</div>
@@ -93,10 +97,9 @@ limitations under the License.
<small>
<span style="display:inline-block" ng-repeat="interpreter in setting.interpreterGroup"
title="{{interpreter.class}}">
- <span ng-show="!$first">, </span>
- %<span ng-show="!$parent.$first || $first">{{setting.name}}</span
- ><span ng-show="(!$parent.$first || $first) && !$first">.</span
- ><span ng-show="!$first">{{interpreter.name}}</span>
+ <span ng-show="!$first">, </span>%<span ng-show="!$parent.$first || $first">{{setting.name}}</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>
@@ -170,37 +173,44 @@ limitations under the License.
</span>
<span>Interpreter for note</span>
</div>
-
- <br />
+ </div>
+ <div class="row interpreter" style="margin-top: 5px;">
<div class="col-md-12">
- <div class="checkbox">
+ <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="setting.option.isExistingProcess" ng-disabled="!valueform.$visible"/>
- Connect to existing process </label>
+ <label>
+ <input type="checkbox" style="width:20px" id="isExistingProcess" ng-model="setting.option.isExistingProcess" ng-disabled="!valueform.$visible"/>
+ Connect to existing process
+ </label>
</span>
</div>
</div>
-
- <div class="col-md-12" ng-show="setting.option.isExistingProcess">
+ </div>
+ <div class="row interpreter" ng-if="setting.option.isExistingProcess">
+ <div class="col-md-12">
<b>Host</b>
<input id="newInterpreterSettingHost" input pu-elastic-input
pu-elastic-input-minwidth="180px" ng-model="setting.option.host" ng-disabled="!valueform.$visible" />
</div>
- <div class="col-md-12" ng-show="setting.option.isExistingProcess">
+ <div class="col-md-12">
<b>Port</b>
<input id="newInterpreterSettingPort" input pu-elastic-input
pu-elastic-input-minwidth="180px" ng-model="setting.option.port" ng-disabled="!valueform.$visible" />
</div>
-
+ </div>
+ <div class="row interpreter">
<div class="col-md-12">
- <div class="checkbox">
+ <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(setting.name)" ng-model="setting.option.setPermission" ng-disabled="!valueform.$visible"/>
- Set permission </label>
+ <label>
+ <input type="checkbox" style="width:20px !important" id="idShowPermission" ng-click="togglePermissions(setting.name)" ng-model="setting.option.setPermission" ng-disabled="!valueform.$visible"/>
+ Set permission
+ </label>
</span>
</div>
</div>
-
+ </div>
+ <div class="row interpreter">
<div class="col-md-12">
<!-- permissions -->
<div ng-show="setting.option.setPermission" class="permissionsForm">
@@ -223,14 +233,16 @@ limitations under the License.
<div ng-show="_.isEmpty(setting.properties) && _.isEmpty(setting.dependencies) || valueform.$hidden" 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">
<thead>
<tr>
- <th style="width:30%">name</th>
- <th>value</th>
- <th ng-if="valueform.$visible">action</th>
+ <th style="width:40%">name</th>
+ <th style="width:40%">value</th>
+ <th style="width:20%" ng-if="valueform.$visible">action</th>
</tr>
</thead>
<tr ng-repeat="key in setting.properties | sortByKey" >
@@ -263,7 +275,8 @@ limitations under the License.
</tr>
</table>
</div>
-
+ </div>
+ <div class="row interpreter">
<div class="col-md-12" ng-show="!_.isEmpty(setting.dependencies) || valueform.$visible">
<h5>Dependencies</h5>
<p class="gray40-message" style="font-size:12px" ng-show="valueform.$visible">
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bce03ce/zeppelin-web/src/app/notebook/paragraph/paragraph.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
index e8edc0b..0b821c9 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
@@ -502,7 +502,6 @@ div.esri-view {
table.table-striped {
border-top: 1px solid #ddd;
- margin-top: 20px;
}
.scroll-paragraph-down {