From 771c9014e8e7b2b759aedafc885d84e37f89283a Mon Sep 17 00:00:00 2001
From: CloverHearts <cloverheartsdev@gmail.com>
Date: Fri, 2 Sep 2016 16:12:31 +0900
Subject: [PATCH 1/4] fixed to correct html(bootstrap) syntax for interpreter
 setting page.

---
 .../src/app/interpreter/interpreter.css       |  5 ++
 .../src/app/interpreter/interpreter.html      | 71 +++++++++++--------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/zeppelin-web/src/app/interpreter/interpreter.css b/zeppelin-web/src/app/interpreter/interpreter.css
index ee4f81db614..554ecbcc56b 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;
+}
diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index 7ac18728093..8905e1db43b 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -38,13 +38,17 @@ <h3 class="new_h3">
       </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 @@ <h3 class="interpreter-title">{{setting.name}}
           <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 @@ <h5>Option</h5>
         </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 @@ <h5>Option</h5>
       <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 @@ <h5>Properties</h5>
           </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">
@@ -286,7 +299,7 @@ <h5>Dependencies</h5>
             <td>
               <textarea ng-if="valueform.$visible" ng-model="dep.exclusions"
                         placeholder="(Optional) comma separated groupId:artifactId list"
-                        form="valueform"
+                        e-form="valueform"
                         e-msd-elastic
                         ng-list="">
               </textarea>

From 5c6e476436138cccb56ab4d9a430835ef0c3f8f6 Mon Sep 17 00:00:00 2001
From: CloverHearts <cloverheartsdev@gmail.com>
Date: Tue, 6 Sep 2016 11:26:17 +0900
Subject: [PATCH 2/4] revert to e-form

---
 zeppelin-web/src/app/interpreter/interpreter.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index 8905e1db43b..d7f3440c90f 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -299,7 +299,7 @@ <h5>Dependencies</h5>
             <td>
               <textarea ng-if="valueform.$visible" ng-model="dep.exclusions"
                         placeholder="(Optional) comma separated groupId:artifactId list"
-                        e-form="valueform"
+                        form="valueform"
                         e-msd-elastic
                         ng-list="">
               </textarea>

From cd6db05768523071462457205b0fcf20fc4f7865 Mon Sep 17 00:00:00 2001
From: CloverHearts <cloverheartsdev@gmail.com>
Date: Tue, 6 Sep 2016 11:30:11 +0900
Subject: [PATCH 3/4] Property between Table - removed margin

---
 zeppelin-web/src/app/interpreter/interpreter.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index d7f3440c90f..d1fe0290626 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -237,7 +237,7 @@ <h5>Option</h5>
     <div class="row interpreter">
       <div class="col-md-12" ng-show="!_.isEmpty(setting.properties) || valueform.$visible">
         <h5>Properties</h5>
-        <table class="table table-striped">
+        <table class="table table-striped" style="margin-top:0px;">
           <thead>
             <tr>
               <th style="width:40%">name</th>

From c72538150d73947fbf526ea97274bda7e1a4a418 Mon Sep 17 00:00:00 2001
From: CloverHearts <cloverheartsdev@gmail.com>
Date: Tue, 6 Sep 2016 13:42:13 +0900
Subject: [PATCH 4/4] revert - style margin-top-0 and removed margin-top in
 paragraph.css

---
 zeppelin-web/src/app/interpreter/interpreter.html     | 2 +-
 zeppelin-web/src/app/notebook/paragraph/paragraph.css | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index d1fe0290626..d7f3440c90f 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -237,7 +237,7 @@ <h5>Option</h5>
     <div class="row interpreter">
       <div class="col-md-12" ng-show="!_.isEmpty(setting.properties) || valueform.$visible">
         <h5>Properties</h5>
-        <table class="table table-striped" style="margin-top:0px;">
+        <table class="table table-striped">
           <thead>
             <tr>
               <th style="width:40%">name</th>
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
index e8edc0bb9fb..0b821c94181 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 {