fix tenant view causes minidashboard to be partially obscured

[plstackapi.git] / planetstack / core / xoslib / dashboards / xosTenant.html

diff --git a/planetstack/core/xoslib/dashboards/xosTenant.html b/planetstack/core/xoslib/dashboards/xosTenant.html
index 16e60f0..6735da3 100644 (file)
--- a/planetstack/core/xoslib/dashboards/xosTenant.html
+++ b/planetstack/core/xoslib/dashboards/xosTenant.html
@@ -6,7 +6,7 @@
 <script src="{{ STATIC_URL }}/js/vendor/backbone.marionette.js"></script>
 
 <link rel="stylesheet" href="//code.jquery.com/ui/1.11.2/themes/smoothness/jquery-ui.css">
-<link rel="stylesheet" type="text/css" href="{% static 'css/xosAdminDashboard.css' %}" media="all" >
+<link rel="stylesheet" type="text/css" href="{% static 'css/xosTenantDashboard.css' %}" media="all" >
 <link rel="stylesheet" type="text/css" href="{% static 'css/xosAdminSite.css' %}" media="all" >
 
 <script src="{{ STATIC_URL }}/js/xoslib/xos-util.js"></script>
@@ -26,6 +26,12 @@
   </div>
 </script>
 
+<script type="text/template" id="xos-tenant-buttons-noslice-template">
+  <div class="box save-box">
+    <button class="btn btn-high btn-tenant-create">Create New Slice</button>
+  </div>
+</script>
+
 <script type="text/template" id="xos-log-template">
   <tr id="<%= logMessageId %>" class="xos-log xos-<%= statusclass %>">
      <td><%= what %><br>
@@ -35,12 +41,14 @@
 </script>
 
 <script type="text/template" id="tenant-edit-users">
-    <%= xosPickerTemplate({pickedItems: model.attributes.users,
-                          unpickedItems: array_diff(xos.tenant().current_user_site_users, model.attributes.users),
+    <%= xosPickerTemplate({pickedItems: model.usersBuffer,
+                          unpickedItems: array_subtract(xos.tenant().current_user_site_users, model.usersBuffer),
                           id: "users",
                           fieldName: "users",
                           detailView: detailView,
-                          lookupFunc: function(x) { return array_pair_lookup(x, xos.tenant().current_user_site_user_names, xos.tenant().current_user_site_users); },
+                          lookupFunc: function(x) { return array_pair_lookup(x,
+                                                     $.merge($.merge([], xos.tenant().current_user_site_user_names), model.user_namesOrig),
+                                                     $.merge($.merge([], xos.tenant().current_user_site_users), model.usersOrig)); },
                           } ) %>
 </script>
 
@@ -48,18 +56,18 @@
   Are you sure about this?\r
 </div>
 
-<div id="tenant-addslice-dialog" title="Add Child">
+<div id="tenant-addslice-dialog" title="Create New Slice">
 <div id="tenant-addslice-interior"></div>\r
 </div>\r
 \r
-<div id="tenant-edit-users-dialog" title="Add Child">\r
+<div id="tenant-edit-users-dialog" title="Edit Users">\r
 <div id="tenant-edit-users-interior"></div>\r
 </div>\r
 
 <div id="xos-error-dialog" title="Error Message">
 </div>\r
 \r
-<div id="contentPanel">\r
+<div id="xos-tenant-view-panel"> <!-- contentPanel"> -->\r
 <div id="contentTitle">
 </div>
 <div id="contentButtonPanel">