all detail templates replaced by generic

diff --git a/planetstack/core/xoslib/static/js/xosAdminSite.js b/planetstack/core/xoslib/static/js/xosAdminSite.js
index d265630..b9068b5 100644 (file)
--- a/planetstack/core/xoslib/static/js/xosAdminSite.js
+++ b/planetstack/core/xoslib/static/js/xosAdminSite.js
@@ -61,21 +61,44 @@ XOSAdminApp.updateNavigationPanel = function() {
 };\r
 \r
 XOSAdminApp.buildViews = function() {\r
+     genericAddChildClass = XOSDetailView.extend({template: "#xos-add-template",\r
+                                                        app: XOSAdminApp});\r
+     XOSAdminApp["genericAddChildView"] = genericAddChildClass;\r
+\r
+     genericDetailClass = XOSDetailView.extend({template: "#xos-detail-template",\r
+                                                           app: XOSAdminApp});\r
+     XOSAdminApp["genericDetailView"] = genericDetailClass;\r
+\r
      for (var index in OBJS) {\r
          name = OBJS[index];
          tr_template = '#xosAdmin-' + name + '-listitem-template';
          table_template = '#xosAdmin-' + name + '-list-template';
          detail_template = '#xosAdmin-' + name + '-detail-template';
+         add_child_template = '#xosAdmin-' + name + '-add-child-template';
          collection_name = name + "s";
          region_name = name + "List";
          detailNavLink = collection_name;
 
-         detailClass = XOSDetailView.extend({
-            template: detail_template,\r
-            app: XOSAdminApp,\r
-         });\r
+         if ($(detail_template).length) {
+             detailClass = XOSDetailView.extend({
+                template: detail_template,\r
+                app: XOSAdminApp,\r
+             });\r
+         } else {\r
+             detailClass = genericDetailClass;\r
+         }\r
          XOSAdminApp[collection_name + "DetailView"] = detailClass;\r
-
+\r
+         if ($(add_child_template).length) {\r
+             addClass = XOSDetailView.extend({
+                template: add_child_template,\r
+                app: XOSAdminApp,\r
+             });\r
+         } else {\r
+             addClass = genericAddChildClass;\r
+         }\r
+         XOSAdminApp[collection_name + "AddChildView"] = addClass;\r
+\r
          itemViewClass = XOSItemView.extend({
              detailClass: detailClass,
              template: tr_template,
@@ -109,6 +132,7 @@ XOSAdminApp.initRouter = function() {
         api_command = "list" + firstCharUpper(collection_name);\r
         listViewName = collection_name + "ListView";\r
         detailViewName = collection_name + "DetailView";\r
+        addChildViewName = collection_name + "AddChildView";\r
 \r
         api[api_command] = XOSAdminApp.createListHandler(listViewName, collection_name, "detail", collection_name);\r
         routes[nav_url] = api_command;\r
@@ -126,7 +150,7 @@ XOSAdminApp.initRouter = function() {
 \r
         nav_url = "addChild" + firstCharUpper(name) + "/:parentModel/:parentField/:parentId";\r
         api_command = "addChild" + firstCharUpper(name);\r
-        api[api_command] = XOSAdminApp.createAddChildHandler(detailViewName, collection_name);\r
+        api[api_command] = XOSAdminApp.createAddChildHandler(addChildViewName, collection_name);\r
         routes[nav_url] = api_command;\r
 \r
         nav_url = "delete" + firstCharUpper(name) + "/:id";\r

diff --git a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
index de03ddf..1f4ca5b 100644 (file)
--- a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
+++ b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
@@ -301,6 +301,18 @@ if (! window.XOSLIB_LOADED ) {
         modelClassName = modelName;
         collectionClassName = modelName + "Collection";
 
+        if (!attrs.addFields) {
+            attrs.addFields = attrs.detailFields;
+        }
+
+        if (!attrs.inputType) {
+            attrs.inputType = {};
+        }
+
+        if (!attrs.foreignFields) {
+            attrs.foreignFields = {};
+        }
+
         if (!attrs.collectionName) {
             attrs.collectionName = modelName + "s";
         }
@@ -311,12 +323,13 @@ if (! window.XOSLIB_LOADED ) {
 
         for (key in attrs) {
             value = attrs[key];
-            if ($.inArray(key, ["urlRoot", "modelName", "collectionName", "validate"])>=0) {
+            if ($.inArray(key, ["urlRoot", "modelName", "collectionName", "addFields", "detailFields", "foreignFields", "inputType", "relatedCollections", "foreignCollections"])>=0) {
                 modelAttrs[key] = value;
-            }
-            if ($.inArray(key, ["urlRoot", "modelName", "collectionName", "relatedCollections", "foreignCollections"])>=0) {
                 collectionAttrs[key] = value;
             }
+            if ($.inArray(key, ["validate"])) {
+                modelAttrs[key] = value;
+            }
         }
 
         if (xosdefaults && xosdefaults[modelName]) {
@@ -345,11 +358,18 @@ if (! window.XOSLIB_LOADED ) {
         define_model(this, {urlRoot: SLIVER_API,
                             relatedCollections: {"networkSlivers": "sliver"},
                             foreignCollections: ["slices", "deployments", "images", "nodes", "users"],
-                            modelName: "sliver"});
+                            foreignFields: {"creator": "users", "image": "images", "node": "nodes", "deploymentNetwork": "deployments", "slice": "slices"},
+                            modelName: "sliver",
+                            addFields: ["slice", "deploymentNetwork", "image", "node"],
+                            detailFields: ["name", "instance_id", "instance_name", "slice", "deploymentNetwork", "image", "node", "creator"],
+                            });
 
         define_model(this, {urlRoot: SLICE_API,
                            relatedCollections: {"slivers": "slice", "sliceDeployments": "slice", "slicePrivileges": "slice", "networks": "owner"},
                            foreignCollections: ["services", "sites"],
+                           foreignFields: {"service": "services", "site": "sites"},
+                           detailFields: ["name", "site", "enabled", "description", "url", "max_slivers"],
+                           inputType: {"enabled": "checkbox"},
                            modelName: "slice",
                            xosValidate: function(attrs, options) {
                                errors = XOSModel.prototype.xosValidate(this, attrs, options);
@@ -368,56 +388,93 @@ if (! window.XOSLIB_LOADED ) {
 
         define_model(this, {urlRoot: SLICEDEPLOYMENT_API,
                            foreignCollections: ["slices", "deployments"],
-                           modelName: "sliceDeployment"});
+                           modelName: "sliceDeployment",
+                           foreignFields: {"slice": "slices", "deployment": "deployments"},
+                           detailFields: ["slice", "deployment", "tenant_id"],
+                           });
 
         define_model(this, {urlRoot: SLICEPRIVILEGE_API,
                             foreignCollections: ["slices", "users", "sliceRoles"],
-                            modelName: "slicePrivilege"});
+                            modelName: "slicePrivilege",
+                            foreignFields: {"user": "users", "slice": "slices", "role": "sliceRoles"},
+                            detailFields: ["user", "slice", "role"],
+                            });
 
         define_model(this, {urlRoot: SLICEROLE_API,
-                            modelName: "sliceRole"});
+                            modelName: "sliceRole",
+                            detailFields: ["role"],
+                            });
 
         define_model(this, {urlRoot: NODE_API,
                             foreignCollections: ["sites", "deployments"],
-                            modelName: "node"});
+                            modelName: "node",
+                            foreignFields: {"site": "sites", "deployment": "deployments"},
+                            detailFields: ["name", "site", "deployment"],
+                            });
 
         define_model(this, {urlRoot: SITE_API,
                             relatedCollections: {"users": "site", "slices": "site", "nodes": "site"},
-                            modelName: "site"});
+                            modelName: "site",
+                            detailFields: ["name", "abbreviated_name", "url", "enabled", "is_public", "login_base"],
+                            inputType: {"enabled": "checkbox", "is_public": "checkbox"},
+                            });
 
         define_model(this, {urlRoot: USER_API,
                             relatedCollections: {"slicePrivileges": "user", "slices": "owner", "userDeployments": "user"},
                             foreignCollections: ["sites"],
-                            modelName: "user"});
+                            modelName: "user",
+                            foreignFields: {"site": "sites"},
+                            detailFields: ["username", "firstname", "lastname", "phone", "user_url", "site"],
+                            });
 
         define_model(this, {urlRoot: USERDEPLOYMENT_API,
                             foreignCollections: ["users","deployments"],
-                            modelName: "userDeployment"});
+                            modelName: "userDeployment",
+                            foreignFields: {"deployment": "deployments", "user": "users"},
+                            detailFields: ["user", "deployment", "kuser_id"],
+                            });
 
         define_model(this, { urlRoot: DEPLOYMENT_API,
                              relatedCollections: {"nodes": "deployment", "slivers": "deploymentNetwork", "networkDeployments": "deployment", "userDeployments": "deployment"},
-                             modelName: "deployment"});
+                             modelName: "deployment",
+                             detailFields: ["name", "backend_type", "admin_tenant"],
+                             });
 
         define_model(this, {urlRoot: IMAGE_API,
                             model: this.image,
-                            modelName: "image"});
+                            modelName: "image",
+                            detailFields: ["name", "disk_format", "admin_tenant"],
+                            });
 
         define_model(this, {urlRoot: NETWORKTEMPLATE_API,
-                            modelName: "networkTemplate"});
+                            modelName: "networkTemplate",
+                            detailFields: ["name", "description", "visibility", "translation", "sharedNetworkName", "sharedNetworkId"],
+                            });
 
         define_model(this, {urlRoot: NETWORK_API,
                             relatedCollections: {"networkDeployments": "network", "networkSlivers": "network"},
                             foreignCollections: ["slices", "networkTemplates"],
-                            modelName: "network"});
+                            modelName: "network",
+                            foreignFields: {"template": "networkTemplates", "owner": "slices"},
+                            detailFields: ["name", "template", "ports", "labels", "owner"],
+                            });
 
         define_model(this, {urlRoot: NETWORKSLIVER_API,
-                            modelName: "networkSliver"});
+                            modelName: "networkSliver",
+                            foreignFields: {"network": "networks", "sliver": "slivers"},
+                            detailFields: ["network", "sliver", "ip", "port_id"],
+                            });
 
         define_model(this, {urlRoot: NETWORKDEPLOYMENT_API,
-                            modelName: "networkDeployment"});
+                            modelName: "networkDeployment",
+                            foreignFields: {"network": "networks", "deployment": "deployments"},
+                            detailFields: ["network", "deployment", "net_id"],
+                            });
 
         define_model(this, {urlRoot: SERVICE_API,
-                            modelName: "service"});
+                            modelName: "service",
+                            detailFields: ["name", "description", "versionNumber"],
+                            });
 
         // enhanced REST
         define_model(this, {urlRoot: SLICEPLUS_API,

diff --git a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js
index d2af0aa..8e45267 100644 (file)
--- a/planetstack/core/xoslib/static/js/xoslib/xosHelper.js
+++ b/planetstack/core/xoslib/static/js/xoslib/xosHelper.js
@@ -116,7 +116,7 @@ XOSApplication = Marionette.Application.extend({
         }
     },
 
-    createAddChildHandler: function(detailName, collection_name) {
+    createAddChildHandler: function(addChildName, collection_name) {
         var app=this;
         return function(parent_modelName, parent_fieldName, parent_id) {
             app.Router.showPreviousURL();
@@ -126,7 +126,7 @@ XOSApplication = Marionette.Application.extend({
             console.log(parent_id);
             model = new xos[collection_name].model();
             model.attributes[parent_fieldName] = parent_id;
-            detailViewClass = app[detailName];
+            detailViewClass = app[addChildName];
             var detailView = new detailViewClass({model: model, collection:xos[collection_name]});
             detailView.dialog = $("xos-addchild-dialog");
             app["addChildDetail"].show(detailView);
@@ -136,10 +136,12 @@ XOSApplication = Marionette.Application.extend({
                width: 640,
                buttons : {
                     "Save" : function() {
+                      var addDialog = this;
+                      detailView.synchronous = true;
+                      detailView.afterSave = function() { $(addDialog).dialog("close"); }
                       detailView.save();
 
-                      $(this).dialog("close");
-                      // do something here
+                      //$(this).dialog("close");
                     },
                     "Cancel" : function() {
                       $(this).dialog("close");
@@ -503,6 +505,14 @@ XOSDetailView = Marionette.ItemView.extend({
                 _.each(errors, markErrors);
             },
 
+             templateHelpers: function() { return { modelName: this.model.modelName,
+                                                    collectionName: this.model.collectionName,
+                                                    addFields: this.model.addFields,
+                                                    detailFields: this.model.detailFields,
+                                                    foreignFields: this.model.foreignFields,
+                                                    inputType: this.model.inputType,
+                                         }},
+
 });
 
 /* XOSItemView
@@ -519,6 +529,10 @@ XOSItemView = Marionette.ItemView.extend({
 
              templateHelpers: function() { return { modelName: this.model.modelName,
                                                     collectionName: this.model.collectionName,
+                                                    addFields: this.model.addFields,
+                                                    detailFields: this.model.detailFields,
+                                                    foreignFields: this.model.foreignFields,
+                                                    inputType: this.model.inputType,
                                          }},
 });
 

diff --git a/planetstack/core/xoslib/templates/xosAdmin.html b/planetstack/core/xoslib/templates/xosAdmin.html
index 3d5d1a6..c2bf202 100644 (file)
--- a/planetstack/core/xoslib/templates/xosAdmin.html
+++ b/planetstack/core/xoslib/templates/xosAdmin.html
@@ -100,6 +100,46 @@
     <a href="#<%= collectionName %>/<%= id %>"><%= text %></a>
 </script>
 
+<script type="text/template" id="xos-add-template">
+  <h3 class="xos-detail-title">Add Object: <%= modelName %></h3>
+  <form>
+  <table>\r
+  <% _.each(addFields, function(fieldName) { %>\r
+     <tr><td><%= fieldName %>\r
+        <% if (fieldName in foreignFields) { %>\r
+            <td><%= idToSelect(fieldName, window[fieldName], foreignFields[fieldName], "humanReadableName") %></td>\r
+        <% } else if (inputType[fieldName] == "checkbox") { %>\r
+            <td><input type="checkbox" name="<%= fieldName %>" <% if (model.attributes[fieldName]) print("checked"); %>></td>\r
+        <% } else { %>\r
+            <td><input type="text" name="<%= fieldName %>" value="<%= model.attributes[fieldName] %>"></td>\r
+        <% } %>\r
+     </tr>\r
+  <% }); %>\r
+  <%= xosInlineDetailButtonsTemplate() %>\r
+  </table>\r
+  </form>\r
+</script>
+
+<script type="text/template" id="xos-detail-template">
+  <h3 class="xos-detail-title">Add Object: <%= modelName %></h3>
+  <form>
+  <table>\r
+  <% console.log(model); _.each(detailFields, function(fieldName) { %>\r
+     <tr><td><%= fieldName %>\r
+        <% if (fieldName in foreignFields) { %>\r
+            <td><%= idToSelect(fieldName, window[fieldName], foreignFields[fieldName], "humanReadableName") %></td>\r
+        <% } else if (inputType[fieldName] == "checkbox") { %>\r
+            <td><input type="checkbox" name="<%= fieldName %>" <% if (model.attributes[fieldName]) print("checked"); %>></td>\r
+        <% } else { %>\r
+            <td><input type="text" name="<%= fieldName %>" value="<%= model.attributes[fieldName] %>"></td>\r
+        <% } %>\r
+     </tr>\r
+  <% }); %>\r
+  <%= xosInlineDetailButtonsTemplate() %>\r
+  </table>\r
+  </form>\r
+</script>
+
 <!-- Deployment -->
 
 <script type="text/template" id="xosAdmin-deployment-list-template">
@@ -129,18 +169,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-deployment-detail-template">
-  <h3 class="xos-detail-title">Detail View: Deployment</h3>
-  <form>
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>Backend:</td><td><input type="text" name="backend_type" value="<%= backend_type %>"></td></tr>\r
-  <tr><td>Admin Tenant:</td><td><input type="text" name="admin_tenant" value="<%= admin_tenant %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>\r
-
 <!-- Image -->
 
 <script type="text/template" id="xosAdmin-image-list-template">
@@ -169,18 +197,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-image-detail-template">
-  <h3 class="xos-detail-title">Detail View: Image</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>Disk Format:</td><td><input type="text" name="backend_type" value="<%= disk_format %>"></td></tr>\r
-  <tr><td>Container Format:</td><td><input type="text" name="admin_tenant" value="<%= container_format %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- NetworkTemplate -->
 
 <script type="text/template" id="xosAdmin-networkTemplate-list-template">
@@ -214,21 +230,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-networkTemplate-detail-template">
-  <h3 class="xos-detail-title">Detail View: NetworkTemplate</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>description:</td><td><input type="text" name="description" value="<%= description %>"></td></tr>\r
-  <tr><td>Visibility:</td><td><input type="text" name="visibility" value="<%= visibility %>"></td></tr>\r
-  <tr><td>Translation:</td><td><input type="text" name="translation" value="<%= translation %>"></td></tr>\r
-  <tr><td>Shared Network Name:</td><td><input type="text" name="sharedNetworkName" value="<%= sharedNetworkName %>"></td></tr>\r
-  <tr><td>Shared Network Id:</td><td><input type="text" name="sharedNetworkId" value="<%= sharedNetworkId %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- Network -->
 
 <script type="text/template" id="xosAdmin-network-list-template">
@@ -259,20 +260,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-network-detail-template">
-  <h3 class="xos-detail-title">Detail View: Network</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>Template:</td><td><%= idToSelect("template",template,"networkTemplates","name") %></td></tr>\r
-  <tr><td>Ports:</td><td><input type="text" name="ports" value="<%= ports %>"></td></tr>\r
-  <tr><td>Labels:</td><td><input type="text" name="labels" value="<%= labels %>"></td></tr>\r
-  <tr><td>Owner:</td><td><%= idToSelect("owner",owner,"slices","name") %></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- NetworkSliver -->
 
 <script type="text/template" id="xosAdmin-networkSliver-list-template">
@@ -301,19 +288,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-networkSliver-detail-template">
-  <h3 class="xos-detail-title">Detail View: Network</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Network:</td><td><input type="text" name="network" value="<%= network %>"></td></tr>\r
-  <tr><td>Sliver:</td><td><input type="text" name="sliver" value="<%= sliver %>"></td></tr>\r
-  <tr><td>Ip:</td><td><input type="text" name="ip" value="<%= ip %>"></td></tr>\r
-  <tr><td>Port_id:</td><td><input type="text" name="port_id" value="<%= port_id %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- NetworkDeployment -->
 
 <script type="text/template" id="xosAdmin-networkDeployment-list-template">
@@ -340,18 +314,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-networkDeployment-detail-template">
-  <h3 class="xos-detail-title">Detail View: Network</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Network:</td><td><input type="text" name="network" value="<%= network %>"></td></tr>\r
-  <tr><td>Sliver:</td><td><input type="text" name="deployment" value="<%= deployment %>"></td></tr>\r
-  <tr><td>Ip:</td><td><input type="text" name="net_id" value="<%= net_id %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- Node -->
 
 <script type="text/template" id="xosAdmin-node-list-template">
@@ -379,18 +341,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-node-detail-template">
-  <h3 class="xos-detail-title">Detail View: Node</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>Site:</td><td><%= idToSelect("site",site,"sites","name") %></td></tr>\r
-  <tr><td>Deployment:</td><td><%= idToSelect("deployment",deployment,"deployments","name") %></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- SliceRole -->
 
 <script type="text/template" id="xosAdmin-sliceRole-list-template">
@@ -407,23 +357,12 @@
   <%= xosListFooterTemplate() %>
 </script>
 
-
 <script type="text/template" id="xosAdmin-sliceRole-listitem-template">
   <td> <%= xosDetailLinkTemplate({collectionName: collectionName, id: id, text: id}) %></td>
   <td><%= role %></td>
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-sliceRole-detail-template">
-  <h3 class="xos-detail-title">Detail View: Service</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Role:</td><td><input type="text" name="role" value="<%= role %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- Service -->
 
 <script type="text/template" id="xosAdmin-service-list-template">
@@ -455,18 +394,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-service-detail-template">
-  <h3 class="xos-detail-title">Detail View: Service</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>description:</td><td><input type="text" name="description" value="<%= description %>"></td></tr>\r
-  <tr><td>Version Number:</td><td><input type="text" name="versionNumber" value="<%= versionNumber %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- Site -->
 
 <script type="text/template" id="xosAdmin-site-list-template">
@@ -499,21 +426,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-site-detail-template">
-  <h3 class="xos-detail-title">Detail View: Site</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>abbreviated_name:</td><td><input type="text" name="abbreviated_name" value="<%= abbreviated_name %>"></td></tr>\r
-  <tr><td>url:</td><td><input type="text" name="site_url" value="<%= site_url %>"></td></tr>\r
-  <tr><td>Enabled:</td><td><input type="checkbox" name="enabled" <% if (enabled) print("checked"); %>></td></tr>\r
-  <tr><td>Is Public:</td><td><input type="checkbox" name="is_public" <% if (is_public) print("checked"); %>></td></tr>\r
-  <tr><td>login_base:</td><td><input type="text" name="login_base" value="<%= login_base %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- Slice -->
 
 <script type="text/template" id="xosAdmin-slice-list-template">
@@ -550,21 +462,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-slice-detail-template">
-  <h3 class="xos-detail-title">Detail View: Slice</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>Site:</td><td><%= idToSelect("site",site,"sites","name") %></td></tr>\r
-  <tr><td>Enabled:</td><td><input type="checkbox" name="enabled" <% if (enabled) print("checked"); %>></td></tr>\r
-  <tr><td>Description:</td><td><input type="text" name="description" value="<%= description %>"></td></tr>\r
-  <tr><td>Url:</td><td><input type="text" name="slice_url" value="<%= slice_url %>"></td></tr>\r
-  <tr><td>Max Slivers:</td><td><input type="text" name="max_slivers" value="<%= max_slivers %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- SliceDeployment -->
 
 <script type="text/template" id="xosAdmin-sliceDeployment-list-template">
@@ -591,18 +488,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-sliceDeployment-detail-template">
-  <h3 class="xos-detail-title">Detail View: Slice Deployment</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Slice:</td><td><input type="text" name="slice" value="<%= slice %>"></td></tr>\r
-  <tr><td>Deployment:</td><td><input type="text" name="deployment" value="<%= deployment %>"></td></tr>\r
-  <tr><td>Tenant Id:</td><td><input type="text" name="tenant_id" value="<%= tenant_id %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- SlicePrivilege -->
 
 <script type="text/template" id="xosAdmin-slicePrivilege-list-template">
@@ -629,17 +514,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-slicePrivilege-detail-template">
-  <h3 class="xos-detail-title">Detail View: Slice Privilege</h3>
-  <form>\r
-  <table>\r
-  <tr><td>User:</td><td><input type="text" name="user" value="<%= user %>"></td></tr>\r
-  <tr><td>Slice:</td><td><input type="text" name="slice" value="<%= slice %>"></td></tr>\r
-  <tr><td>Role:</td><td><input type="text" name="role" value="<%= role %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
 
 <!-- Sliver -->
 
@@ -682,22 +556,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-sliver-detail-template">
-  <h3 class="xos-detail-title">Detail View: Sliver</h3>
-  <form>\r
-  <table>\r
-  <tr><td>Name:</td><td><input type="text" name="name" value="<%= name %>"></td></tr>\r
-  <tr><td>instance_id:</td><td><input type="text" name="instance_id" value="<%= instance_id %>"></td></tr>\r
-  <tr><td>instance_name:</td><td><input type="text" name="instance_name" value="<%= instance_name %>"></td></tr>\r
-  <tr><td>Image:</td><td><%= idToSelect("image",image,"images","name") %></td></tr>\r
-  <tr><td>Creator:</td><td><%= idToSelect("creator",creator,"users","username") %></td></tr>\r
-  <tr><td>Slice:</td><td><%= idToSelect("slice",slice,"slices","name") %></td></tr>\r
-  <tr><td>Deployment:</td><td><%= idToSelect("deploymentNetwork",deploymentNetwork,"deployments","name") %></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- User -->
 
 <script type="text/template" id="xosAdmin-user-list-template">
@@ -731,21 +589,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-user-detail-template">
-  <h3 class="xos-detail-title">Detail View: User</h3>
-  <form>\r
-  <table>\r
-  <tr><td>User Name:</td><td><input type="text" name="username" value="<%= username %>"></td></tr>\r
-  <tr><td>First Name:</td><td><input type="text" name="firstname" value="<%= firstname %>"></td></tr>\r
-  <tr><td>Last Name:</td><td><input type="text" name="lastname" value="<%= lastname %>"></td></tr>\r
-  <tr><td>Phone:</td><td><input type="text" name="phone" value="<%= phone %>"></td></tr>\r
-  <tr><td>Url:</td><td><input type="text" name="user_url" value="<%= user_url %>"></td></tr>\r
-  <tr><td>Site:</td><td><%= idToSelect("site",site,"sites","name") %></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <!-- UserDeployments -->
 
 <script type="text/template" id="xosAdmin-userDeployment-list-template">
@@ -772,18 +615,6 @@
   <td><%= xosDeleteButtonTemplate({modelName: modelName, id: id}) %></td>
 </script>
 
-<script type="text/template" id="xosAdmin-userDeployment-detail-template">
-  <h3 class="xos-detail-title">Detail View: UserDeployment</h3>
-  <form>\r
-  <table>\r
-  <tr><td>User:</td><td><input type="text" name="user" value="<%= user %>"></td></tr>\r
-  <tr><td>Deployment:</td><td><input type="text" name="deployment" value="<%= deployment %>"></td></tr>\r
-  <tr><td>kuser_id:</td><td><input type="text" name="kuser_id" value="<%= kuser_id %>"></td></tr>\r
-  <%= xosInlineDetailButtonsTemplate() %>\r
-  </table>\r
-  </form>\r
-</script>
-
 <script>
 xosInlineDetailButtonsTemplate = _.template($("#xos-inline-detail-buttons-template").html());
 xosListHeaderTemplate = _.template($("#xos-list-header-template").html());