Repository: brooklyn-ui Updated Branches: refs/heads/0.9.0 288e2447e -> 34d196678
Update placeholder text to make clear that users can use drag & drop to add text files' content into the editor Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/34d19667 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/34d19667 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/34d19667 Branch: refs/heads/0.9.0 Commit: 34d196678a8ae37804c698413d4ef19b86719a8f Parents: 288e244 Author: Thomas Bouron <thomas.bou...@cloudsoftcorp.com> Authored: Wed Apr 6 15:49:40 2016 +0100 Committer: Aled Sage <aled.s...@gmail.com> Committed: Wed Apr 6 17:13:46 2016 +0100 ---------------------------------------------------------------------- src/main/webapp/assets/js/view/editor.js | 3 ++- src/main/webapp/assets/tpl/editor/page.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/34d19667/src/main/webapp/assets/js/view/editor.js ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/js/view/editor.js b/src/main/webapp/assets/js/view/editor.js index 72ce9f4..ef60250 100644 --- a/src/main/webapp/assets/js/view/editor.js +++ b/src/main/webapp/assets/js/view/editor.js @@ -222,7 +222,8 @@ define([ hintOptions: { completeSingle: false, // closeOnUnfocus: false, // handy for debugging - } + }, + placeholder: "How to use it?\n- Enter blueprint yaml here\n- Drag & drop text files here\n\nPress Ctrl+Space for completion." }); var oldYamlHint = CodeMirror.hint.yaml; var that = this; http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/34d19667/src/main/webapp/assets/tpl/editor/page.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/assets/tpl/editor/page.html b/src/main/webapp/assets/tpl/editor/page.html index 9c0c351..7443e8f 100644 --- a/src/main/webapp/assets/tpl/editor/page.html +++ b/src/main/webapp/assets/tpl/editor/page.html @@ -57,7 +57,7 @@ under the License. <div class="composer-toolbar"> <!-- the toolbar --> </div> - <textarea id="yaml_code" placeholder="# Enter blueprint yaml here. Press Ctrl+Space for completion." mode="yaml" class="code-textarea" style="height:760px; width:98%"></textarea> + <textarea id="yaml_code" mode="yaml" class="code-textarea" style="height:760px; width:98%"></textarea> </div> <div class="composer-editor-loading hide"><span>Loading item...</span></div> </div>