You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/04/06 18:13:24 UTC
[1/2] brooklyn-ui git commit: Update placeholder text to make clear
that users can use drag & drop to add text files' content into the editor
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 7a8f96c4b -> 22b3e1023
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/fc4e814a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/fc4e814a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/fc4e814a
Branch: refs/heads/master
Commit: fc4e814a99925966c5b85e92d8d821176b64c36b
Parents: cbddc7f
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Wed Apr 6 15:49:40 2016 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Wed Apr 6 15:49:40 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/fc4e814a/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 db10181..854669d 100644
--- a/src/main/webapp/assets/js/view/editor.js
+++ b/src/main/webapp/assets/js/view/editor.js
@@ -204,7 +204,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/fc4e814a/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 b66dbd7..5659c89 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>
</div>
[2/2] brooklyn-ui git commit: This closes #24
Posted by al...@apache.org.
This closes #24
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/22b3e102
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/22b3e102
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/22b3e102
Branch: refs/heads/master
Commit: 22b3e102374b4286acd5ee4d7740954c14f2c476
Parents: 7a8f96c fc4e814
Author: Aled Sage <al...@gmail.com>
Authored: Wed Apr 6 17:13:14 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Apr 6 17:13:14 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/22b3e102/src/main/webapp/assets/js/view/editor.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/22b3e102/src/main/webapp/assets/tpl/editor/page.html
----------------------------------------------------------------------
diff --cc src/main/webapp/assets/tpl/editor/page.html
index 9c0c351,5659c89..7443e8f
--- a/src/main/webapp/assets/tpl/editor/page.html
+++ b/src/main/webapp/assets/tpl/editor/page.html
@@@ -57,9 -57,8 +57,9 @@@ 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>
</div>
<div class="navbar_main_wrapper" style="background-color: #f0f0f0 !important;">