Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix more lines unchanged

Browse source
This commit is contained in:
hyonzin 2016-10-19 16:19:45 +09:00
parent 070bc2ddd1
commit 09bacd82c7
13 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/install/install.md
View file

@ -311,13 +311,13 @@ You can configure Apache Zeppelin with either **environment variables** in `conf
<td>ZEPPELIN_NOTEBOOK_HOMESCREEN</td>
<td>zeppelin.notebook.homescreen</td>
<td></td>
<td>Display notebook IDs on the Apache Zeppelin homescreen <br />i.e. 2A94M5J1Z</td>
<td>Display note IDs on the Apache Zeppelin homescreen <br />i.e. 2A94M5J1Z</td>
</tr>
<tr>
<td>ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE</td>
<td>zeppelin.notebook.homescreen.hide</td>
<td>false</td>
<td>Hide the notebook ID set by <code>ZEPPELIN_NOTEBOOK_HOMESCREEN</code> on the Apache Zeppelin homescreen. <br />For the further information, please read <a href="../manual/notebookashomepage.html">Customize your Zeppelin homepage</a>.</td>
<td>Hide the note ID set by <code>ZEPPELIN_NOTEBOOK_HOMESCREEN</code> on the Apache Zeppelin homescreen. <br />For the further information, please read <a href="../manual/notebookashomepage.html">Customize your Zeppelin homepage</a>.</td>
</tr>
<tr>
<td>ZEPPELIN_WAR_TEMPDIR</td>

2
docs/install/virtual_machine.md
View file

@ -163,7 +163,7 @@ import matplotlib.pyplot as plt
import numpy as np
import StringIO
# clear out any previous plots on this notebook
# clear out any previous plots on this note
plt.clf()
def show(p):

8
docs/manual/notebookashomepage.md
View file

@ -31,7 +31,7 @@ With that you can brand your Zeppelin installation, adjust the instruction to yo
The process for creating your homepage is very simple as shown below:
1. Create a notebook using Zeppelin
2. Set the notebook id in the config file
2. Set the note id in the config file
3. Restart Zeppelin
### Create a notebook using Zeppelin
@ -43,13 +43,13 @@ Angular ([backend API](../displaysystem/back-end-angular.html), [frontend API](.
Run (shift+Enter) the notebook and see the output. Optionally, change the notebook view to report to hide
the code sections.
### Set the notebook id in the config file
To set the notebook id in the config file, you should copy it from the last word in the notebook url.
### Set the note id in the config file
To set the note id in the config file, you should copy it from the last word in the notebook url.
For example,
<img src="/assets/themes/zeppelin/img/screenshots/homepage_notebook_id.png" width="400px" />
Set the notebook id to the ```ZEPPELIN_NOTEBOOK_HOMESCREEN``` environment variable
Set the note id to the ```ZEPPELIN_NOTEBOOK_HOMESCREEN``` environment variable
or ```zeppelin.notebook.homescreen``` property.
You can also set the ```ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE``` environment variable

20
docs/rest-api/rest-notebook.md
View file

@ -83,7 +83,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<tr>
<td>Description</td>
<td>This ```POST``` method creates a new notebook using the given name or default name if none given.
The body field of the returned JSON contains the new notebook id.
The body field of the returned JSON contains the new note id.
</td>
</tr>
<tr>
@ -233,7 +233,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<col width="200">
<tr>
<td>Description</td>
<td>This ```DELETE``` method deletes a notebook by the given notebook id.
<td>This ```DELETE``` method deletes a notebook by the given note id.
</td>
</tr>
<tr>
@ -262,7 +262,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<td>Description</td>
<td>This ```POST``` method clones a notebook by the given id and create a new notebook using the given name
or default name if none given.
The body field of the returned JSON contains the new notebook id.
The body field of the returned JSON contains the new note id.
</td>
</tr>
<tr>
@ -299,8 +299,8 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<tr>
<td>Description</td>
<td>
This ```POST``` method runs all paragraphs in the given notebook id. <br />
If you can not find Notebook id 404 returns.
This ```POST``` method runs all paragraphs in the given note id. <br />
If you can not find Note id 404 returns.
If there is a problem with the interpreter returns a 412 error.
</td>
</tr>
@ -345,7 +345,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<col width="200">
<tr>
<td>Description</td>
<td>This ```DELETE``` method stops all paragraphs in the given notebook id.
<td>This ```DELETE``` method stops all paragraphs in the given note id.
</td>
</tr>
<tr>
@ -372,7 +372,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<col width="200">
<tr>
<td>Description</td>
<td>This ```GET``` method gets the status of all paragraphs by the given notebook id.
<td>This ```GET``` method gets the status of all paragraphs by the given note id.
The body field of the returned JSON contains of the array that compose of the paragraph id, paragraph status, paragraph finish date, paragraph started date.
</td>
</tr>
@ -570,7 +570,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<col width="200">
<tr>
<td>Description</td>
<td>This ```POST``` method adds cron job by the given notebook id.
<td>This ```POST``` method adds cron job by the given note id.
</td>
</tr>
<tr>
@ -602,7 +602,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<col width="200">
<tr>
<td>Description</td>
<td>This ```DELETE``` method removes cron job by the given notebook id.
<td>This ```DELETE``` method removes cron job by the given note id.
</td>
</tr>
<tr>
@ -630,7 +630,7 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<col width="200">
<tr>
<td>Description</td>
<td>This ```GET``` method gets cron job expression of given notebook id.
<td>This ```GET``` method gets cron job expression of given note id.
The body field of the returned JSON contains the cron expression.
</td>
</tr>

2
scripts/vagrant/zeppelin-dev/README.md
View file

@ -140,7 +140,7 @@ import matplotlib.pyplot as plt
import numpy as np
import StringIO
# clear out any previous plots on this notebook
# clear out any previous plots on this note
plt.clf()
def show(p):

2
zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala
View file

@ -71,7 +71,7 @@ object AngularElem {
}
/**
* Disassociate (remove) all angular object in this notebook
* Disassociate (remove) all angular object in this note
*/
def disassociate() = {
val ic = InterpreterContext.get

2
zeppelin-display/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala
View file

@ -73,7 +73,7 @@ object AngularElem {
}
/**
* Disassociate (remove) all angular object in this notebook
* Disassociate (remove) all angular object in this note
*/
def disassociate() = {
val ic = InterpreterContext.get

2
zeppelin-server/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java
View file

@ -122,7 +122,7 @@ abstract public class AbstractZeppelinIT {
driver.findElement(By.xpath(".//*[@id='main']//button[@ng-click='removeNote(note.id)']"))
.sendKeys(Keys.ENTER);
ZeppelinITUtils.sleep(1000, true);
driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this notebook')]" +
driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this note')]" +
"//div[@class='modal-footer']//button[contains(.,'OK')]")).click();
ZeppelinITUtils.sleep(100, true);
}

8
zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java
View file

@ -180,7 +180,7 @@ public class AuthenticationIT extends AbstractZeppelinIT {
try {
WebElement element = pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"),
MAX_BROWSER_TIMEOUT_SEC);
collector.checkThat("Check is user has permission to view this notebook link", false,
collector.checkThat("Check is user has permission to view this note link", false,
CoreMatchers.equalTo(element.isDisplayed()));
} catch (Exception e) {
//This should have failed, nothing to worry.
@ -191,7 +191,7 @@ public class AuthenticationIT extends AbstractZeppelinIT {
List<WebElement> privilegesModal = driver.findElements(
By.xpath("//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" +
"//div[contains(.,'Insufficient privileges')]"));
collector.checkThat("Check is user has permission to view this notebook", 1,
collector.checkThat("Check is user has permission to view this note", 1,
CoreMatchers.equalTo(privilegesModal.size()));
driver.findElement(
By.xpath("//div[@class='modal-content'][contains(.,'Insufficient privileges')]" +
@ -202,7 +202,7 @@ public class AuthenticationIT extends AbstractZeppelinIT {
try {
WebElement element = pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"),
MAX_BROWSER_TIMEOUT_SEC);
collector.checkThat("Check is user has permission to view this notebook link", false,
collector.checkThat("Check is user has permission to view this note link", false,
CoreMatchers.equalTo(element.isDisplayed()));
} catch (Exception e) {
//This should have failed, nothing to worry.
@ -213,7 +213,7 @@ public class AuthenticationIT extends AbstractZeppelinIT {
privilegesModal = driver.findElements(
By.xpath("//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" +
"//div[contains(.,'Insufficient privileges')]"));
collector.checkThat("Check is user has permission to view this notebook", 0,
collector.checkThat("Check is user has permission to view this note", 0,
CoreMatchers.equalTo(privilegesModal.size()));
deleteTestNotebook(driver);
authenticationIT.logoutUser("finance2");

2
zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java
View file

@ -182,7 +182,7 @@ public class ZeppelinIT extends AbstractZeppelinIT {
driver.findElement(By.xpath(".//*[@id='main']//button[@ng-click='removeNote(note.id)']"))
.sendKeys(Keys.ENTER);
ZeppelinITUtils.sleep(1000, true);
driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this notebook')]" +
driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this note')]" +
"//div[@class='modal-footer']//button[contains(.,'OK')]")).click();
ZeppelinITUtils.sleep(100, true);

4
zeppelin-web/src/app/notebook/notebook.controller.js
View file

@ -145,7 +145,7 @@
BootstrapDialog.confirm({
closable: true,
title: '',
message: 'Do you want to delete this notebook?',
message: 'Do you want to delete this note?',
callback: function(result) {
if (result) {
websocketMsgSrv.deleteNote(noteId);
@ -166,7 +166,7 @@
BootstrapDialog.confirm({
closable: true,
title: '',
message: 'Do you want to clone this notebook?',
message: 'Do you want to clone this note?',
callback: function(result) {
if (result) {
websocketMsgSrv.cloneNote(noteId);

2
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
View file

@ -196,7 +196,7 @@ public class Notebook implements NoteEventListener {
*
* @param sourceJson - the note JSON to import
* @param noteName - the name of the new note
* @return notebook ID
* @return note ID
* @throws IOException
*/
public Note importNote(String sourceJson, String noteName, AuthenticationInfo subject)

2
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepo.java
View file

@ -39,7 +39,7 @@ public interface NotebookRepo {
/**
* Get the notebook with the given id.
* @param noteId is notebook id.
* @param noteId is note id.
* @param subject contains user information.
* @return
* @throws IOException