diff --git a/plugins/dynamix.apcupsd/UPSdetails.page b/plugins/dynamix.apcupsd/UPSdetails.page index 0e2fa76e2..687d2e006 100644 --- a/plugins/dynamix.apcupsd/UPSdetails.page +++ b/plugins/dynamix.apcupsd/UPSdetails.page @@ -31,5 +31,5 @@ $(getUPSstatus); - +
KeyValueKeyValue
Please wait, retrieving UPS information...
diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index e7a4d581d..88e39798e 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -41,7 +41,7 @@ th.three{width:3%} - +
ApplicationVersionNetworkPort Mappings (App to Host)Volume Mappings (App to Host)AutostartLog
Please wait... retrieving container information
diff --git a/plugins/dynamix.plugin.manager/Plugins.page b/plugins/dynamix.plugin.manager/Plugins.page index 6736d1128..f4b7af191 100644 --- a/plugins/dynamix.plugin.manager/Plugins.page +++ b/plugins/dynamix.plugin.manager/Plugins.page @@ -71,5 +71,5 @@ $(function() { - +
PluginAuthorVersionStatusUninstall
Please wait, retrieving and updating plugin information ...
diff --git a/plugins/dynamix.plugin.manager/Update.page b/plugins/dynamix.plugin.manager/Update.page index 888c1fc2b..33944ef3e 100644 --- a/plugins/dynamix.plugin.manager/Update.page +++ b/plugins/dynamix.plugin.manager/Update.page @@ -15,7 +15,7 @@ Tag="thumbs-up" */ ?> Please wait, retrieving and updating system information ..."; +$empty = ""; $version = $date = 'unknown'; if (file_exists('/boot/previous/changes.txt')) { diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 845948bd0..06de1ddc0 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -112,7 +112,7 @@ th.five{width:5%} - +
NameDescriptionCPUsMemoryvDisksGraphicsAutostart
Please wait... retrieving VM information
diff --git a/plugins/dynamix/Browse.page b/plugins/dynamix/Browse.page index 55f77c4e1..87dc36823 100644 --- a/plugins/dynamix/Browse.page +++ b/plugins/dynamix/Browse.page @@ -33,6 +33,6 @@ $(function(){ - +
TypeNameSizeLast ModifiedLocation
Please wait, loading information ...
diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index e8095409c..8f92ebbf8 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -29,8 +29,14 @@ foreach ($shares as $share) { $total = exec("awk '/^MemTotal/{print $2*1024/1.048576}' /proc/meminfo"); exec("ls /sys/class/net|grep -Po '^(lo|(bond|eth)\d+)$'",$ports); -$memory_installed = exec("dmidecode -t 17 | awk -F: '/^\tSize: [0-9]+ MB$/{t+=$2} /^\tSize: [0-9]+ GB$/{t+=$2*1024} END{print t}'")/1024; -$memory_maximum = exec("dmidecode -t 16 | awk -F: '/^\tMaximum Capacity: [0-9]+ GB$/{t+=$2} END{print t}'"); +$memory_installed = exec("dmidecode -qt17|awk -F: '/^\tSize: [0-9]+ MB\$/{t+=\$2};/^\tSize: [0-9]+ GB\$/{t+=\$2*1024};/^\tSize: [0-9]+ TB\$/{t+=\$2*1048576} END{print t}'"); +list($memory_maximum,$ecc_support) = array_map('trim',explode('#',exec("dmidecode -qt16|awk -F: '/^\tMaximum Capacity: [0-9]+ GB\$/{t+=\$2*1024};/^\tMaximum Capacity: [0-9]+ TB\$/{t+=\$2*1048576};/^\tError Correction Type:/{e=\$2} END{print t\"#\"e}'"))); +if ($memory_installed >= 1024) { + $memory_installed = round($memory_installed/1024); + $memory_maximum = round($memory_maximum/1024); + $unit = 'GB'; +} else $unit = 'MB'; + // If maximum < installed then roundup maximum to the next power of 2 size of installed. E.g. 6 -> 8 or 12 -> 16 if ($memory_maximum < $memory_installed) $memory_maximum = pow(2,ceil(log($memory_installed)/log(2))); @@ -229,7 +235,7 @@ $dck = exec("df /var/lib/docker|grep -om1 '^/'"); flash log docker
Not available Memory sizeallocated -installed +installedmax. installable capacity $memory_maximum $unit"?> 1):?>Network diff --git a/plugins/dynamix/DeviceAttributes.page b/plugins/dynamix/DeviceAttributes.page index 7c0d06535..db04e714c 100644 --- a/plugins/dynamix/DeviceAttributes.page +++ b/plugins/dynamix/DeviceAttributes.page @@ -24,7 +24,7 @@ $(function() { - +
#Attribute NameFlagValueWorstThresholdTypeUpdatedFailedRaw Value
 Please wait... retrieving S.M.A.R.T. information!
diff --git a/plugins/dynamix/DeviceCapabilities.page b/plugins/dynamix/DeviceCapabilities.page index 50ecc9711..c0c8ffb05 100644 --- a/plugins/dynamix/DeviceCapabilities.page +++ b/plugins/dynamix/DeviceCapabilities.page @@ -24,7 +24,7 @@ $(function() { - +
FeatureValueInformation
 Please wait... retrieving S.M.A.R.T. information!
diff --git a/plugins/dynamix/DeviceIdentify.page b/plugins/dynamix/DeviceIdentify.page index 517a74836..f7979685f 100644 --- a/plugins/dynamix/DeviceIdentify.page +++ b/plugins/dynamix/DeviceIdentify.page @@ -32,7 +32,7 @@ $(function() { - +
TitleInformation
 Please wait... retrieving S.M.A.R.T. information!
diff --git a/plugins/dynamix/DiskList.page b/plugins/dynamix/DiskList.page index 255f732b7..0947a6b40 100644 --- a/plugins/dynamix/DiskList.page +++ b/plugins/dynamix/DiskList.page @@ -19,7 +19,7 @@ Cond="$var['fsState']!='Stopped' && $var['shareDisk']!='no'" function displayDisks(all) { if (all == 'yes') { $.cookie('ssz','ssz',{path:'/'}); - $('#disk_list').html("Please wait... computing disk shares!"); + $('#disk_list').html(""); } $.get('/webGui/include/DiskList.php',{compute:all,path:'',scale:'',number:'',fill:$.cookie('ssz')},function(data){ $.removeCookie('ssz',{path:'/'}) diff --git a/plugins/dynamix/NotificationsArchive.page b/plugins/dynamix/NotificationsArchive.page index 02d603e57..d55649df3 100644 --- a/plugins/dynamix/NotificationsArchive.page +++ b/plugins/dynamix/NotificationsArchive.page @@ -81,6 +81,6 @@ $(function(){ - +
TimeEventSubjectDescriptionImportance
Please wait, loading information ...
diff --git a/plugins/dynamix/SSLSettings.page b/plugins/dynamix/SSLSettings.page index 07f069a6e..97f135ec8 100644 --- a/plugins/dynamix/SSLSettings.page +++ b/plugins/dynamix/SSLSettings.page @@ -52,7 +52,7 @@ $tasks = find_tasks();