From: Scott Baker <smbaker@gmail.com>
Date: Tue, 20 Jan 2015 20:24:16 +0000 (-0800)
Subject: help text support for detail view, tenant view warnings about changing slivers
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=753a13edfd39603fbdc59747c4d7c2b59a2d06b9

help text support for detail view, tenant view warnings about changing slivers
---

diff --git a/planetstack/core/xoslib/static/css/xosAdminSite.css b/planetstack/core/xoslib/static/css/xosAdminSite.css
index 91d4928..256a8a4 100644
--- a/planetstack/core/xoslib/static/css/xosAdminSite.css
+++ b/planetstack/core/xoslib/static/css/xosAdminSite.css
@@ -1,3 +1,14 @@
+.xos-help-cell {
+    font-size: 11px;
+    color: #999;
+    padding-bottom: 1%;
+}
+
+.xos-detail-table td {
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
 .test-table td, th {
     border: 1px solid black;
 }
diff --git a/planetstack/core/xoslib/static/js/xosTenant.js b/planetstack/core/xoslib/static/js/xosTenant.js
index e81aacb..c0d9ab9 100644
--- a/planetstack/core/xoslib/static/js/xosTenant.js
+++ b/planetstack/core/xoslib/static/js/xosTenant.js
@@ -137,6 +137,8 @@ XOSTenantApp.buildViews = function() {
                                                 app: XOSTenantApp,
                                                 detailFields: ["serviceClass", "default_image", "default_flavor", "network_ports", "mount_data_sets"],
                                                 fieldDisplayNames: {serviceClass: "Service Level", "default_flavor": "Flavor", "default_image": "Image", "mount_data_sets": "Data Sets"},
+                                                helpText: {"default_image": "Existing slivers will be re-instantiated if changed",
+                                                           "default_flavor": "Existing slivers will be re-instantiated if changed"},
 
                                                 onShow: function() {
                                                     // the slice selector is in a different table, so make every label cell the maximal width
diff --git a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js
index 6b6419c..76254f6 100644
--- a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js
+++ b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js
@@ -672,6 +672,7 @@ XOSDetailView = Marionette.ItemView.extend({
                                                     model: this.model,
                                                     detailView: this,
                                                     choices: this.options.choices || this.choices || this.model.choices || {},
+                                                    helpText: this.options.helpText || this.helpText || this.model.helpText || {},
                                          }},
 });
 
diff --git a/planetstack/core/xoslib/templates/xosAdmin.html b/planetstack/core/xoslib/templates/xosAdmin.html
index db7218d..cca9ba7 100644
--- a/planetstack/core/xoslib/templates/xosAdmin.html
+++ b/planetstack/core/xoslib/templates/xosAdmin.html
@@ -154,7 +154,7 @@
 <script type="text/template" id="xos-detail-template">
   <h3 class="xos-detail-title">Edit Object: <%= modelName %></h3>
   <form>
-  <table>
+  <table class="xos-detail-table">
   <% args = arguments; %>
   <% _.each(detailFields, function(fieldName) { %>
      <tr><td class="xos-label-cell"><%= fieldName in fieldDisplayNames ? fieldDisplayNames[fieldName] : fieldNameToHumanReadable(fieldName) %>:</td>
@@ -176,6 +176,7 @@
         <% } else { %>
             <td><input type="text" name="<%= fieldName %>" value="<%= model.attributes[fieldName] %>"<%= readOnly %>></td>
         <% } %>
+        <td  class="xos-help-cell"><%= helpText[fieldName] %></td>
      </tr>
   <% }); %>
   <%= xosInlineDetailButtonsTemplate() %>
@@ -287,7 +288,7 @@
 
 <script type="text/template" id="xos-sliceselector-select">
     <% if (caption) { %>
-    <table><tr><td class="xos-label-cell"><%= caption %>: </td><td><select></select></td></tr></table>
+    <table class="xos-detail-table"><tr><td class="xos-label-cell"><%= caption %>: </td><td><select></select></td></tr></table>
     <% } else { %>
     <select></select>
     <% } %>