Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/planetstack/planetstack/settings.py b/planetstack/planetstack/settings.py
index d706245..ce13f08 100644
--- a/planetstack/planetstack/settings.py
+++ b/planetstack/planetstack/settings.py
@@ -240,3 +240,5 @@
},
}
}
+
+BIGQUERY_TABLE = getattr(config, "bigquery_table", "demoevents")
diff --git a/planetstack/templates/admin/base.html b/planetstack/templates/admin/base.html
index 4ff608e..dd8ab75 100644
--- a/planetstack/templates/admin/base.html
+++ b/planetstack/templates/admin/base.html
@@ -115,24 +115,7 @@
{% if not is_popup %}
<div id=openCloudTopPage>
{% include "/opt/planetstack/templates/admin/newminidashboard.html" %}
-
-<!-- <div id="minDashboard">
- <div class="hide">{{ app_label|capfirst|escape }}</div>
- <div class="hide selectedMainNav">{{ opts.verbose_name_plural|capfirst }}</div>
- <div class="hide currentOriginalNode">{{ original|truncatewords:"18" }}</div>
-
-
- <label class="nodetextbox nodesLabel" style="display: none;" > </label>
- <label class="nodelabel nodesValue" style="display: none;" ></label>
- <span class="nodesCnt hide"></span>
- <label class="nodetextbox cpuLabel" style="display: none;" ></label>
- <label class="nodelabel cpuValue" style="display: none;" ></label>
- <span class="cpuCnt hide"></span>
- <label class="nodetextbox bandwidthLabel" style="display: none;" ></label>
- <label class="nodelabel bandwidthValue" style="width:60px;display: none;"></label>
- <span class="bandUsage hide"></span>
- </div> -->
- </div>
+ </div>
{% block breadcrumbs %}
<ul class="breadcrumb">
diff --git a/planetstack/templates/admin/dashboard/welcome.html b/planetstack/templates/admin/dashboard/welcome.html
index 4967169..d8c3b70 100644
--- a/planetstack/templates/admin/dashboard/welcome.html
+++ b/planetstack/templates/admin/dashboard/welcome.html
@@ -73,8 +73,8 @@
<div id="HPCDashboard">
<h1>CDN Operations View</h1>
<span id="hpcSummary">
- <span class="summary-attr"><b>Active Slivers:</b> <span id="active-slivers-value"> </span> </span>
- <span class="summary-attr"><b>Overall Throughput:</b> <span id="overall-throughput-value"> </span> </span>
+ <span class="summary-attr"><b>Allocated Slivers:</b> <span id="active-slivers-value"> </span> </span>
+ <span class="summary-attr"><b>Bytes Served:</b> <span id="overall-throughput-value"> </span> </span>
<span class="summary-attr-util"><b>Average CPU Utilization:</b> <span id="cpu-utilization-value"> </span> </span>
</span>
<div id="map-us" ></div>