summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorSimon Rettberg2015-12-04 21:13:36 +0100
committerSimon Rettberg2015-12-04 21:13:36 +0100
commit19429f6dddb1403b226432cf3118be09962a1d22 (patch)
tree0f4bcb564a4a6063023e8d9bfe759e8a3915dbf0 /templates
parentJS: Use documentLoaded event where possible (diff)
downloadslx-admin-19429f6dddb1403b226432cf3118be09962a1d22.tar.gz
slx-admin-19429f6dddb1403b226432cf3118be09962a1d22.tar.xz
slx-admin-19429f6dddb1403b226432cf3118be09962a1d22.zip
[statistics] More tweaks, add detailed memory information, show system manufacturer if known
Diffstat (limited to 'templates')
-rw-r--r--templates/statistics/id44.html4
-rw-r--r--templates/statistics/kvmstate.html4
-rw-r--r--templates/statistics/machine-main.html23
-rw-r--r--templates/statistics/memory.html4
4 files changed, 27 insertions, 8 deletions
diff --git a/templates/statistics/id44.html b/templates/statistics/id44.html
index d9c92c47..730839b1 100644
--- a/templates/statistics/id44.html
+++ b/templates/statistics/id44.html
@@ -5,7 +5,7 @@
</div>
<div class="panel-body">
<div class="row">
- <div class="col-md-6">
+ <div class="col-sm-6">
<table class="table table-condensed table-striped">
<tr>
<th>{{lang_partitionSize}}</th>
@@ -19,7 +19,7 @@
{{/rows}}
</table>
</div>
- <div class="col-md-6">
+ <div class="col-sm-6">
<canvas id="temppartchart" style="width:100%;height:250px"></canvas>
<script type="text/javascript">
document.addEventListener("DOMContentLoaded", function() {
diff --git a/templates/statistics/kvmstate.html b/templates/statistics/kvmstate.html
index 5431990c..107a34f7 100644
--- a/templates/statistics/kvmstate.html
+++ b/templates/statistics/kvmstate.html
@@ -5,7 +5,7 @@
</div>
<div class="panel-body">
<div class="row">
- <div class="col-md-6">
+ <div class="col-sm-6">
<table class="table table-condensed table-striped">
<tr>
<th>{{lang_kvmState}}</th>
@@ -19,7 +19,7 @@
{{/rows}}
</table>
</div>
- <div class="col-md-6">
+ <div class="col-sm-6">
<canvas id="kvmchart" style="width:100%;height:250px"></canvas>
<script type="text/javascript">
document.addEventListener("DOMContentLoaded", function() {
diff --git a/templates/statistics/machine-main.html b/templates/statistics/machine-main.html
index 985194bf..52e0aee8 100644
--- a/templates/statistics/machine-main.html
+++ b/templates/statistics/machine-main.html
@@ -63,10 +63,29 @@
{{/Sockets}}
</td>
</tr>
+ <tr>
+ <td>{{lang_model}}</td>
+ <td>{{pcmodel}} ({{manufacturer}})</td>
+ </tr>
<tr class="{{ramclass}}">
<td>{{lang_ram}}</td>
- <td>{{gbram}}&thinsp;GiB</td>
+ <td>
+ {{gbram}}&thinsp;GiB
+ {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}}
+ {{ramtype}}
+ </td>
+ </tr>
+ {{#extram}}
+ <tr>
+ <td>{{lang_ramSlots}}</td>
+ <td>
+ {{ramslotcount}}:
+ {{#ramslot}}
+ [ {{size}} ]
+ {{/ramslot}}
+ </td>
</tr>
+ {{/extram}}
<tr class="{{hddclass}}">
<td>{{lang_tempPart}}</td>
<td>{{gbtmp}}&thinsp;GiB</td>
@@ -79,4 +98,4 @@
</div>
</div>
</div>
-</div> \ No newline at end of file
+</div>
diff --git a/templates/statistics/memory.html b/templates/statistics/memory.html
index 1ebfbae0..f4d2ad24 100644
--- a/templates/statistics/memory.html
+++ b/templates/statistics/memory.html
@@ -5,7 +5,7 @@
</div>
<div class="panel-body">
<div class="row">
- <div class="col-md-6">
+ <div class="col-sm-6">
<table class="table table-condensed table-striped">
<tr>
<th>{{lang_ramSize}}</th>
@@ -19,7 +19,7 @@
{{/rows}}
</table>
</div>
- <div class="col-md-6">
+ <div class="col-sm-6">
<canvas id="ramsizechart" style="width:100%;height:250px"></canvas>
<script type="text/javascript">
document.addEventListener("DOMContentLoaded", function() {