zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cornead...@apache.org
Subject incubator-zeppelin git commit: Cron UI fix and css cleanup
Date Fri, 04 Dec 2015 08:58:35 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 986b0adba -> 991d63578


Cron UI fix and css cleanup

- add spacing between links in presets
- remove inline css and fix alignment

Before
<img width="324" alt="screen shot 2015-12-03 at 2 02 13 pm" src="https://cloud.githubusercontent.com/assets/2031306/11556393/4cdbe888-99cc-11e5-8efc-2384dd884a98.png">
<img width="322" alt="screen shot 2015-12-03 at 2 46 27 pm" src="https://cloud.githubusercontent.com/assets/2031306/11556450/acb90826-99cc-11e5-921b-4125fc0deb05.png">

<hr />
After
<img width="331" alt="screen shot 2015-12-03 at 2 01 30 pm" src="https://cloud.githubusercontent.com/assets/2031306/11556394/4ce3a852-99cc-11e5-9ec1-86d54163a727.png">
<img width="313" alt="screen shot 2015-12-03 at 2 48 17 pm" src="https://cloud.githubusercontent.com/assets/2031306/11556475/edd94686-99cc-11e5-96ed-18c804b114fa.png">

Author: Renjith Kamath <renjith.kamath@gmail.com>

Closes #511 from r-kamath/cronUIFix and squashes the following commits:

87c21cd [Renjith Kamath] add more spacing between cron expression and error message
7aa6f5c [Renjith Kamath] Cron UI fix and css cleanup


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/991d6357
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/991d6357
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/991d6357

Branch: refs/heads/master
Commit: 991d6357874f19553747df499cff49d0b576107a
Parents: 986b0ad
Author: Renjith Kamath <renjith.kamath@gmail.com>
Authored: Thu Dec 3 15:07:45 2015 +0530
Committer: Damien CORNEAU <corneadoug@gmail.com>
Committed: Fri Dec 4 17:58:18 2015 +0900

----------------------------------------------------------------------
 zeppelin-web/src/app/notebook/notebook.css  | 26 +++++++++++++++++
 zeppelin-web/src/app/notebook/notebook.html | 36 ++++++++++++------------
 2 files changed, 44 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/991d6357/zeppelin-web/src/app/notebook/notebook.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css
index 4b6271c..454e474 100644
--- a/zeppelin-web/src/app/notebook/notebook.css
+++ b/zeppelin-web/src/app/notebook/notebook.css
@@ -174,3 +174,29 @@
 .setting .modal-footer {
   border: 0;
 }
+
+.cron-preset-container {
+  padding: 10px 20px 0 20px;
+  font-weight: normal;
+  word-wrap: break-word;
+}
+
+.cron-preset-container > div {
+  margin: 10px 0;
+}
+
+.cron-preset {
+  margin: 0px 2px;
+  cursor: pointer;
+}
+
+.cron-info {
+  margin: 5px;
+  font-size: 11px;
+}
+
+.cron-preset.selected {
+  color: #000;
+  text-decoration: none;
+  cursor: default;
+}

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/991d6357/zeppelin-web/src/app/notebook/notebook.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html
index 970e9e4..935192a 100644
--- a/zeppelin-web/src/app/notebook/notebook.html
+++ b/zeppelin-web/src/app/notebook/notebook.html
@@ -81,26 +81,26 @@ limitations under the License.
         </div>
         <ul class="dropdown-menu" role="menu" style="width:300px">
           <li>
-            <div style="padding:10px 20px 0 20px;font-weight:normal;word-wrap:break-word">
+            <div class="cron-preset-container">
               Run note with cron scheduler.
               Either choose from<br/>preset or write your own <a href="http://www.quartz-scheduler.org/documentation/quartz-1.x/tutorials/crontrigger"
target=_blank>cron expression</a>.
-              <br/><br/>
-              <span>- Preset</span>
-              <a ng-repeat="cr in cronOption"
-                 type="button"
-                 ng-click="setCronScheduler(cr.value)"
-                 style="cursor:pointer"
-                 dropdown-input>{{cr.name}}</a>
-              <br/><br/>
-              <span>- Cron expression</span>
-              <input type="text"
-                     ng-model="note.config.cron"
-                     ng-change="setCronScheduler(note.config.cron)"
-                     dropdown-input />
-              <p ng-show="note.info.cron"
-                 style="color:red">
-                {{note.info.cron}}
-              </p>
+              <div>
+                <span>- Preset</span>
+                <a class="cron-preset" ng-repeat="cr in cronOption"
+                   type="button"
+                   ng-click="setCronScheduler(cr.value)"
+                   dropdown-input ng-class="{ 'selected' : cr.value == note.config.cron}">{{cr.name}}</a>
+              </div>
+              <div>
+                <span>- Cron expression</span>
+                <input type="text"
+                       ng-model="note.config.cron"
+                       ng-change="setCronScheduler(note.config.cron)"
+                       dropdown-input ng-model-options="{ debounce: 1000 }" />
+                <p ng-show="note.info.cron" class="text-danger cron-info">
+                  {{note.info.cron}}
+                </p>
+              </div>
             </div>
           </li>
         </ul>


Mime
View raw message