From 0a7db2b08e59c52645c3ba229d6b7f8d5c245441 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@outlook.com>
Date: Tue, 14 Jul 2015 02:54:15 -0400
Subject: [PATCH 01/30] The user will be able to provide a name to note at
 creation time

---
 .../zeppelin/socket/NotebookServer.java       |  9 +++-
 zeppelin-web/src/app/home/home.html           |  2 +-
 .../src/components/navbar/navbar.html         |  2 +-
 .../noteName-create/note-name-dialog.html     | 28 +++++++++++++
 .../noteName-create/notename.controller.js    | 25 +++++++++++
 .../noteName-create/visible.directive.js      | 42 +++++++++++++++++++
 .../websocketEvents/websocketMsg.service.js   |  4 +-
 zeppelin-web/src/index.html                   |  3 ++
 8 files changed, 109 insertions(+), 6 deletions(-)
 create mode 100644 zeppelin-web/src/components/noteName-create/note-name-dialog.html
 create mode 100644 zeppelin-web/src/components/noteName-create/notename.controller.js
 create mode 100644 zeppelin-web/src/components/noteName-create/visible.directive.js

diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index 90a2a95e9f7..9a29996ccb3 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -101,7 +101,7 @@ public void onMessage(WebSocket conn, String msg) {
             sendNote(conn, notebook, messagereceived);
             break;
           case NEW_NOTE:
-            createNote(conn, notebook);
+            createNote(conn, notebook, messagereceived);
             break;
           case DEL_NOTE:
             removeNote(conn, notebook, messagereceived);
@@ -332,9 +332,14 @@ private boolean isCronUpdated(Map<String, Object> configA, Map<String, Object> c
     return cronUpdated;
   }
 
-  private void createNote(WebSocket conn, Notebook notebook) throws IOException {
+  private void createNote(WebSocket conn, Notebook notebook, Message message) throws IOException {
     Note note = notebook.createNote();
     note.addParagraph(); // it's an empty note. so add one paragraph
+    if (message != null) {
+      String noteName = (String) message.get("name");
+      if (noteName != null && !noteName.isEmpty())
+        note.setName(noteName);
+    }
     note.persist();
     broadcastNote(note);
     broadcastNoteList();
diff --git a/zeppelin-web/src/app/home/home.html b/zeppelin-web/src/app/home/home.html
index 9e7963c7dbd..81e7d2ec1fd 100644
--- a/zeppelin-web/src/app/home/home.html
+++ b/zeppelin-web/src/app/home/home.html
@@ -27,7 +27,7 @@ <h1 class="box-heading" id="welcome">
         <h4>Notebook</h4>
 
         <div>
-          <h5><a href="javascript:void(0);" ng-click="home.websocketMsgSrv.createNotebook()" style="text-decoration: none;">
+           <h5><a href="javascript:void(0);" data-toggle="modal" data-target="#noteNameModal" style="text-decoration: none;">
               <i style="font-size: 15px;" class="icon-notebook"></i> Create new note</a></h5>
           <ul style="list-style-type: none;">
             <li ng-repeat="note in home.notes.list track by $index"><i style="font-size: 10px;" class="icon-doc"></i>
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index ebdd1fb074e..bbdd618e9c1 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -29,7 +29,7 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle">Notebook <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
-            <li><a href="javascript:void(0);" ng-click="navbar.websocketMsgSrv.createNotebook()"><i class="fa fa-plus"></i> Create new note</a></li>
+            <li><a href="javascript:void(0);" data-toggle="modal" data-target="#noteNameModal"><i class="fa fa-plus"></i> Create new note</a></li>
             <li class="divider"></li>
             <div id="notebook-list" class="scrollbar-container">
               <li ng-repeat="note in navbar.notes.list track by $index" ng-class="{'active' : navbar.isActive(note.id)}">
diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
new file mode 100644
index 00000000000..e6c6b01064b
--- /dev/null
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -0,0 +1,28 @@
+<div ng-controller="NotenameCtrl as notenamectrl">
+  <div id="noteNameModal" class="modal fade" role="dialog" visible
+    tabindex='-1'>
+    <div class="modal-dialog">
+
+      <!-- Modal content-->
+      <div class="modal-content" id="NotenameCtrl">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal">&times;</button>
+          <h4 class="modal-title">Create new note</h4>
+        </div>
+        <div class="modal-body">
+          <div class="form-group">
+            <label for="noteName">Note Name</label> <input
+              placeholder="Note name" type="text" class="form-control"
+              id="noteName" ng-model="notename">
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" id="createNoteButton"
+            class="btn btn-default" ng-disabled="notename.length == 0"
+            data-dismiss="modal" ng-click="notenamectrl.createNote()">Create
+            Note</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
new file mode 100644
index 00000000000..4269f3bd09e
--- /dev/null
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -0,0 +1,25 @@
+/* global $:false */
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, $rootScope, websocketMsgSrv) {
+  var vm = this;
+  vm.websocketMsgSrv = websocketMsgSrv;
+  
+  vm.createNote = function(){
+	  vm.websocketMsgSrv.createNotebook($scope.notename);
+  }
+});
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js b/zeppelin-web/src/components/noteName-create/visible.directive.js
new file mode 100644
index 00000000000..0e48af3df7c
--- /dev/null
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -0,0 +1,42 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+'use strict';
+
+angular.module('zeppelinWebApp').directive('visible', function () {
+    return {
+        restrict: 'A',
+        link: function(scope, elem, attrs) {
+        	// Add some listeners
+        		$(elem).on('show.bs.modal',function(e) {
+        				var generatedName = generateName();
+        				scope.notename = 'note ' + generatedName;
+        				scope.$apply();
+        			});
+        		$(elem).on('shown.bs.modal', function(e) {
+        				$('#noteName').select();
+        		});
+        	function generateName() {
+    			var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+    					'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
+    					'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' ];
+    			var randIndex, name = '';
+    			for (var i = 0; i < 9; i++) {
+    				randIndex = Math.floor(Math.random() * 32);
+    				name += DICTIONARY[randIndex];
+    			}
+    			return name;
+        	}
+        }
+    };
+});
diff --git a/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js b/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
index 2c4f132241a..fcdc51f78f2 100644
--- a/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
+++ b/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
@@ -17,8 +17,8 @@ angular.module('zeppelinWebApp').service('websocketMsgSrv', function($rootScope,
 
   return {
 
-    createNotebook: function() {
-      websocketEvents.sendNewEvent({op: 'NEW_NOTE'});
+    createNotebook: function(noteName) {
+      websocketEvents.sendNewEvent({op: 'NEW_NOTE',data: {name: noteName}});
     },
 
     deleteNotebook: function(noteId) {
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index a647ae2be93..3c1933dcd81 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -61,6 +61,7 @@
     </div>
     <!-- Modal ::  Keyboard shortcuts -->
     <div ng-include src="'components/modal-shortcut/modal-shortcut.html'"></div>
+    <div id="note-modal-container" ng-include src="'components/noteName-create/note-name-dialog.html'"></div>
     <!-- build:js(.) scripts/oldieshim.js -->
     <!--[if lt IE 9]>
 <script src="bower_components/es5-shim/es5-shim.js"></script>
@@ -112,11 +113,13 @@
     <script src="app/interpreter/interpreter.controller.js"></script>
     <script src="app/notebook/paragraph/paragraph.controller.js"></script>
     <script src="components/navbar/navbar.controller.js"></script>
+    <script src="components/noteName-create/notename.controller.js"></script>
     <script src="components/ngdelete/ngdelete.directive.js"></script>
     <script src="components/popover-html-unsafe/popover-html-unsafe.directive.js"></script>
     <script src="components/ngenter/ngenter.directive.js"></script>
     <script src="components/dropdowninput/dropdowninput.directive.js"></script>
     <script src="components/resizable/resizable.directive.js"></script>
+    <script src="components/noteName-create/visible.directive.js"></script>
     <script src="components/websocketEvents/websocketMsg.service.js"></script>
     <script src="components/websocketEvents/websocketEvents.factory.js"></script>
     <script src="components/notebookListDataFactory/notebookList.datafactory.js"></script>

From 05d3af04dd18a5714a35de27ddfda251851ab0dc Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@outlook.com>
Date: Tue, 14 Jul 2015 03:11:40 -0400
Subject: [PATCH 02/30] When no name is given, note is created with default
 name

---
 .../src/components/noteName-create/note-name-dialog.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index e6c6b01064b..999653f7329 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -18,7 +18,7 @@ <h4 class="modal-title">Create new note</h4>
         </div>
         <div class="modal-footer">
           <button type="button" id="createNoteButton"
-            class="btn btn-default" ng-disabled="notename.length == 0"
+            class="btn btn-default"
             data-dismiss="modal" ng-click="notenamectrl.createNote()">Create
             Note</button>
         </div>

From f2cf950cc75fe0ea12525f05164e38bb6fd97d39 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 00:20:40 -0400
Subject: [PATCH 03/30] Add License header to new file that was added.

---
 .../noteName-create/note-name-dialog.html           | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index 999653f7329..b983b402356 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -1,3 +1,16 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <div ng-controller="NotenameCtrl as notenamectrl">
   <div id="noteNameModal" class="modal fade" role="dialog" visible
     tabindex='-1'>

From d9416dec5b5e567d1b2687f46b716ad7ecf92cac Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 16:16:55 +0530
Subject: [PATCH 04/30] Fixing tests

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index 779396cb917..90b4469e79c 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -286,7 +286,7 @@ private String createNewNoteAndGetName() {
       notebookTitles.add(el.getText());
     }
     
-    WebElement createNoteLink = driver.findElement(By.partialLinkText("Create new note"));
+    WebElement createNoteLink = driver.findElement(By.id("createNoteButton"));
     createNoteLink.click();
 
     try {

From caae8d23b4aeeb1ed57f64eac8fae09329119452 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 17:17:05 +0530
Subject: [PATCH 05/30] Fixing Test

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index 90b4469e79c..3f915a33dc5 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -286,8 +286,12 @@ private String createNewNoteAndGetName() {
       notebookTitles.add(el.getText());
     }
     
-    WebElement createNoteLink = driver.findElement(By.id("createNoteButton"));
+    WebElement createNoteLink = driver.findElement(By
+    		.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
     createNoteLink.click();
+    
+    WebElement createNoteButton = driver.findElement(By.id("createNoteButton"));
+    createNoteButton.click();
 
     try {
       Thread.sleep(500); // wait for notebook list updated

From 8eefcc02ac3970bfad29f424e3e236f2b2fe31de Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 19:15:24 +0530
Subject: [PATCH 06/30] Fix selenium test.

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index 3f915a33dc5..bb83a6d3b79 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -37,6 +37,7 @@
 import org.openqa.selenium.firefox.FirefoxProfile;
 import org.openqa.selenium.safari.SafariDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
 /**
@@ -289,9 +290,11 @@ private String createNewNoteAndGetName() {
     WebElement createNoteLink = driver.findElement(By
     		.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
     createNoteLink.click();
-    
-    WebElement createNoteButton = driver.findElement(By.id("createNoteButton"));
-    createNoteButton.click();
+
+	WebDriverWait block = new WebDriverWait(driver, 10);
+	WebElement createNoteButton = block
+			.until(ExpectedConditions.visibilityOfElementLocated(By.id("createNoteButton")));
+	createNoteButton.click();
 
     try {
       Thread.sleep(500); // wait for notebook list updated

From ea99cb065d545dd69fcca1dcd502932ced871975 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 22:01:03 +0530
Subject: [PATCH 07/30] test fix

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index bb83a6d3b79..cb1e8683603 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -287,13 +287,12 @@ private String createNewNoteAndGetName() {
       notebookTitles.add(el.getText());
     }
     
-    WebElement createNoteLink = driver.findElement(By
-    		.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
-    createNoteLink.click();
+	WebElement createNoteLink = driver.findElement(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
+	createNoteLink.click();
 
 	WebDriverWait block = new WebDriverWait(driver, 10);
-	WebElement createNoteButton = block
-			.until(ExpectedConditions.visibilityOfElementLocated(By.id("createNoteButton")));
+	WebElement modal = block.until(ExpectedConditions.visibilityOfElementLocated(By.id("noteNameModal")));
+	WebElement createNoteButton = modal.findElement(By.id("createNoteButton"));
 	createNoteButton.click();
 
     try {

From 307db0345fdac4f3013bce5e7d4ef7839ef16206 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayya@outlook.com>
Date: Thu, 16 Jul 2015 21:18:55 +0530
Subject: [PATCH 08/30] Selenium test fix

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index cb1e8683603..57eb99ec7a7 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -287,7 +287,7 @@ private String createNewNoteAndGetName() {
       notebookTitles.add(el.getText());
     }
     
-	WebElement createNoteLink = driver.findElement(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
+	WebElement createNoteLink = driver.findElement(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5/a"));
 	createNoteLink.click();
 
 	WebDriverWait block = new WebDriverWait(driver, 10);

From a05096bfd44ca013b0dc96de06d2164fd2f34252 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Fri, 17 Jul 2015 17:36:16 +0530
Subject: [PATCH 09/30] Removing a flag that is not required

---
 .../src/components/noteName-create/notename.controller.js        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
index 4269f3bd09e..e79c49fb1f4 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -1,4 +1,3 @@
-/* global $:false */
 /*
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From b9059db67589f9b80a6142c2bebedffe4dca5765 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Thu, 23 Jul 2015 11:00:51 +0530
Subject: [PATCH 10/30] *change directive name to be more specific. *Make
 directive generic by provisioning callbacks. *Make "note" to "Note"(in the
 generated name)

---
 .../noteName-create/note-name-dialog.html     |  4 +--
 .../noteName-create/notename.controller.js    | 19 +++++++++++
 .../noteName-create/visible.directive.js      | 32 +++++++------------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index b983b402356..ea06061ddf1 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -12,8 +12,8 @@
 limitations under the License.
 -->
 <div ng-controller="NotenameCtrl as notenamectrl">
-  <div id="noteNameModal" class="modal fade" role="dialog" visible
-    tabindex='-1'>
+  <div id="noteNameModal" class="modal fade" role="dialog" modalvisible previsiblecallback="preVisible()" 
+    postvisiblecallback="postVisible()" tabindex='-1'>
     <div class="modal-dialog">
 
       <!-- Modal content-->
diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
index e79c49fb1f4..8daeb5823af 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -21,4 +21,23 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, $ro
   vm.createNote = function(){
 	  vm.websocketMsgSrv.createNotebook($scope.notename);
   }
+  $scope.preVisible = function(){
+		var generatedName = vm.generateName();
+		$scope.notename = 'Note ' + generatedName;
+		$scope.$apply()
+  }
+  $scope.postVisible = function(){
+		$('#noteName').select();
+  }
+  vm.generateName = function () {
+		var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+				'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
+				'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' ];
+		var randIndex, name = '';
+		for (var i = 0; i < 9; i++) {
+			randIndex = Math.floor(Math.random() * 32);
+			name += DICTIONARY[randIndex];
+		}
+		return name;
+	}
 });
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js b/zeppelin-web/src/components/noteName-create/visible.directive.js
index 0e48af3df7c..5b4ea96a34b 100644
--- a/zeppelin-web/src/components/noteName-create/visible.directive.js
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -13,30 +13,22 @@
  */
 'use strict';
 
-angular.module('zeppelinWebApp').directive('visible', function () {
+angular.module('zeppelinWebApp').directive('modalvisible', function () {
     return {
         restrict: 'A',
+        scope: {
+        	preVisibleCallback: '&previsiblecallback',
+        	postVisibleCallback: '&postvisiblecallback'	},
         link: function(scope, elem, attrs) {
         	// Add some listeners
-        		$(elem).on('show.bs.modal',function(e) {
-        				var generatedName = generateName();
-        				scope.notename = 'note ' + generatedName;
-        				scope.$apply();
-        			});
-        		$(elem).on('shown.bs.modal', function(e) {
-        				$('#noteName').select();
-        		});
-        	function generateName() {
-    			var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
-    					'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
-    					'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' ];
-    			var randIndex, name = '';
-    			for (var i = 0; i < 9; i++) {
-    				randIndex = Math.floor(Math.random() * 32);
-    				name += DICTIONARY[randIndex];
-    			}
-    			return name;
-        	}
+    		var previsibleMethod = scope.preVisibleCallback;
+    		var postVisibleMethod = scope.postVisibleCallback;
+    		$(elem).on('show.bs.modal',function(e) {
+    			previsibleMethod();
+    		});
+    		$(elem).on('shown.bs.modal', function(e) {
+    			postVisibleMethod();
+    		});
         }
     };
 });

From ed3581183d35e938b6b792289e213581f5409730 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Thu, 23 Jul 2015 17:18:31 +0530
Subject: [PATCH 11/30] *Remove DOM maniupaltion  from controller

---
 .../src/components/noteName-create/note-name-dialog.html     | 4 ++--
 .../src/components/noteName-create/notename.controller.js    | 5 +----
 .../src/components/noteName-create/visible.directive.js      | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index ea06061ddf1..38a4d739791 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -12,8 +12,8 @@
 limitations under the License.
 -->
 <div ng-controller="NotenameCtrl as notenamectrl">
-  <div id="noteNameModal" class="modal fade" role="dialog" modalvisible previsiblecallback="preVisible()" 
-    postvisiblecallback="postVisible()" tabindex='-1'>
+  <div id="noteNameModal" class="modal fade" role="dialog" modalvisible previsiblecallback="notenamectrl.preVisible()" 
+    tabindex='-1'>
     <div class="modal-dialog">
 
       <!-- Modal content-->
diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
index 8daeb5823af..d486ea13863 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -21,14 +21,11 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, $ro
   vm.createNote = function(){
 	  vm.websocketMsgSrv.createNotebook($scope.notename);
   }
-  $scope.preVisible = function(){
+  vm.preVisible = function(){
 		var generatedName = vm.generateName();
 		$scope.notename = 'Note ' + generatedName;
 		$scope.$apply()
   }
-  $scope.postVisible = function(){
-		$('#noteName').select();
-  }
   vm.generateName = function () {
 		var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
 				'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js b/zeppelin-web/src/components/noteName-create/visible.directive.js
index 5b4ea96a34b..89be0ca6871 100644
--- a/zeppelin-web/src/components/noteName-create/visible.directive.js
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -27,6 +27,7 @@ angular.module('zeppelinWebApp').directive('modalvisible', function () {
     			previsibleMethod();
     		});
     		$(elem).on('shown.bs.modal', function(e) {
+    			$(e.target).find("#noteName").select()
     			postVisibleMethod();
     		});
         }

From 1199ac37cee521707e1109a347f9e83ca60f7239 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Mon, 27 Jul 2015 11:02:11 +0530
Subject: [PATCH 12/30] Browse seems to recognize "javascript:void(0)" as cross
 origin request. Removed it. We just need a pointer when we hover over "create
  new note". Fixed it.

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

diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index bbdd618e9c1..37a226dfad5 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -29,7 +29,7 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle">Notebook <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
-            <li><a href="javascript:void(0);" data-toggle="modal" data-target="#noteNameModal"><i class="fa fa-plus"></i> Create new note</a></li>
+            <li><a href="" data-toggle="modal" data-target="#noteNameModal"><i class="fa fa-plus"></i> Create new note</a></li>
             <li class="divider"></li>
             <div id="notebook-list" class="scrollbar-container">
               <li ng-repeat="note in navbar.notes.list track by $index" ng-class="{'active' : navbar.isActive(note.id)}">

From 3aa4eb559c6250efa7b8b2f6e626b3435c8abf98 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@outlook.com>
Date: Tue, 14 Jul 2015 02:54:15 -0400
Subject: [PATCH 13/30] The user will be able to provide a name to note at
 creation time

---
 .../zeppelin/socket/NotebookServer.java       |  9 +++-
 zeppelin-web/src/app/home/home.html           |  2 +-
 .../src/components/navbar/navbar.html         |  2 +-
 .../noteName-create/note-name-dialog.html     | 28 +++++++++++++
 .../noteName-create/notename.controller.js    | 25 +++++++++++
 .../noteName-create/visible.directive.js      | 42 +++++++++++++++++++
 .../websocketEvents/websocketMsg.service.js   |  4 +-
 zeppelin-web/src/index.html                   |  4 ++
 8 files changed, 110 insertions(+), 6 deletions(-)
 create mode 100644 zeppelin-web/src/components/noteName-create/note-name-dialog.html
 create mode 100644 zeppelin-web/src/components/noteName-create/notename.controller.js
 create mode 100644 zeppelin-web/src/components/noteName-create/visible.directive.js

diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index 90a2a95e9f7..9a29996ccb3 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -101,7 +101,7 @@ public void onMessage(WebSocket conn, String msg) {
             sendNote(conn, notebook, messagereceived);
             break;
           case NEW_NOTE:
-            createNote(conn, notebook);
+            createNote(conn, notebook, messagereceived);
             break;
           case DEL_NOTE:
             removeNote(conn, notebook, messagereceived);
@@ -332,9 +332,14 @@ private boolean isCronUpdated(Map<String, Object> configA, Map<String, Object> c
     return cronUpdated;
   }
 
-  private void createNote(WebSocket conn, Notebook notebook) throws IOException {
+  private void createNote(WebSocket conn, Notebook notebook, Message message) throws IOException {
     Note note = notebook.createNote();
     note.addParagraph(); // it's an empty note. so add one paragraph
+    if (message != null) {
+      String noteName = (String) message.get("name");
+      if (noteName != null && !noteName.isEmpty())
+        note.setName(noteName);
+    }
     note.persist();
     broadcastNote(note);
     broadcastNoteList();
diff --git a/zeppelin-web/src/app/home/home.html b/zeppelin-web/src/app/home/home.html
index 9e7963c7dbd..81e7d2ec1fd 100644
--- a/zeppelin-web/src/app/home/home.html
+++ b/zeppelin-web/src/app/home/home.html
@@ -27,7 +27,7 @@ <h1 class="box-heading" id="welcome">
         <h4>Notebook</h4>
 
         <div>
-          <h5><a href="javascript:void(0);" ng-click="home.websocketMsgSrv.createNotebook()" style="text-decoration: none;">
+           <h5><a href="javascript:void(0);" data-toggle="modal" data-target="#noteNameModal" style="text-decoration: none;">
               <i style="font-size: 15px;" class="icon-notebook"></i> Create new note</a></h5>
           <ul style="list-style-type: none;">
             <li ng-repeat="note in home.notes.list track by $index"><i style="font-size: 10px;" class="icon-doc"></i>
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index ebdd1fb074e..bbdd618e9c1 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -29,7 +29,7 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle">Notebook <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
-            <li><a href="javascript:void(0);" ng-click="navbar.websocketMsgSrv.createNotebook()"><i class="fa fa-plus"></i> Create new note</a></li>
+            <li><a href="javascript:void(0);" data-toggle="modal" data-target="#noteNameModal"><i class="fa fa-plus"></i> Create new note</a></li>
             <li class="divider"></li>
             <div id="notebook-list" class="scrollbar-container">
               <li ng-repeat="note in navbar.notes.list track by $index" ng-class="{'active' : navbar.isActive(note.id)}">
diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
new file mode 100644
index 00000000000..e6c6b01064b
--- /dev/null
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -0,0 +1,28 @@
+<div ng-controller="NotenameCtrl as notenamectrl">
+  <div id="noteNameModal" class="modal fade" role="dialog" visible
+    tabindex='-1'>
+    <div class="modal-dialog">
+
+      <!-- Modal content-->
+      <div class="modal-content" id="NotenameCtrl">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal">&times;</button>
+          <h4 class="modal-title">Create new note</h4>
+        </div>
+        <div class="modal-body">
+          <div class="form-group">
+            <label for="noteName">Note Name</label> <input
+              placeholder="Note name" type="text" class="form-control"
+              id="noteName" ng-model="notename">
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" id="createNoteButton"
+            class="btn btn-default" ng-disabled="notename.length == 0"
+            data-dismiss="modal" ng-click="notenamectrl.createNote()">Create
+            Note</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
new file mode 100644
index 00000000000..4269f3bd09e
--- /dev/null
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -0,0 +1,25 @@
+/* global $:false */
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, $rootScope, websocketMsgSrv) {
+  var vm = this;
+  vm.websocketMsgSrv = websocketMsgSrv;
+  
+  vm.createNote = function(){
+	  vm.websocketMsgSrv.createNotebook($scope.notename);
+  }
+});
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js b/zeppelin-web/src/components/noteName-create/visible.directive.js
new file mode 100644
index 00000000000..0e48af3df7c
--- /dev/null
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -0,0 +1,42 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+'use strict';
+
+angular.module('zeppelinWebApp').directive('visible', function () {
+    return {
+        restrict: 'A',
+        link: function(scope, elem, attrs) {
+        	// Add some listeners
+        		$(elem).on('show.bs.modal',function(e) {
+        				var generatedName = generateName();
+        				scope.notename = 'note ' + generatedName;
+        				scope.$apply();
+        			});
+        		$(elem).on('shown.bs.modal', function(e) {
+        				$('#noteName').select();
+        		});
+        	function generateName() {
+    			var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+    					'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
+    					'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' ];
+    			var randIndex, name = '';
+    			for (var i = 0; i < 9; i++) {
+    				randIndex = Math.floor(Math.random() * 32);
+    				name += DICTIONARY[randIndex];
+    			}
+    			return name;
+        	}
+        }
+    };
+});
diff --git a/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js b/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
index 2c4f132241a..fcdc51f78f2 100644
--- a/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
+++ b/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
@@ -17,8 +17,8 @@ angular.module('zeppelinWebApp').service('websocketMsgSrv', function($rootScope,
 
   return {
 
-    createNotebook: function() {
-      websocketEvents.sendNewEvent({op: 'NEW_NOTE'});
+    createNotebook: function(noteName) {
+      websocketEvents.sendNewEvent({op: 'NEW_NOTE',data: {name: noteName}});
     },
 
     deleteNotebook: function(noteId) {
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 36aa9335398..b98fe0e8a0c 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -61,6 +61,7 @@
     </div>
     <!-- Modal ::  Keyboard shortcuts -->
     <div ng-include src="'components/modal-shortcut/modal-shortcut.html'"></div>
+    <div id="note-modal-container" ng-include src="'components/noteName-create/note-name-dialog.html'"></div>
     <!-- build:js(.) scripts/oldieshim.js -->
     <!--[if lt IE 9]>
 <script src="bower_components/es5-shim/es5-shim.js"></script>
@@ -113,10 +114,13 @@
     <script src="app/notebook/paragraph/paragraph.controller.js"></script>
     <script src="components/navbar/navbar.controller.js"></script>
     <script src="components/ngescape/ngescape.directive.js"></script>
+    <script src="components/ngdelete/ngdelete.directive.js"></script>
+    <script src="components/noteName-create/notename.controller.js"></script>
     <script src="components/popover-html-unsafe/popover-html-unsafe.directive.js"></script>
     <script src="components/ngenter/ngenter.directive.js"></script>
     <script src="components/dropdowninput/dropdowninput.directive.js"></script>
     <script src="components/resizable/resizable.directive.js"></script>
+    <script src="components/noteName-create/visible.directive.js"></script>
     <script src="components/websocketEvents/websocketMsg.service.js"></script>
     <script src="components/websocketEvents/websocketEvents.factory.js"></script>
     <script src="components/notebookListDataFactory/notebookList.datafactory.js"></script>

From eb63ac43dd8e56aebca0bd246bec84193a77f3aa Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@outlook.com>
Date: Tue, 14 Jul 2015 03:11:40 -0400
Subject: [PATCH 14/30] When no name is given, note is created with default
 name

---
 .../src/components/noteName-create/note-name-dialog.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index e6c6b01064b..999653f7329 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -18,7 +18,7 @@ <h4 class="modal-title">Create new note</h4>
         </div>
         <div class="modal-footer">
           <button type="button" id="createNoteButton"
-            class="btn btn-default" ng-disabled="notename.length == 0"
+            class="btn btn-default"
             data-dismiss="modal" ng-click="notenamectrl.createNote()">Create
             Note</button>
         </div>

From 80e4995a28a1cad3aafdeca5dc5a604cc11d8908 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 00:20:40 -0400
Subject: [PATCH 15/30] Add License header to new file that was added.

---
 .../noteName-create/note-name-dialog.html           | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index 999653f7329..b983b402356 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -1,3 +1,16 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <div ng-controller="NotenameCtrl as notenamectrl">
   <div id="noteNameModal" class="modal fade" role="dialog" visible
     tabindex='-1'>

From 7206579340f52d395d4d000db3f78b889de68a37 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 16:16:55 +0530
Subject: [PATCH 16/30] Fixing tests

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index 779396cb917..90b4469e79c 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -286,7 +286,7 @@ private String createNewNoteAndGetName() {
       notebookTitles.add(el.getText());
     }
     
-    WebElement createNoteLink = driver.findElement(By.partialLinkText("Create new note"));
+    WebElement createNoteLink = driver.findElement(By.id("createNoteButton"));
     createNoteLink.click();
 
     try {

From 5a980c78a9415183a4143a779cd77d969de94312 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 17:17:05 +0530
Subject: [PATCH 17/30] Fixing Test

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index 90b4469e79c..3f915a33dc5 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -286,8 +286,12 @@ private String createNewNoteAndGetName() {
       notebookTitles.add(el.getText());
     }
     
-    WebElement createNoteLink = driver.findElement(By.id("createNoteButton"));
+    WebElement createNoteLink = driver.findElement(By
+    		.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
     createNoteLink.click();
+    
+    WebElement createNoteButton = driver.findElement(By.id("createNoteButton"));
+    createNoteButton.click();
 
     try {
       Thread.sleep(500); // wait for notebook list updated

From 03c382b9c00a8275d20520afc51658734a559bb0 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 19:15:24 +0530
Subject: [PATCH 18/30] Fix selenium test.

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index 3f915a33dc5..bb83a6d3b79 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -37,6 +37,7 @@
 import org.openqa.selenium.firefox.FirefoxProfile;
 import org.openqa.selenium.safari.SafariDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
 /**
@@ -289,9 +290,11 @@ private String createNewNoteAndGetName() {
     WebElement createNoteLink = driver.findElement(By
     		.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
     createNoteLink.click();
-    
-    WebElement createNoteButton = driver.findElement(By.id("createNoteButton"));
-    createNoteButton.click();
+
+	WebDriverWait block = new WebDriverWait(driver, 10);
+	WebElement createNoteButton = block
+			.until(ExpectedConditions.visibilityOfElementLocated(By.id("createNoteButton")));
+	createNoteButton.click();
 
     try {
       Thread.sleep(500); // wait for notebook list updated

From 4c8f42217706ef6461217adde67e83c5696afb0b Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Wed, 15 Jul 2015 22:01:03 +0530
Subject: [PATCH 19/30] test fix

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index bb83a6d3b79..cb1e8683603 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -287,13 +287,12 @@ private String createNewNoteAndGetName() {
       notebookTitles.add(el.getText());
     }
     
-    WebElement createNoteLink = driver.findElement(By
-    		.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
-    createNoteLink.click();
+	WebElement createNoteLink = driver.findElement(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
+	createNoteLink.click();
 
 	WebDriverWait block = new WebDriverWait(driver, 10);
-	WebElement createNoteButton = block
-			.until(ExpectedConditions.visibilityOfElementLocated(By.id("createNoteButton")));
+	WebElement modal = block.until(ExpectedConditions.visibilityOfElementLocated(By.id("noteNameModal")));
+	WebElement createNoteButton = modal.findElement(By.id("createNoteButton"));
 	createNoteButton.click();
 
     try {

From 9b8db92da9791cfa0964bd95fee65086513a82c3 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayya@outlook.com>
Date: Thu, 16 Jul 2015 21:18:55 +0530
Subject: [PATCH 20/30] Selenium test fix

---
 .../src/test/java/org/apache/zeppelin/ZeppelinIT.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
index cb1e8683603..57eb99ec7a7 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
@@ -287,7 +287,7 @@ private String createNewNoteAndGetName() {
       notebookTitles.add(el.getText());
     }
     
-	WebElement createNoteLink = driver.findElement(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5"));
+	WebElement createNoteLink = driver.findElement(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5/a"));
 	createNoteLink.click();
 
 	WebDriverWait block = new WebDriverWait(driver, 10);

From d8403f10c99446235cf012d03a7d67a43e1351de Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Fri, 17 Jul 2015 17:36:16 +0530
Subject: [PATCH 21/30] Removing a flag that is not required

---
 .../src/components/noteName-create/notename.controller.js        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
index 4269f3bd09e..e79c49fb1f4 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -1,4 +1,3 @@
-/* global $:false */
 /*
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 6d61425f35bed56d4e625a32966d6efcee30d1ef Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Thu, 23 Jul 2015 11:00:51 +0530
Subject: [PATCH 22/30] *change directive name to be more specific. *Make
 directive generic by provisioning callbacks. *Make "note" to "Note"(in the
 generated name)

---
 .../noteName-create/note-name-dialog.html     |  4 +--
 .../noteName-create/notename.controller.js    | 19 +++++++++++
 .../noteName-create/visible.directive.js      | 32 +++++++------------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index b983b402356..ea06061ddf1 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -12,8 +12,8 @@
 limitations under the License.
 -->
 <div ng-controller="NotenameCtrl as notenamectrl">
-  <div id="noteNameModal" class="modal fade" role="dialog" visible
-    tabindex='-1'>
+  <div id="noteNameModal" class="modal fade" role="dialog" modalvisible previsiblecallback="preVisible()" 
+    postvisiblecallback="postVisible()" tabindex='-1'>
     <div class="modal-dialog">
 
       <!-- Modal content-->
diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
index e79c49fb1f4..8daeb5823af 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -21,4 +21,23 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, $ro
   vm.createNote = function(){
 	  vm.websocketMsgSrv.createNotebook($scope.notename);
   }
+  $scope.preVisible = function(){
+		var generatedName = vm.generateName();
+		$scope.notename = 'Note ' + generatedName;
+		$scope.$apply()
+  }
+  $scope.postVisible = function(){
+		$('#noteName').select();
+  }
+  vm.generateName = function () {
+		var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+				'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
+				'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' ];
+		var randIndex, name = '';
+		for (var i = 0; i < 9; i++) {
+			randIndex = Math.floor(Math.random() * 32);
+			name += DICTIONARY[randIndex];
+		}
+		return name;
+	}
 });
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js b/zeppelin-web/src/components/noteName-create/visible.directive.js
index 0e48af3df7c..5b4ea96a34b 100644
--- a/zeppelin-web/src/components/noteName-create/visible.directive.js
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -13,30 +13,22 @@
  */
 'use strict';
 
-angular.module('zeppelinWebApp').directive('visible', function () {
+angular.module('zeppelinWebApp').directive('modalvisible', function () {
     return {
         restrict: 'A',
+        scope: {
+        	preVisibleCallback: '&previsiblecallback',
+        	postVisibleCallback: '&postvisiblecallback'	},
         link: function(scope, elem, attrs) {
         	// Add some listeners
-        		$(elem).on('show.bs.modal',function(e) {
-        				var generatedName = generateName();
-        				scope.notename = 'note ' + generatedName;
-        				scope.$apply();
-        			});
-        		$(elem).on('shown.bs.modal', function(e) {
-        				$('#noteName').select();
-        		});
-        	function generateName() {
-    			var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
-    					'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
-    					'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' ];
-    			var randIndex, name = '';
-    			for (var i = 0; i < 9; i++) {
-    				randIndex = Math.floor(Math.random() * 32);
-    				name += DICTIONARY[randIndex];
-    			}
-    			return name;
-        	}
+    		var previsibleMethod = scope.preVisibleCallback;
+    		var postVisibleMethod = scope.postVisibleCallback;
+    		$(elem).on('show.bs.modal',function(e) {
+    			previsibleMethod();
+    		});
+    		$(elem).on('shown.bs.modal', function(e) {
+    			postVisibleMethod();
+    		});
         }
     };
 });

From 9ae1431be57629bdf7c716f6483c43e6b180cf2c Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Thu, 23 Jul 2015 17:18:31 +0530
Subject: [PATCH 23/30] *Remove DOM maniupaltion  from controller

---
 .../src/components/noteName-create/note-name-dialog.html     | 4 ++--
 .../src/components/noteName-create/notename.controller.js    | 5 +----
 .../src/components/noteName-create/visible.directive.js      | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index ea06061ddf1..38a4d739791 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -12,8 +12,8 @@
 limitations under the License.
 -->
 <div ng-controller="NotenameCtrl as notenamectrl">
-  <div id="noteNameModal" class="modal fade" role="dialog" modalvisible previsiblecallback="preVisible()" 
-    postvisiblecallback="postVisible()" tabindex='-1'>
+  <div id="noteNameModal" class="modal fade" role="dialog" modalvisible previsiblecallback="notenamectrl.preVisible()" 
+    tabindex='-1'>
     <div class="modal-dialog">
 
       <!-- Modal content-->
diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
index 8daeb5823af..d486ea13863 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -21,14 +21,11 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, $ro
   vm.createNote = function(){
 	  vm.websocketMsgSrv.createNotebook($scope.notename);
   }
-  $scope.preVisible = function(){
+  vm.preVisible = function(){
 		var generatedName = vm.generateName();
 		$scope.notename = 'Note ' + generatedName;
 		$scope.$apply()
   }
-  $scope.postVisible = function(){
-		$('#noteName').select();
-  }
   vm.generateName = function () {
 		var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
 				'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js b/zeppelin-web/src/components/noteName-create/visible.directive.js
index 5b4ea96a34b..89be0ca6871 100644
--- a/zeppelin-web/src/components/noteName-create/visible.directive.js
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -27,6 +27,7 @@ angular.module('zeppelinWebApp').directive('modalvisible', function () {
     			previsibleMethod();
     		});
     		$(elem).on('shown.bs.modal', function(e) {
+    			$(e.target).find("#noteName").select()
     			postVisibleMethod();
     		});
         }

From 606282aaec74abd4da96a084f7f174ab1dd0bdcd Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Mon, 27 Jul 2015 11:02:11 +0530
Subject: [PATCH 24/30] Browse seems to recognize "javascript:void(0)" as cross
 origin request. Removed it. We just need a pointer when we hover over "create
  new note". Fixed it.

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

diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index bbdd618e9c1..37a226dfad5 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -29,7 +29,7 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle">Notebook <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
-            <li><a href="javascript:void(0);" data-toggle="modal" data-target="#noteNameModal"><i class="fa fa-plus"></i> Create new note</a></li>
+            <li><a href="" data-toggle="modal" data-target="#noteNameModal"><i class="fa fa-plus"></i> Create new note</a></li>
             <li class="divider"></li>
             <div id="notebook-list" class="scrollbar-container">
               <li ng-repeat="note in navbar.notes.list track by $index" ng-class="{'active' : navbar.isActive(note.id)}">

From 58b1c43a9428394baf5c026f9ae62cb067569967 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Tue, 28 Jul 2015 12:24:29 +0530
Subject: [PATCH 25/30] Removing duplicate entry

---
 zeppelin-web/src/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 756dc0492c6..1a6eda2b5bc 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -113,7 +113,6 @@
     <script src="app/interpreter/interpreter.controller.js"></script>
     <script src="app/notebook/paragraph/paragraph.controller.js"></script>
     <script src="components/navbar/navbar.controller.js"></script>
-    <script src="components/noteName-create/notename.controller.js"></script>
     <script src="components/ngdelete/ngdelete.directive.js"></script>
     <script src="components/ngescape/ngescape.directive.js"></script>
     <script src="components/ngdelete/ngdelete.directive.js"></script>

From 4aba3160e2bf0ef557488222c25a11e55e9e63cc Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Tue, 28 Jul 2015 12:25:59 +0530
Subject: [PATCH 26/30] Removing duplicate entry

---
 zeppelin-web/src/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 1a6eda2b5bc..c13e4055472 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -115,7 +115,6 @@
     <script src="components/navbar/navbar.controller.js"></script>
     <script src="components/ngdelete/ngdelete.directive.js"></script>
     <script src="components/ngescape/ngescape.directive.js"></script>
-    <script src="components/ngdelete/ngdelete.directive.js"></script>
     <script src="components/noteName-create/notename.controller.js"></script>
     <script src="components/popover-html-unsafe/popover-html-unsafe.directive.js"></script>
     <script src="components/ngenter/ngenter.directive.js"></script>

From 98d6cfa84361e82d0af0ba655b1fcc906021ff3b Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Tue, 28 Jul 2015 14:11:40 +0530
Subject: [PATCH 27/30] Fixing a bad merge

---
 zeppelin-web/src/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index c13e4055472..a65c9446f60 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -113,7 +113,6 @@
     <script src="app/interpreter/interpreter.controller.js"></script>
     <script src="app/notebook/paragraph/paragraph.controller.js"></script>
     <script src="components/navbar/navbar.controller.js"></script>
-    <script src="components/ngdelete/ngdelete.directive.js"></script>
     <script src="components/ngescape/ngescape.directive.js"></script>
     <script src="components/noteName-create/notename.controller.js"></script>
     <script src="components/popover-html-unsafe/popover-html-unsafe.directive.js"></script>

From ca4357c23810ae5abeceb4dc546d7fb8383f7e5b Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Tue, 28 Jul 2015 15:16:18 +0530
Subject: [PATCH 28/30] Fix build time js warnings

---
 .../src/components/noteName-create/notename.controller.js | 8 ++++----
 .../src/components/noteName-create/visible.directive.js   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
index d486ea13863..3f0e82d1518 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -20,12 +20,12 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, $ro
   
   vm.createNote = function(){
 	  vm.websocketMsgSrv.createNotebook($scope.notename);
-  }
+  };
   vm.preVisible = function(){
 		var generatedName = vm.generateName();
 		$scope.notename = 'Note ' + generatedName;
-		$scope.$apply()
-  }
+		$scope.$apply();
+  };
   vm.generateName = function () {
 		var DICTIONARY = [ '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
 				'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'M', 'N', 'P', 'Q', 'R',
@@ -36,5 +36,5 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, $ro
 			name += DICTIONARY[randIndex];
 		}
 		return name;
-	}
+	};
 });
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js b/zeppelin-web/src/components/noteName-create/visible.directive.js
index 89be0ca6871..cce092e0fff 100644
--- a/zeppelin-web/src/components/noteName-create/visible.directive.js
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -23,11 +23,11 @@ angular.module('zeppelinWebApp').directive('modalvisible', function () {
         	// Add some listeners
     		var previsibleMethod = scope.preVisibleCallback;
     		var postVisibleMethod = scope.postVisibleCallback;
-    		$(elem).on('show.bs.modal',function(e) {
+    		elem.on('show.bs.modal',function(e) {
     			previsibleMethod();
     		});
-    		$(elem).on('shown.bs.modal', function(e) {
-    			$(e.target).find("#noteName").select()
+    		elem.on('shown.bs.modal', function(e) {
+    			$(e.target).find('#noteName').select();
     			postVisibleMethod();
     		});
         }

From d6f30ddd0d746737d867dc7f6846617d16febaed Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayyar@qubole.com>
Date: Sun, 2 Aug 2015 17:56:20 +0530
Subject: [PATCH 29/30] Allow configuring the id of the input , whose text
 should be selected. If not id is passed, text will not be selected

---
 .../src/components/noteName-create/note-name-dialog.html | 2 +-
 .../src/components/noteName-create/visible.directive.js  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index 38a4d739791..e7670f989a1 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -13,7 +13,7 @@
 -->
 <div ng-controller="NotenameCtrl as notenamectrl">
   <div id="noteNameModal" class="modal fade" role="dialog" modalvisible previsiblecallback="notenamectrl.preVisible()" 
-    tabindex='-1'>
+    targetinput="noteName" tabindex='-1'>
     <div class="modal-dialog">
 
       <!-- Modal content-->
diff --git a/zeppelin-web/src/components/noteName-create/visible.directive.js b/zeppelin-web/src/components/noteName-create/visible.directive.js
index cce092e0fff..8d3e9a16866 100644
--- a/zeppelin-web/src/components/noteName-create/visible.directive.js
+++ b/zeppelin-web/src/components/noteName-create/visible.directive.js
@@ -17,8 +17,10 @@ angular.module('zeppelinWebApp').directive('modalvisible', function () {
     return {
         restrict: 'A',
         scope: {
-        	preVisibleCallback: '&previsiblecallback',
-        	postVisibleCallback: '&postvisiblecallback'	},
+	        	preVisibleCallback: '&previsiblecallback',
+	        	postVisibleCallback: '&postvisiblecallback',
+	        	targetinput: '@targetinput'
+        	   },
         link: function(scope, elem, attrs) {
         	// Add some listeners
     		var previsibleMethod = scope.preVisibleCallback;
@@ -27,7 +29,8 @@ angular.module('zeppelinWebApp').directive('modalvisible', function () {
     			previsibleMethod();
     		});
     		elem.on('shown.bs.modal', function(e) {
-    			$(e.target).find('#noteName').select();
+    			if(scope.targetinput)
+    			  $(e.target).find('input#' + scope.targetinput ).select();
     			postVisibleMethod();
     		});
         }

From 02e60732288d3dcf2ba937e274322db3d3bd3e35 Mon Sep 17 00:00:00 2001
From: Karuppayya <karuppayya@outlook.com>
Date: Sun, 9 Aug 2015 11:38:47 +0530
Subject: [PATCH 30/30] Fix js error

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

diff --git a/zeppelin-web/src/app/home/home.html b/zeppelin-web/src/app/home/home.html
index 81e7d2ec1fd..b3991ae7864 100644
--- a/zeppelin-web/src/app/home/home.html
+++ b/zeppelin-web/src/app/home/home.html
@@ -27,7 +27,7 @@ <h1 class="box-heading" id="welcome">
         <h4>Notebook</h4>
 
         <div>
-           <h5><a href="javascript:void(0);" data-toggle="modal" data-target="#noteNameModal" style="text-decoration: none;">
+           <h5><a href="" data-toggle="modal" data-target="#noteNameModal" style="text-decoration: none;">
               <i style="font-size: 15px;" class="icon-notebook"></i> Create new note</a></h5>
           <ul style="list-style-type: none;">
             <li ng-repeat="note in home.notes.list track by $index"><i style="font-size: 10px;" class="icon-doc"></i>