Commit e5dd7465 authored by Leigh Stoller's avatar Leigh Stoller

Minor tweaks to graph formatting for Powder; only the Emulab cluster has

"radios" at the moment, so other cluster get a single wide graph.
parent 1713d7b4
......@@ -196,8 +196,10 @@ class Aggregate
$query_result =
DBQueryFatal("select urn from apt_aggregates ".
"where disabled=0 and reservations=1 and ".
" FIND_IN_SET('$PORTAL_GENESIS', portals)".
"order by isfederate,name");
" FIND_IN_SET('$PORTAL_GENESIS', portals) ".
($PORTAL_GENESIS == "powder" ?
"order by nickname" :
"order by isfederate,name"));
while ($row = mysql_fetch_array($query_result)) {
$urn = $row["urn"];
......
......@@ -51,23 +51,31 @@ $(function ()
"urn" : urn,
"title" :
(!window.ISPOWDER ?
details.nickname : "Powder")}));
details.nickname : details.nickname)}));
if (window.ISPOWDER) {
$('#' + details.nickname + " .resgraph-panel-radios")
.html(graphTemplate({"details" : details,
if (details.nickname == "Emulab") {
$('#' + details.nickname + " .resgraph-panel-radios")
.html(graphTemplate({"details" : details,
"graphid" : graphid + "-radios",
"title" : "Powder Radio",
"urn" : urn,
"showhelp" : true,
"showfullscreen" : false}));
}
else {
$('#' + details.nickname + " .resgraph-panel-servers")
.removeClass("col-sm-5")
.addClass("col-sm-10");
}
}
$('#' + details.nickname + " .resgraph-panel-servers")
.html(graphTemplate({"details" : details,
"graphid" : graphid + "-servers",
"title" :
(!window.ISPOWDER ?
details.nickname : "Powder Server"),
details.nickname :
details.nickname + " Server"),
"urn" : urn,
"showhelp" : true,
"showfullscreen" : false}));
......
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