| |
@@ -16,15 +16,15 @@
|
| |
</noscript>
|
| |
<div id="graphs" class="hidden">
|
| |
<div class="row">
|
| |
- <h3>Tasks during last 24 hours</h3>
|
| |
+ <h3>Running tasks during last 24 hours</h3>
|
| |
<div id="chartDay" class="line-chart-pf"></div>
|
| |
</div>
|
| |
<div class="row">
|
| |
- <h3>Tasks during last 90 days</h3>
|
| |
+ <h3>Running tasks during last 90 days</h3>
|
| |
<div id="chartNinetyDays" class="line-chart-pf"></div>
|
| |
</div>
|
| |
<div class="row">
|
| |
- <h3>Tasks divided by chroots</h3>
|
| |
+ <h3>Running tasks divided by chroots</h3>
|
| |
<div class="col-md-1"></div>
|
| |
<div class="col-md-5">
|
| |
<h4>During last 24 hours</h4>
|
| |
@@ -43,8 +43,8 @@
|
| |
<script src="{{ url_for('static', filename='components/d3/d3.min.js') }}"></script>
|
| |
<script src="{{ url_for('static', filename='js/graphs.js') }}"></script>
|
| |
<script>
|
| |
- lineGraph({{ data1|tojson }}, 48, "#chartDay", "%H:%M");
|
| |
- lineGraph({{ data2|tojson }}, 20, "#chartNinetyDays", "%Y-%m-%d");
|
| |
+ lineGraph({{ data1|tojson }}, 25, "#chartDay", "%H:%M");
|
| |
+ lineGraph({{ data2|tojson }}, 15, "#chartNinetyDays", "%Y-%m-%d");
|
| |
chrootGraph({{ chroots1|tojson }}, "#chartChrootsDay");
|
| |
chrootGraph({{ chroots2|tojson }}, "#chartChrootsNinetyDays");
|
| |
</script>
|
| |
This PR addresses Issue #244.
Changes made:
- graph titles mention that they show running tasks
- methods used for getting graph data renamed to get_running_tasks*
- change colors for the graph (I chose option 1 from Issue #244 - same color as running tasks)
- reduce the number of x.axis labels so that they don't overlap on lower resolution/smaller displays
- rearrange the order of colors in chroots graph so that there aren't similar colors next to each other