jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Update Chart.js to new version and show full fqdn for apps

Browse Source
This commit is contained in:
Johannes Zellner
2018-04-12 11:45:12 +02:00
parent 87e7e9fa07
commit 34187d76b6
5 changed files with 93 additions and 3536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/graphs.html
View File

@@ -8,11 +8,15 @@
<div class="row">
<div class="col-md-6">
<h3>Apps</h3>
<canvas id="memoryUsageAppsChart" width="200" height="200"></canvas>
<div style="width: 200px; height: 200px; margin: auto;">
<canvas id="memoryUsageAppsChart" style="width: 200px; height: 200px;"></canvas>
</div>
</div>
<div class="col-md-6">
<h3>System</h3>
<canvas id="memoryUsageSystemChart" width="200" height="200"></canvas>
<div style="width: 200px; height: 200px; margin: auto;">
<canvas id="memoryUsageSystemChart" style="width: 200px; height: 200px;"></canvas>
</div>
</div>
</div>
@@ -21,7 +25,7 @@
<div class="row">
<div class="col-md-12">
<h4 ng-show="activeApp === 'system'">System</h4>
<h4 ng-show="activeApp !== 'system'">{{ activeApp.location }}</h4>
<h4 ng-show="activeApp !== 'system'">{{ activeApp.fqdn }}</h4>
<br/>
<canvas id="memoryAppChart" width="900" height="300"></canvas>
<p>Memory consumption in MB.</p>
@@ -39,7 +43,9 @@
<div class="row">
<div class="col-md-12">
<h4><span class="badge">{{ diskUsage['system'].sum }} GB</span></h4>
<canvas id="systemDiskUsageChart" width="200" height="200"></canvas>
<div style="width: 200px; height: 200px; margin: auto;">
<canvas id="systemDiskUsageChart" style="width: 200px; height: 200px;"></canvas>
</div>
<p>
<span class="text-success">Free {{ diskUsage['system'].free }} GB</span>
&nbsp;