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/06/05 10:37:06 UTC

incubator-zeppelin git commit: [ZEPPELIN-951] Update cron expression link and fix broken cron container style

Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 411b61210 -> 0ee329ff4


[ZEPPELIN-951] Update cron expression link and fix broken cron container style

### What is this PR for?
Update cron expression link and fix broken cron container style

### What type of PR is it?
Bug Fix

### What is the Jira issue?
ZEPPELIN-951

### Screenshots (if appropriate)
**Before**
<img width="429" alt="screen shot 2016-06-03 at 7 01 00 pm" src="https://cloud.githubusercontent.com/assets/8503346/15796973/e19a492a-29bd-11e6-89dd-cd69310e077d.png">

**After**
<img width="304" alt="screen shot 2016-06-03 at 7 00 39 pm" src="https://cloud.githubusercontent.com/assets/8503346/15796974/e73c4ac2-29bd-11e6-8f9a-0e95ab69d2a6.png">

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Mina Lee <mi...@nflabs.com>

Closes #959 from minahlee/ZEPPELIN-951 and squashes the following commits:

5a867d0 [Mina Lee] Update cron expression link and fix broken cron container style


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

Branch: refs/heads/master
Commit: 0ee329ff4387533781b77beffcf56c571c3ffe6f
Parents: 411b612
Author: Mina Lee <mi...@nflabs.com>
Authored: Fri Jun 3 19:02:12 2016 -0700
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Sun Jun 5 19:36:46 2016 +0900

----------------------------------------------------------------------
 zeppelin-web/src/app/notebook/notebook-actionBar.html | 2 +-
 zeppelin-web/src/app/notebook/notebook.css            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/0ee329ff/zeppelin-web/src/app/notebook/notebook-actionBar.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html
index df9fd9f..fc1932f 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -113,7 +113,7 @@ limitations under the License.
           <li>
             <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>.
+              Either choose from preset or write your own <a href="http://www.quartz-scheduler.org/documentation/quartz-2.1.x/tutorials/crontrigger" target=_blank>cron expression</a>.
               <div>
                 <span>- Preset</span>
                 <a class="cron-preset" ng-repeat="cr in cronOption"

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/0ee329ff/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 b128593..9169e80 100644
--- a/zeppelin-web/src/app/notebook/notebook.css
+++ b/zeppelin-web/src/app/notebook/notebook.css
@@ -200,6 +200,7 @@
   padding: 10px 20px 0 20px;
   font-weight: normal;
   word-wrap: break-word;
+  white-space: initial;
 }
 
 .cron-preset-container > div {