From e90ba2d00f6541a4bb46c6b60ae6568cfc7dc08d Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 3 Jun 2018 09:12:22 +0200
Subject: [PATCH] Docker: added cpu load and memory load display

---
 plugins/dynamix.docker.manager/DockerContainers.page        | 3 +++
 plugins/dynamix.docker.manager/include/DockerContainers.php | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page
index e9e0df882..86be19de0 100644
--- a/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/plugins/dynamix.docker.manager/DockerContainers.page
@@ -102,6 +102,9 @@ function loadlist(update) {
     resize();
     $(window).bind('resize',function(){resize(true);});
 <?endif;?>
+    $('.iconstatus').each(function(){
+      if ($(this).hasClass('stopped')) $('div.'+$(this).prop('id')).hide();
+    });
     $('.autostart').switchButton({labels_placement:"right"});
     $('.autostart').change(function() {
       $.post( "/plugins/dynamix.docker.manager/include/UpdateConfig.php",{action:'autostart',container:$(this).attr('container'),response:'json'},function(data){$(this).prop('checked',data.autostart);},'json');
diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php
index ea386466b..7852c6de2 100644
--- a/plugins/dynamix.docker.manager/include/DockerContainers.php
+++ b/plugins/dynamix.docker.manager/include/DockerContainers.php
@@ -71,7 +71,7 @@ foreach ($containers as $ct) {
   echo "<tr class='sortable'><td style='width:48px;padding:4px'>";
   echo "<div id='$id' style='display:block; cursor:pointer'><div style='position:relative;width:48px;height:48px;margin:0px auto'>";
   echo "<img src='".htmlspecialchars($icon)."' class='$status' style='position:absolute;top:0;bottom:0;left:0;right:0;width:48px;height:48px'>";
-  echo "<i class='fa iconstatus fa-$shape $status' title='$status'></i></div></div>";
+  echo "<i id='load-$id' class='fa iconstatus fa-$shape $status' title='$status'></i></div></div>";
   echo "</td><td class='ct-name'>";
   if ($template) {
     echo "<a class='exec' onclick=\"editContainer('".addslashes(htmlspecialchars($name))."','".addslashes(htmlspecialchars($template))."')\">".htmlspecialchars($name)."</a>";
@@ -100,8 +100,8 @@ foreach ($containers as $ct) {
   echo "</td><td>{$ct['NetworkMode']}</td>";
   echo "<td style='white-space:nowrap'><span class='docker_readmore'>".implode('<br>',$ports)."</span></td>";
   echo "<td style='word-break:break-all'><span class='docker_readmore'>".implode('<br>',$paths)."</span></td>";
-  echo "<td class='advanced'><div class='usage-disk sys'><span id='cpu-$id' style='width:0'>-</span></div></td>";
-  echo "<td class='advanced'><div class='usage-disk sys'><span id='mem-$id' style='width:0'>-</span></div></td>";
+  echo "<td class='advanced'><div class='usage-disk sys load-$id'><span id='cpu-$id' style='width:0'></span></div></td>";
+  echo "<td class='advanced'><div class='usage-disk sys load-$id'><span id='mem-$id' style='width:0'></span></div></td>";
   echo "<td><input type='checkbox' class='autostart' container='".htmlspecialchars($name)."'".($info['autostart'] ? ' checked':'')."></td>";
   echo "<td><a class='log' onclick=\"containerLogs('".addslashes(htmlspecialchars($name))."','$id',false,false)\"><img class='basic' src='/plugins/dynamix/icons/log.png'><div class='advanced'>";
   echo htmlspecialchars(str_replace('Up','Uptime',$ct['Status']))."</div><div class='advanced' style='margin-top:4px'>Created ".htmlspecialchars($ct['Created'])."</div></a></td></tr>";