zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mina...@apache.org
Subject zeppelin git commit: [Zeppelin-1540] fix note url input placeholder
Date Mon, 17 Oct 2016 03:27:34 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.6 c6edc0b7c -> 11cbfd7b4


[Zeppelin-1540] fix note url input placeholder

Fix input form placeholder for `note url`

Improvement

* [x] - Task

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

go to import note menu -> add from url -> see input forms

Before:
<img width="593" alt="screen shot 2016-10-13 at 2 37 24 pm" src="https://cloud.githubusercontent.com/assets/1642088/19337731/9ea41248-9152-11e6-859b-757f44b2866a.png">

After:
<img width="601" alt="screen shot 2016-10-13 at 2 36 06 pm" src="https://cloud.githubusercontent.com/assets/1642088/19337716/7f90522c-9152-11e6-8ad2-cbfcdc241e10.png">

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

Author: Khalid Huseynov <khalidhnv@gmail.com>

Closes #1509 from khalidhuseynov/fix/note-import-placeholder and squashes the following commits:

c01b982 [Khalid Huseynov] note name -> note url

(cherry picked from commit 3afd4449ceefe98bd69c3886310b03c3dccc6412)
Signed-off-by: Mina Lee <minalee@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/11cbfd7b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/11cbfd7b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/11cbfd7b

Branch: refs/heads/branch-0.6
Commit: 11cbfd7b44afd2d4f4f72486318645ef35e26395
Parents: c6edc0b
Author: Khalid Huseynov <khalidhnv@gmail.com>
Authored: Thu Oct 13 14:26:58 2016 +0900
Committer: Mina Lee <minalee@apache.org>
Committed: Mon Oct 17 12:27:18 2016 +0900

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


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/11cbfd7b/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 93921da..7d05553 100644
--- a/zeppelin-web/src/components/noteName-import/note-import-dialog.html
+++ b/zeppelin-web/src/components/noteName-import/note-import-dialog.html
@@ -57,8 +57,8 @@ limitations under the License.
           <div class="form-group slide-right" ng-show="note.step2">
 
             <label for="noteImportUrl">URL</label>
-            <input placeholder="Note name" type="text" class="form-control" id="noteImportUrl"
-                   ng-model="note.importUrl">
+            <input placeholder="Note url" type="text" class="form-control" id="noteImportUrl"
+                   ng-model="note.importUrl" />
           </div>
 
         </div>


Mime
View raw message