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 (file)
--- 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;
 }
 .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 (file)
--- 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,\r
                                                 detailFields: ["serviceClass", "default_image", "default_flavor", "network_ports", "mount_data_sets"],\r
                                                 fieldDisplayNames: {serviceClass: "Service Level", "default_flavor": "Flavor", "default_image": "Image", "mount_data_sets": "Data Sets"},\r
                                                 app: XOSTenantApp,\r
                                                 detailFields: ["serviceClass", "default_image", "default_flavor", "network_ports", "mount_data_sets"],\r
                                                 fieldDisplayNames: {serviceClass: "Service Level", "default_flavor": "Flavor", "default_image": "Image", "mount_data_sets": "Data Sets"},\r

+                                                helpText: {"default_image": "Existing slivers will be re-instantiated if changed",\r
+                                                           "default_flavor": "Existing slivers will be re-instantiated if changed"},\r

 \r
                                                 onShow: function() {\r
                                                     // the slice selector is in a different table, so make every label cell the maximal width\r
 \r
                                                 onShow: function() {\r
                                                     // the slice selector is in a different table, so make every label cell the maximal width\r

diff --git a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js
index 6b6419c..76254f6 100644 (file)
--- 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 || {},
                                                     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 (file)
--- 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>
 <script type="text/template" id="xos-detail-template">
   <h3 class="xos-detail-title">Edit Object: <%= modelName %></h3>
   <form>

-  <table>\r
+  <table class="xos-detail-table">\r

   <% args = arguments; %>\r
   <% _.each(detailFields, function(fieldName) { %>\r
      <tr><td class="xos-label-cell"><%= fieldName in fieldDisplayNames ? fieldDisplayNames[fieldName] : fieldNameToHumanReadable(fieldName) %>:</td>\r
   <% args = arguments; %>\r
   <% _.each(detailFields, function(fieldName) { %>\r
      <tr><td class="xos-label-cell"><%= fieldName in fieldDisplayNames ? fieldDisplayNames[fieldName] : fieldNameToHumanReadable(fieldName) %>:</td>\r


@@ -176,6 +176,7 @@
         <% } else { %>\r
             <td><input type="text" name="<%= fieldName %>" value="<%= model.attributes[fieldName] %>"<%= readOnly %>></td>\r
         <% } %>\r
         <% } else { %>\r
             <td><input type="text" name="<%= fieldName %>" value="<%= model.attributes[fieldName] %>"<%= readOnly %>></td>\r
         <% } %>\r

+        <td  class="xos-help-cell"><%= helpText[fieldName] %></td>\r

      </tr>\r
   <% }); %>\r
   <%= xosInlineDetailButtonsTemplate() %>\r
      </tr>\r
   <% }); %>\r
   <%= xosInlineDetailButtonsTemplate() %>\r


@@ -287,7 +288,7 @@
 
 <script type="text/template" id="xos-sliceselector-select">
     <% if (caption) { %>
 
 <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>
     <% } %>
     <% } else { %>
     <select></select>
     <% } %>