-
+ |
+
|
{{cores}}
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html
index f76b5770..333af1ec 100644
--- a/modules-available/statistics/templates/machine-main.html
+++ b/modules-available/statistics/templates/machine-main.html
@@ -18,37 +18,37 @@
- {{lang_uuid}} |
+ {{lang_uuid}} |
{{machineuuid}} |
- {{lang_macAddr}} |
+ {{lang_macAddr}} |
{{macaddr}} |
- {{lang_ip}} |
+ {{lang_ip}} |
{{clientip}} |
{{#hostname}}
- {{lang_hostname}} |
+ {{lang_hostname}} |
{{hostname}} |
{{/hostname}}
- {{lang_firstSeen}} |
+ {{lang_firstSeen}} |
{{firstseen_s}} |
- {{lang_lastBoot}} |
+ {{lang_lastBoot}} |
{{lastboot_s}} |
- {{lang_lastSeen}} |
+ {{lang_lastSeen}} |
{{lastseen_s}} |
- {{lang_usageState}} |
+ {{lang_usageState}} |
{{#state_off}}
{{lang_machineOff}}
@@ -82,7 +82,7 @@
- {{lang_cpuModel}} |
+ {{lang_cpuModel}} |
{{cpumodel}}
{{#Sockets}}
@@ -93,11 +93,11 @@
|
- {{lang_model}} |
+ {{lang_model}} |
{{pcmodel}} ({{manufacturer}}) |
- {{lang_ram}} |
+ {{lang_ram}} |
{{gbram}} GiB
{{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}}
@@ -106,7 +106,7 @@
|
{{#extram}}
- {{lang_ramSlots}} |
+ {{lang_ramSlots}} |
{{ramslotcount}}:
{{#ramslot}}
@@ -116,11 +116,11 @@
|
{{/extram}}
- {{lang_tempPart}} |
+ {{lang_tempPart}} |
{{gbtmp}} GiB |
- {{lang_64bitSupport}} |
+ {{lang_64bitSupport}} |
{{kvmstate}} |
diff --git a/modules-available/statistics/templates/machine-usage.html b/modules-available/statistics/templates/machine-usage.html
index ffaa747b..ef969fc6 100644
--- a/modules-available/statistics/templates/machine-usage.html
+++ b/modules-available/statistics/templates/machine-usage.html
@@ -9,9 +9,9 @@
- Type |
- When |
- Length |
+ {{lang_eventType}} |
+ {{lang_when}} |
+ {{lang_duration}} |
{{#rows}}
@@ -26,9 +26,9 @@
{{#hasrows2}}
- Type |
- When |
- Length |
+ {{lang_eventType}} |
+ {{lang_when}} |
+ {{lang_duration}} |
{{/hasrows2}}
{{#rows2}}
--
cgit v1.2.3-55-g7522
From 9bab370edab58feb8b0efa34b51029315152431b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 8 Aug 2016 15:26:28 +0200
Subject: [baseconfig] Disable selectize.js for shadow feature; set shadow
status on load
---
modules-available/baseconfig/templates/_page.html | 34 +++++++++++++---------
.../baseconfig_bwlp/baseconfig/settings.json | 32 +++++---------------
2 files changed, 27 insertions(+), 39 deletions(-)
diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html
index 8bfd1b6a..7bd5f6c9 100644
--- a/modules-available/baseconfig/templates/_page.html
+++ b/modules-available/baseconfig/templates/_page.html
@@ -70,35 +70,41 @@
diff --git a/modules-available/baseconfig_bwlp/baseconfig/settings.json b/modules-available/baseconfig_bwlp/baseconfig/settings.json
index d10e2a9e..5b76eb3f 100644
--- a/modules-available/baseconfig_bwlp/baseconfig/settings.json
+++ b/modules-available/baseconfig_bwlp/baseconfig/settings.json
@@ -45,7 +45,8 @@
"catid": "networking",
"defaultvalue": "off",
"permissions": "2",
- "validator": "list:off|on|auto"
+ "validator": "list:off|on|auto",
+ "shadows": "off -> SLX_PROXY_PORT, off -> SLX_PROXY_TYPE, off -> SLX_PROXY_IP, off -> SLX_PROXY_BLACKLIST"
},
"SLX_PROXY_PORT": {
"catid": "networking",
@@ -91,15 +92,15 @@
},
"SLX_SHUTDOWN_TIMEOUT": {
"catid": "power",
- "defaultvalue": "1200",
+ "defaultvalue": "1800",
"permissions": "2",
"validator": "regex:\/^\\d*$\/"
},
- "SLX_BENCHMARK_VM": {
- "catid": "other",
- "defaultvalue": "",
+ "SLX_SCREEN_STANDBY_TIMEOUT": {
+ "catid": "power",
+ "defaultvalue": "600",
"permissions": "2",
- "validator": ""
+ "validator": "regex:\/^\\d*$\/"
},
"SLX_VMCHOOSER_TAB": {
"catid": "vmchooser",
@@ -118,24 +119,5 @@
"defaultvalue": "BUMP",
"permissions": "2",
"validator": "list:IGNORE|BUMP|EXCLUSIVE"
- },
- "SLX_VMCHOOSER_DUMMYSETTING1": {
- "catid": "vmchooser",
- "defaultvalue": "",
- "permissions": "2",
- "validator": "list:ON|OFF",
- "shadows": "OFF -> SLX_LOGOUT_TIMEOUT, OFF -> SLX_VMCHOOSER_DUMMYSETTING2"
- },
- "SLX_VMCHOOSER_DUMMYSETTING2": {
- "catid": "vmchooser",
- "defaultvalue": "",
- "permissions": "2",
- "validator": "multilist:Apples|Bananas|Pears"
- },
- "SLX_VMCHOOSER_DUMMYSETTING3": {
- "catid": "vmchooser",
- "defaultvalue": "",
- "permissions": "2",
- "validator": "multiinput"
}
}
--
cgit v1.2.3-55-g7522
| |