Commit ba216a5e authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Minor foreign admin fixes.

parent 5224a059
......@@ -4,7 +4,6 @@ require(window.APT_OPTIONS.configObject,
function (_, sup, moment, dashboardString)
{
'use strict';
var isadmin = 0;
var dashboardTemplate = _.template(dashboardString);
var clusterFiles = ["cloudlab-nofed.json", "cloudlab-fedonly.json"];
var clusterStats = {};
......@@ -12,7 +11,6 @@ function (_, sup, moment, dashboardString)
function initialize()
{
window.APT_OPTIONS.initialize(sup);
isadmin = window.ISADMIN;
DashboardLoop();
setInterval(DashboardLoop,30000);
......@@ -28,7 +26,8 @@ function (_, sup, moment, dashboardString)
return;
}
var dashboard_html = dashboardTemplate({"dashboard": json.value,
"isadmin": isadmin});
"isadmin" : window.ISADMIN,
"isfadmin" : window.ISFADMIN});
$('#page-body').html(dashboard_html);
$('#last-refresh').data("time",new Date());
......
......@@ -122,12 +122,8 @@
<tr>
<td><a href="status.php?uuid=<%- value.uuid %>">
<%- value.name %></a></td>
<% if (!isadmin) { %>
<td><%- value.creator %></td>
<% } %>
<% if (isadmin) { %>
<td><a href="user-dashboard.php?user=<%- value.creator %>"><%- value.creator %></a></td>
<% } %>
<td><a href="user-dashboard.php?user=<%- value.creator %>">
<%- value.creator %></a></td>
<td><a href="show-profile.php?uuid=<%- value.profile_uuid %>">
<%- value.profile_name %></a></td>
<td><%- value.cluster %></td>
......@@ -160,12 +156,7 @@
<tbody>
<% _.each(dashboard.heaviest_users, function(value, key) { %>
<tr>
<% if (!isadmin) { %>
<td><%- key %></td>
<% } %>
<% if (isadmin) { %>
<td><a href="user-dashboard.php?user=<%- key %>"><%- key %></a></td>
<% } %>
<td><a href="user-dashboard.php?user=<%- key %>"><%- key %></a></td>
<td><%- value.physnode_count %></td>
<td><%- value.experiment_count %></td>
</tr>
......@@ -193,12 +184,7 @@
<tbody>
<% _.each(dashboard.heaviest_projects, function(value, key) { %>
<tr>
<% if (!isadmin) { %>
<td><%- key %></td>
<% } %>
<% if (isadmin) { %>
<td><a href="show-project.php?pid=<%- key %>"><%- key %></a></td>
<% } %>
<td><a href="show-project.php?pid=<%- key %>"><%- key %></a></td>
<td><%- value.physnode_count %></td>
<td><%- value.experiment_count %></td>
</tr>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment