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

[plstackapi.git] / planetstack / core / xoslib / templates / xosAdmin.html

diff --git a/planetstack/core/xoslib/templates/xosAdmin.html b/planetstack/core/xoslib/templates/xosAdmin.html
index ac90e94..cca9ba7 100644 (file)
--- a/planetstack/core/xoslib/templates/xosAdmin.html
+++ b/planetstack/core/xoslib/templates/xosAdmin.html
@@ -154,10 +154,10 @@
 <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><%= fieldNameToHumanReadable(fieldName) %>:</td>\r
+     <tr><td class="xos-label-cell"><%= fieldName in fieldDisplayNames ? fieldDisplayNames[fieldName] : fieldNameToHumanReadable(fieldName) %>:</td>\r
         <% readOnly = $.inArray(fieldName, model.readOnlyFields)>=0 ? " readonly" : "";  %>\r
         <% if (fieldName in choices) { %>\r
             <td><%= choicesToSelect(fieldName, model.attributes[fieldName], choices[fieldName]) %></td>\r
@@ -165,7 +165,7 @@
             <td><%= idToSelect(fieldName, model.attributes[fieldName], foreignFields[fieldName], "humanReadableName", readOnly) %></td>\r
         <% } else if (inputType[fieldName] == "spinner") { %>\r
             <!-- note: I never finished working on this spinner stuff! -->\r
-            <td><%= xosSpinnerTemplate({id: "picker_" + fieldName, fieldName: fieldName, value: model.attributes[fieldName]}) %></td>\r
+            <td><%= xosSpinnerTemplate({id: "spinner_" + fieldName, fieldName: fieldName, value: model.attributes[fieldName]}) %></td>\r
         <% } else if (inputType[fieldName] == "checkbox") { %>\r
             <td><input type="checkbox" name="<%= fieldName %>" <% if (model.attributes[fieldName]) print("checked"); %><%= readOnly %>></td>\r
         <% } else if (inputType[fieldName] == "picker") { %>\r
@@ -176,6 +176,7 @@
         <% } 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
@@ -230,7 +231,14 @@
 
 <script type="text/template" id="xos-datatable-spinner-template">
     <!-- arguments: value, id, collectionName, fieldName -->
-    <%= value %> <a href='#increase/<%= collectionName %>/<%= id %>/<%= fieldName %>'>more</a> <a href='#decrease/<%= collectionName %>/<%= id %>/<%= fieldName %>'>less</a>
+    <%= value %> <img style="cursor: pointer;" src="/static/img/plus_circle.png" onclick='<%= app.varName %>.adjustCollectionField("<%= collectionName %>", <%= id %>, "<%= fieldName %>", 1)'>
+                 <img style="cursor: pointer;" src="/static/img/minus_circle.png" onclick='<%= app.varName %>.adjustCollectionField("<%= collectionName %>", <%= id %>, "<%= fieldName %>", -1)'>
+</script>
+
+<script type="text/template" id="xos-datatable-spinner-template-old">
+    <!-- arguments: value, id, collectionName, fieldName -->
+    <%= value %> <a href="javascript:undefined" onclick='<%= app.varName %>.adjustCollectionField("<%= collectionName %>", <%= id %>, "<%= fieldName %>", 1)'> more </a>
+                 <a href="javascript:undefined" onclick='<%= app.varName %>.adjustCollectionField("<%= collectionName %>", <%= id %>, "<%= fieldName %>", -1)'> less </a>
 </script>
 
 <script type="text/template" id="xos-spinner-template">
@@ -279,8 +287,11 @@
 </script>
 
 <script type="text/template" id="xos-sliceselector-select">
-    <select>
-    </select>
+    <% if (caption) { %>
+    <table class="xos-detail-table"><tr><td class="xos-label-cell"><%= caption %>: </td><td><select></select></td></tr></table>
+    <% } else { %>
+    <select></select>
+    <% } %>
 </script>
 
 <script>