brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject brooklyn-ui git commit: rename "Open in Composer" as "YAML Composer" for continuity
Date Sun, 21 Feb 2016 18:46:06 GMT
Repository: brooklyn-ui
Updated Branches:
  refs/heads/master 68fb22627 -> 22ddab78f


rename "Open in Composer" as "YAML Composer" for continuity

and add hover title instructions


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/22ddab78
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/22ddab78
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/22ddab78

Branch: refs/heads/master
Commit: 22ddab78f059fbdc7b8d37ee0b0addc470804460
Parents: 68fb226
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Sun Feb 21 10:45:42 2016 -0800
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Sun Feb 21 10:45:42 2016 -0800

----------------------------------------------------------------------
 src/main/webapp/assets/js/view/application-add-wizard.js    | 4 ++--
 src/main/webapp/assets/tpl/app-add-wizard/modal-wizard.html | 9 ++++++---
 src/main/webapp/assets/tpl/catalog/details-entity.html      | 3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/22ddab78/src/main/webapp/assets/js/view/application-add-wizard.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/js/view/application-add-wizard.js b/src/main/webapp/assets/js/view/application-add-wizard.js
index f57023a..e38f6b4 100644
--- a/src/main/webapp/assets/js/view/application-add-wizard.js
+++ b/src/main/webapp/assets/js/view/application-add-wizard.js
@@ -20,7 +20,7 @@
 /**
  * Supplies a modal (wizardy) with a list of apps a user can pick.
  * Templates (items with yaml and with a location) go to composer, 
- * other items (java, or yaml without a location) go to next *or* open in composer. 
+ * other items (java, or yaml without a location) go to next *or* yaml composer. 
  */
  
 define([
@@ -208,7 +208,7 @@ define([
                 }
             }
             
-            // preview (aka "Open in Composer") enabled and shown always
+            // preview (aka "YAML Composer") enabled and shown always
             setVisibility(this.$("#preview_step"), true);
             setEnablement(this.$("#preview_step"), true)
             

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/22ddab78/src/main/webapp/assets/tpl/app-add-wizard/modal-wizard.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/tpl/app-add-wizard/modal-wizard.html b/src/main/webapp/assets/tpl/app-add-wizard/modal-wizard.html
index 5276ae4..c7ec1de 100644
--- a/src/main/webapp/assets/tpl/app-add-wizard/modal-wizard.html
+++ b/src/main/webapp/assets/tpl/app-add-wizard/modal-wizard.html
@@ -29,7 +29,10 @@ under the License.
 
 <div class="modal-footer">
     <button id="prev_step" type="button button-previous" class="btn btn-mini btn-info">Back</button>
-    <button id="preview_step" type="button button-preview" class="btn btn-mini btn-info">Open
in Composer</button>
-    <button id="next_step" type="button button-next" class="btn btn-mini btn-info">Next</button>
-    <button id="finish_step" type="button button-finish" class="btn btn-mini btn-info">Deploy</button>
+    <button id="preview_step" type="button button-preview" class="btn btn-mini btn-info"
+        title="Go to the Composer view where the YAML code for the blueprint can be edited.
If an item is selected the Composer will be pre-populated with its YAML.">YAML Composer</button>
+    <button id="next_step" type="button button-next" class="btn btn-mini btn-info"
+        title="Customize the blueprint further using the wizard view. (Only available for
Wizard items. Templates can only be opened in the Composer.)">Next</button>
+    <button id="finish_step" type="button button-finish" class="btn btn-mini btn-info"
+        title="Instantiate this blueprint in the configured location or locations.">Deploy</button>
 </div>

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/22ddab78/src/main/webapp/assets/tpl/catalog/details-entity.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/tpl/catalog/details-entity.html b/src/main/webapp/assets/tpl/catalog/details-entity.html
index 02f3fe9..802729b 100644
--- a/src/main/webapp/assets/tpl/catalog/details-entity.html
+++ b/src/main/webapp/assets/tpl/catalog/details-entity.html
@@ -20,7 +20,8 @@ under the License.
 <div class="catalog-details">
 
     <div class="float-right">
-        <button data-name="<%= model.id %>" class="btn composer">Open in Composer</button>
+        <button data-name="<%= model.id %>" class="btn composer"
+            title="Open this blueprint in the Composer where the YAML can be edited and deployed.">YAML
Composer</button>
         <button data-name="<%= model.id %>" class="btn btn-danger delete">Delete</button>
     </div>
 


Mime
View raw message