zeppelin git commit: [ZEPPELIN-1550] fixed 'add from URL' button

[minalee]

Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.6 11cbfd7b4 -> dc016b91a


[ZEPPELIN-1550] fixed 'add from URL' button

fixed 'add from URL' button and disable backdrop function.

Bug Fix

None

[ZEPPELIN-1550](https://issues.apache.org/jira/browse/ZEPPELIN-1550)

click 'Import note' -> click 'Add from URL' -> click 'x' button -> open the 
dialog again -> it shows the URL page not the initial page.

 - before
![import_note_window](https://cloud.githubusercontent.com/assets/7574765/19379302/36a0fc12-922c-11e6-9018-c67893305005.gif)

 - after
![after_2](https://cloud.githubusercontent.com/assets/7574765/19379491/2c5a072a-922d-11e6-8804-55c9766b3c5c.gif)

* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: Yunho Maeng <yunho.maeng...@gmail.com>

Closes #1523 from yunho0130/ZEPPELIN-1550 and squashes the following commits:

a045928 [Yunho Maeng] fixed 'add from URL' button and disable backdrop fuction 
when user use modal window

(cherry picked from commit e5f211b7ba9c6282a3c50228ac913a174a830dbf)
Signed-off-by: Mina Lee <mina...@apache.org>

Conflicts:
        zeppelin-web/src/components/noteName-import/note-import-dialog.html


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

Branch: refs/heads/branch-0.6
Commit: dc016b91a92ec5ed17d8aa85192026cd5b8304ea
Parents: 11cbfd7
Author: Yunho Maeng <yunho.maeng...@gmail.com>
Authored: Fri Oct 14 16:29:52 2016 +0900
Committer: Mina Lee <mina...@apache.org>
Committed: Mon Oct 17 15:12:36 2016 +0900

----------------------------------------------------------------------
 .../src/components/noteName-import/note-import-dialog.html     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dc016b91/zeppelin-web/src/components/noteName-import/note-import-dialog.html
----------------------------------------------------------------------
diff --git 
a/zeppelin-web/src/components/noteName-import/note-import-dialog.html 
b/zeppelin-web/src/components/noteName-import/note-import-dialog.html
index 7d05553..e5a5c60 100644
--- a/zeppelin-web/src/components/noteName-import/note-import-dialog.html
+++ b/zeppelin-web/src/components/noteName-import/note-import-dialog.html
@@ -13,13 +13,15 @@ limitations under the License.
 -->
 
   <div id="noteImportModal" class="modal fade" role="dialog"
-       tabindex='-1'>
+       tabindex="-1" data-backdrop="static" data-keyboard="false">
     <div class="modal-dialog">
 
       <!-- Modal content-->
       <div class="modal-content" id="NoteImportCtrl" ng-init="NoteImportInit">
         <div class="modal-header">
-          <button type="button" class="close" 
data-dismiss="modal">&times;</button>
+          <!-- close button -->
+          <button type="button" class="close" data-dismiss="modal" 
ng-click="noteimportctrl.resetFlags()">&times;</button>
+
           <h4 class="modal-title">Import new note</h4>
         </div>
         <div class="modal-body">