From 63cd5dabbb4be490f57668bd433306ff84df70fc Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 10 Jan 2019 23:40:02 +0100 Subject: [PATCH 01/25] Dashboard: more updates and corrections + save money --- plugins/dynamix/DashStats.page | 10 +++------- plugins/dynamix/include/DashboardApps.php | 14 +++++++++----- plugins/dynamix/styles/default-azure.css | 10 +++++----- plugins/dynamix/styles/default-black.css | 14 +++++++------- plugins/dynamix/styles/default-gray.css | 10 +++++----- plugins/dynamix/styles/default-white.css | 14 +++++++------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index 220354817..a30646ca4 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -141,11 +141,7 @@ if ($low) $memory_maximum = pow(2,ceil(log($memory_installed)/log(2))); .switch-button-label{float:left;cursor:pointer} .switch-button-background{float:left;position:relative;top:12px;background:#ccc;border:1px solid #aaa;margin:0 10px;border-radius:4px;cursor:pointer} .switch-button-button{position:absolute;left:-1px;top:-1px;background:#fafafa;border:1px solid #aaa;border-radius:4px} -img,i.img{width:32px;height:32px;margin-right:10px} -i.started{color:#009900} -i.stopped{color:#ef3d47} -i.paused{color:#f0dd33} -span.update{color:#3b5998} +img.img,i.img{width:32px;height:32px;margin-right:10px} span.outer{float:left;margin-bottom:20px;margin-right:20px;cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} @@ -452,8 +448,8 @@ function noVMs() { } function loadlist(init) { if (init) { - $('#apps').switchButton({show_labels:false, checked:$.cookie('my_apps')=='startedOnly'}); - $('#vms').switchButton({show_labels:false, checked:$.cookie('my_vms')=='startedOnly'}); + $('#apps').switchButton({labels_placement:'left', off_label:'All Apps', on_label:'Started only', checked:$.cookie('my_apps')=='startedOnly'}); + $('#vms').switchButton({labels_placement:'left', off_label:'All VMs', on_label:'Started only', checked:$.cookie('my_vms')=='startedOnly'}); $('#apps').change(function(){ $('span.outer.apps.stopped').finish().toggle('fast',function(){noApps();}) $('#apps').is(':checked') ? $.cookie('my_apps','startedOnly',{expires:3650}) : $.removeCookie('my_apps'); diff --git a/plugins/dynamix/include/DashboardApps.php b/plugins/dynamix/include/DashboardApps.php index aa0e77683..07934cdeb 100644 --- a/plugins/dynamix/include/DashboardApps.php +++ b/plugins/dynamix/include/DashboardApps.php @@ -48,10 +48,11 @@ if ($display=='icons' || $display=='docker') { $menu[] = sprintf("addDockerContainerContext('%s','%s','%s',%s,%s,%s,%s,'%s','%s','%s','%s','%s');", addslashes($name), addslashes($ct['ImageId']), addslashes($template), $running, $paused, $updateStatus, $is_autostart, addslashes($webGui), $shell, $id, addslashes($support), addslashes($project)); $shape = $running ? ($paused ? 'pause' : 'play') : 'square'; $status = $running ? ($paused ? 'paused' : 'started') : 'stopped'; - $update = $updateStatus=='false' ? 'update' : ''; + $color = $status=='started' ? 'green-text' : ($status=='paused' ? 'orange-text' : 'red-text'); + $update = $updateStatus=='false' ? 'blue-text' : ''; $icon = $info['icon'] ?: '/plugins/dynamix.docker.manager/images/question.png'; - $image = substr($icon,-4)=='.png' ? "" : (substr($icon,0,5)=='icon-' ? "" : ""); - echo "$image$name
$status"; + $image = substr($icon,-4)=='.png' ? "" : (substr($icon,0,5)=='icon-' ? "" : ""); + echo "$image$name
$status"; } $none = count($containers) ? "No running docker containers" : "No docker containers defined"; echo ""; @@ -96,19 +97,22 @@ if ($display=='icons' || $display=='vms') { case 'running': $shape = 'play'; $status = 'started'; + $color = 'green-text'; break; case 'paused': case 'pmsuspended': $shape = 'pause'; $status = 'paused'; + $color = 'orange-text'; break; default: $shape = 'square'; $status = 'stopped'; + $color = 'red-text'; break; } - $image = substr($icon,-4)=='.png' ? "" : (substr($icon,0,5)=='icon-' ? "" : ""); - echo "$image$vm
$status"; + $image = substr($icon,-4)=='.png' ? "" : (substr($icon,0,5)=='icon-' ? "" : ""); + echo "$image$vm
$status"; } $none = count($vms) ? "No running virtual machines" : "No virtual machines defined"; echo ""; diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index 7a5126d40..e0cd26e25 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -1,8 +1,8 @@ html{font-family:clear-sans;font-size:62.5%;height:100%} body{font-size:1.3rem;color:#606e7f;background-color:#e4e2e4;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} -@media (max-width:1280px){#template{min-width:1280px;margin:0}} -@media (min-width:1281px){#template{min-width:1280px;margin:0}} -@media (min-width:1921px){#template{min-width:1280px;max-width:1920px;margin:0 auto}} +@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}} +@media (min-width:1281px){#template{min-width:1260px;margin:0}} +@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}} img{border:none;text-decoration:none;vertical-align:middle} p{text-align:left} p.centered{text-align:left} @@ -173,8 +173,8 @@ table.share_status.dashboard td i[class^="icon-u-"]{font-size:inherit} table.share_status.dashboard td span[class^="fa "]{font-size:1.6rem;margin-right:8px} table.share_status.dashboard td i#mycase[class^="case-"]{font-size:128px} table.share_status.dashboard td i#mycase[class^="fa "]{font-size:96px} -table.share_status.dashboard td i.chevron{float:right;font-size:1.1rem!important;margin-top:-10px;margin-right:2px;cursor:pointer;color:#606e7f} -table.share_status.dashboard td i.chevron.mt0{margin-top:0} +table.share_status.dashboard td i.chevron{float:right;font-size:1.1rem!important;margin-top:0;margin-right:2px;cursor:pointer;color:#606e7f} +table.share_status.dashboard td i.chevron.mt0{margin-top:14px} table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px} table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0} table.share_status.dashboard td span.info{float:right;margin-right:20px;font-size:1.2rem;font-weight:normal;text-transform:none;letter-spacing:0} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index 5a10d55a7..6247cb721 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -1,8 +1,8 @@ html{font-family:clear-sans;font-size:62.5%;height:100%} body{font-size:1.3rem;color:#f2f2f2;background-color:#1c1b1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} -@media (max-width:1280px){#template{min-width:1280px;margin:0}} -@media (min-width:1281px){#template{min-width:1280px;margin:0 10px}} -@media (min-width:1921px){#template{min-width:1280px;max-width:1920px;margin:0 auto}} +@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}} +@media (min-width:1281px){#template{min-width:1260px;margin:0 10px}} +@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}} img{border:none;text-decoration:none;vertical-align:middle} p{text-align:justify} p.centered{text-align:left} @@ -44,7 +44,7 @@ select.slot{min-width:44rem;max-width:44rem} input.narrow{width:166px} input.trim{width:76px;min-width:76px} textarea{resize:none} -#header{position:absolute;top:0;left:0;width:100%;min-width:1280px;height:91px;z-index:100;margin:0;color:#1c1b1b;background-color:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat} +#header{position:absolute;top:0;left:0;width:100%;min-width:1260px;height:91px;z-index:100;margin:0;color:#1c1b1b;background-color:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat} #header .logo{float:left;margin-left:10px;color:#e22828;width:160px;text-align:center} #header .logo svg{width:160px;display:block;margin:25px 50px 8px 0} #header .block{margin:0;float:right;text-align:right;background-color:rgba(242,242,242,0.3);padding:10px 12px} @@ -57,7 +57,7 @@ textarea{resize:none} #title span.right{font-size:1.4rem;padding-top:2px;padding-right:10px;float:right} #title span img{padding-right:4px} #title.shift{margin-top:-30px} -#menu{position:absolute;top:90px;left:0;width:100%;min-width:1280px;height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;background-color:#f2f2f2;z-index:101} +#menu{position:absolute;top:90px;left:0;width:100%;min-width:1260px;height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;background-color:#f2f2f2;z-index:101} #nav-block{overflow:hidden;height:4rem;letter-spacing:1.8px} #nav-left{float:left} #nav-right{float:right} @@ -174,8 +174,8 @@ table.share_status.dashboard td i[class^="icon-u-"]{font-size:inherit} table.share_status.dashboard td span[class^="fa "]{font-size:1.6rem;margin-right:8px} table.share_status.dashboard td i#mycase[class^="case-"]{font-size:128px} table.share_status.dashboard td i#mycase[class^="fa "]{font-size:96px} -table.share_status.dashboard td i.chevron{float:right;font-size:1.1rem!important;margin-top:-10px;margin-right:2px;cursor:pointer;color:#f2f2f2} -table.share_status.dashboard td i.chevron.mt0{margin-top:0} +table.share_status.dashboard td i.chevron{float:right;font-size:1.1rem!important;margin-top:0;margin-right:2px;cursor:pointer;color:#f2f2f2} +table.share_status.dashboard td i.chevron.mt0{margin-top:14px} table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px} table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0} table.share_status.dashboard td span.info{float:right;margin-right:20px;font-size:1.2rem;font-weight:normal;text-transform:none;letter-spacing:0} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index 58f16251d..d4bb5a7f7 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -1,8 +1,8 @@ html{font-family:clear-sans;font-size:62.5%;height:100%} body{font-size:1.3rem;color:#606e7f;background-color:#1b1d1b;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} -@media (max-width:1280px){#template{min-width:1280px;margin:0}} -@media (min-width:1281px){#template{min-width:1280px;margin:0}} -@media (min-width:1921px){#template{min-width:1280px;max-width:1920px;margin:0 auto}} +@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}} +@media (min-width:1281px){#template{min-width:1260px;margin:0}} +@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}} img{border:none;text-decoration:none;vertical-align:middle} p{text-align:left} p.centered{text-align:left} @@ -173,8 +173,8 @@ table.share_status.dashboard td i[class^="icon-u-"]{font-size:inherit} table.share_status.dashboard td span[class^="fa "]{font-size:1.6rem;margin-right:8px} table.share_status.dashboard td i#mycase[class^="case-"]{font-size:128px} table.share_status.dashboard td i#mycase[class^="fa "]{font-size:96px} -table.share_status.dashboard td i.chevron{float:right;font-size:1.1rem!important;margin-top:-10px;margin-right:2px;cursor:pointer;color:#606e7f} -table.share_status.dashboard td i.chevron.mt0{margin-top:0} +table.share_status.dashboard td i.chevron{float:right;font-size:1.1rem!important;margin-top:0;margin-right:2px;cursor:pointer;color:#606e7f} +table.share_status.dashboard td i.chevron.mt0{margin-top:14px} table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px} table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0} table.share_status.dashboard td span.info{float:right;margin-right:20px;font-size:1.2rem;font-weight:normal;text-transform:none;letter-spacing:0} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index 3320cc267..2242e0e27 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -1,8 +1,8 @@ html{font-family:clear-sans;font-size:62.5%;height:100%} body{font-size:1.3rem;color:#1c1b1b;background-color:#f2f2f2;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} -@media (max-width:1280px){#template{min-width:1280px;margin:0}} -@media (min-width:1281px){#template{min-width:1280px;margin:0 10px}} -@media (min-width:1921px){#template{min-width:1280px;max-width:1920px;margin:0 auto}} +@media (max-width:1280px){#template{min-width:1260px;max-width:1260px;margin:0}} +@media (min-width:1281px){#template{min-width:1260px;margin:0 10px}} +@media (min-width:1921px){#template{min-width:1260px;max-width:1920px;margin:0 auto}} img{border:none;text-decoration:none;vertical-align:middle} p{text-align:justify} p.centered{text-align:left} @@ -44,7 +44,7 @@ select.slot{min-width:44rem;max-width:44rem} input.narrow{width:166px} input.trim{width:76px;min-width:76px} textarea{resize:none} -#header{position:absolute;top:0;left:0;width:100%;min-width:1280px;height:91px;z-index:100;margin:0;color:#f2f2f2;background-color:#1c1b1b;background-size:100% 90px;background-repeat:no-repeat} +#header{position:absolute;top:0;left:0;width:100%;min-width:1260px;height:91px;z-index:100;margin:0;color:#f2f2f2;background-color:#1c1b1b;background-size:100% 90px;background-repeat:no-repeat} #header .logo{float:left;margin-left:10px;color:#e22828;width:160px;text-align:center} #header .logo svg{width:160px;display:block;margin:25px 50px 8px 0} #header .block{margin:0;float:right;text-align:right;background-color:rgba(28,27,27,0.3);padding:10px 12px} @@ -57,7 +57,7 @@ textarea{resize:none} #title span.right{font-size:1.4rem;padding-top:2px;padding-right:10px;float:right} #title span img{padding-right:4px} #title.shift{margin-top:-30px} -#menu{position:absolute;top:90px;left:0;width:100%;min-width:1280px;height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;background-color:#1c1b1b;z-index:101} +#menu{position:absolute;top:90px;left:0;width:100%;min-width:1260px;height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;background-color:#1c1b1b;z-index:101} #nav-block{overflow:hidden;height:4rem;letter-spacing:1.8px} #nav-left{float:left} #nav-right{float:right} @@ -174,8 +174,8 @@ table.share_status.dashboard td i[class^="icon-u-"]{font-size:inherit} table.share_status.dashboard td span[class^="fa "]{font-size:1.6rem;margin-right:8px} table.share_status.dashboard td i#mycase[class^="case-"]{font-size:128px} table.share_status.dashboard td i#mycase[class^="fa "]{font-size:96px} -table.share_status.dashboard td i.chevron{float:right;font-size:1.1rem!important;margin-top:-10px;margin-right:2px;cursor:pointer;color:#1c1b1b} -table.share_status.dashboard td i.chevron.mt0{margin-top:0} +table.share_status.dashboard td i.chevron{float:right;font-size:1.1rem!important;margin-top:0;margin-right:2px;cursor:pointer;color:#1c1b1b} +table.share_status.dashboard td i.chevron.mt0{margin-top:14px} table.share_status.dashboard td div.section{display:inline-block;vertical-align:top;margin-left:4px;font-size:1.2rem;font-weight:bold;text-transform:uppercase;letter-spacing:1px} table.share_status.dashboard td div.section span{font-weight:normal;text-transform:none;letter-spacing:0} table.share_status.dashboard td span.info{float:right;margin-right:20px;font-size:1.2rem;font-weight:normal;text-transform:none;letter-spacing:0} From 0c3536412829c052b7a88e95a20abd5ae99a8f4b Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 10 Jan 2019 23:52:20 +0100 Subject: [PATCH 02/25] switch button style update --- plugins/dynamix/styles/jquery.switchbutton.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/dynamix/styles/jquery.switchbutton.css b/plugins/dynamix/styles/jquery.switchbutton.css index 4b970aa94..7dca7c25c 100644 --- a/plugins/dynamix/styles/jquery.switchbutton.css +++ b/plugins/dynamix/styles/jquery.switchbutton.css @@ -1,5 +1,3 @@ -.switch-button-label{float:left;font-size:1.4rem;cursor:pointer;} -.switch-button-label.off{color:#adadad;} -.switch-button-label.on{color:#0088CC;} -.switch-button-background{float:left;position:relative;background:#ccc;border:1px solid #aaa;margin:1px 10px;border-radius:4px;cursor:pointer;} -.switch-button-button{position:absolute;left:-1px;top:-1px;background:#FAFAFA;border:1px solid #aaa;border-radius:4px;} \ No newline at end of file +.switch-button-label{float:left;font-size:1.1rem;text-transform:uppercase;letter-spacing:1px;cursor:pointer} +.switch-button-background{float:left;position:relative;background:#ccc;border:1px solid #aaa;margin:1px 10px;border-radius:4px;cursor:pointer} +.switch-button-button{position:absolute;left:-1px;top:-1px;background:#fafafa;border:1px solid #aaa;border-radius:4px} \ No newline at end of file From a8efed8f96143cad0aa2a6e988d6bdeb97ab113a Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 01:29:58 +0100 Subject: [PATCH 03/25] Docker containers list update --- .../DockerContainers.page | 28 +++++++++---------- .../include/DockerContainers.php | 25 ++++++++--------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index 7b71124ac..3dfb69748 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -29,27 +29,25 @@ $cpus = cpu_list(); table#docker_containers{text-align:left} .basic{display:block} .advanced{display:none;white-space:nowrap} -body{-webkit-overflow-scrolling:touch} -img.started{opacity:1.0} -img.stopped{opacity:0.3} -img.paused{opacity:0.6} .log{cursor:zoom-in} .exec{cursor:pointer} -.iconstatus{position:absolute;z-index:2;bottom:-4px;right:-4px;font-size:1.4rem;text-shadow:0 0 2px #FFF} -.started{color:#009900} -.stopped{color:#EF3D47} -.paused{color:#F0DD33} -.switch-button-label.off{color:inherit} th.five{width:5%} -th.eight{width:8%} +th.nine{width:9%} th.load{width:100px} -tbody > tr.sortable:hover{cursor:move} +tbody>tr.sortable:hover{cursor:move} input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent} +img.img,i.img{width:32px;height:32px;margin-right:10px} +span.outer{float:left;margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer.started>img,span.outer.started>i.img{opacity:1.0} +span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} +span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} +span.inner{display:inline-block;vertical-align:top} +span.state{font-size:1.1rem;margin-left:7px} - +
ApplicationVersionNetworkPort Mappings (App to Host)Volume Mappings (App to Host)CPU loadMemory loadAutostartLog
VersionNetworkPort Mappings (App to Host)Volume Mappings (App to Host)CPU loadMemory loadAutostartLog
@@ -154,8 +152,10 @@ watchDocker.on('message', function(data){ var id = row.split(' '); var w1 = Math.round(Math.min(id[1].slice(0,-1)/,100)*100)/100+'%'; var w2 = Math.round(Math.min(id[2].slice(0,-1),100)*100)/100+'%'; - $('#cpu-'+id[0]).css('width',w1).text(w1.replace('.','')); - $('#mem-'+id[0]).css('width',w2).text(w2.replace('.','')); + $('.cpu-'+id[0]).text(w1.replace('.','')); + $('.mem-'+id[0]).text(w2.replace('.','')); + $('#cpu-'+id[0]).css('width',w1); + $('#mem-'+id[0]).css('width',w2); } }); $(function() { diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php index ee0b05114..c67c7e4e3 100644 --- a/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -61,7 +61,9 @@ foreach ($containers as $ct) { $docker[] = "docker.push({name:'$name',id:'$id',state:$running,pause:$paused,update:'$updateStatus'});"; $shape = $running ? ($paused ? 'pause' : 'play') : 'square'; $status = $running ? ($paused ? 'paused' : 'started') : 'stopped'; + $color = $status=='started' ? 'green-text' : ($status=='paused' ? 'orange-text' : 'red-text'); $icon = $info['icon'] ?: '/plugins/dynamix.docker.manager/images/question.png'; + $image = substr($icon,-4)=='.png' ? "" : (substr($icon,0,5)=='icon-' ? "" : ""); $wait = var_split($autostart[array_search($name,$names)],1); $ports = []; foreach ($ct['Ports'] as $port) { @@ -75,19 +77,16 @@ foreach ($containers as $ct) { list($host_path,$container_path,$access_mode) = explode(':',$mount); $paths[] = sprintf('%s%s', htmlspecialchars($container_path), $access_mode=='ro'?'long-arrow-left':'arrows-h', htmlspecialchars($host_path)); } - echo ""; - echo "
"; - echo ""; - echo "
"; - echo ""; + echo ""; if ($template) { - echo "".htmlspecialchars($name).""; + $appname = "".htmlspecialchars($name).""; } else { - echo htmlspecialchars($name); + $appname = htmlspecialchars($name); } - echo "
Container ID: $id
"; - if ($ct['BaseImage']) echo "
".htmlspecialchars(${ct['BaseImage']})."
"; - echo "
By: "; + echo "$image$appname
$status"; + echo "Container ID: $id
"; + if ($ct['BaseImage']) echo "".htmlspecialchars(${ct['BaseImage']})."
"; + echo "By: "; $registry = $info['registry']; list($author,$version) = explode(':',$ct['Image']); if ($registry) { @@ -95,7 +94,7 @@ foreach ($containers as $ct) { } else { echo htmlspecialchars($author); } - echo "
"; + echo ""; if ($updateStatus=='false') { echo " update ready"; } elseif ($updateStatus=='true') { @@ -109,8 +108,8 @@ foreach ($containers as $ct) { echo "{$ct['NetworkMode']}"; echo "".implode('
',$ports).""; echo "".implode('
',$paths).""; - echo "
"; - echo "
"; + echo "0%
"; + echo "0%
"; echo ""; echo ""; echo "
"; From 593eef0f5800095943bd5bb64bf3938caa445675 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 02:00:20 +0100 Subject: [PATCH 04/25] Docker containers list update --- plugins/dynamix.docker.manager/include/DockerContainers.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php index c67c7e4e3..c595ac695 100644 --- a/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -96,12 +96,13 @@ foreach ($containers as $ct) { } echo ""; if ($updateStatus=='false') { + echo "
update required
"; echo " update ready"; } elseif ($updateStatus=='true') { - echo " up-to-date"; + echo " up-to-date"; echo "
force update
"; } else { - echo " not available"; + echo " not available"; echo "
force update
"; } echo "
$version
"; From 083ba8a3e1ff9d8c6bd5a317ac7ebae5fbd51857 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 02:48:20 +0100 Subject: [PATCH 05/25] Docker: start/stop "docker_load" depending on view --- plugins/dynamix.docker.manager/DockerContainers.page | 2 ++ .../event/docker_started/docker_load_start | 7 ------- .../event/stopping_docker/docker_load_stop | 7 ------- plugins/dynamix.docker.manager/include/UpdateConfig.php | 8 ++++++++ 4 files changed, 10 insertions(+), 14 deletions(-) delete mode 100755 plugins/dynamix.docker.manager/event/docker_started/docker_load_start delete mode 100755 plugins/dynamix.docker.manager/event/stopping_docker/docker_load_stop diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index 3dfb69748..abdf9b36f 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -87,8 +87,10 @@ function resetSorting() { function listview() { var more = $.cookie('docker_listview_mode')=='advanced'; if (more) { + $.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'docker_load_start'}); $('.docker_readmore').readmore('destroy'); } else { + $.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'docker_load_stop'}); $('.docker_readmore').readmore({maxHeight:32,moreLink:"",lessLink:""}); } $('input.autostart').each(function(){ diff --git a/plugins/dynamix.docker.manager/event/docker_started/docker_load_start b/plugins/dynamix.docker.manager/event/docker_started/docker_load_start deleted file mode 100755 index 30c2b1d7c..000000000 --- a/plugins/dynamix.docker.manager/event/docker_started/docker_load_start +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# daemonize the 'docker_load' script -DAEMON="/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load" -if [[ "$(pgrep -f $DAEMON)" == "" ]]; then - logger "Starting $(basename $DAEMON)" - $DAEMON &>/dev/null & -fi diff --git a/plugins/dynamix.docker.manager/event/stopping_docker/docker_load_stop b/plugins/dynamix.docker.manager/event/stopping_docker/docker_load_stop deleted file mode 100755 index 2eeb25cce..000000000 --- a/plugins/dynamix.docker.manager/event/stopping_docker/docker_load_stop +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# stop docker_load daemon -DAEMON="docker_load" -if [[ "$(pgrep $DAEMON)" != "" ]]; then - logger "Stopping $DAEMON" - pkill $DAEMON -fi diff --git a/plugins/dynamix.docker.manager/include/UpdateConfig.php b/plugins/dynamix.docker.manager/include/UpdateConfig.php index 45946d0aa..383a515a6 100644 --- a/plugins/dynamix.docker.manager/include/UpdateConfig.php +++ b/plugins/dynamix.docker.manager/include/UpdateConfig.php @@ -20,6 +20,14 @@ $template_repos = $dockerManPaths['template-repos']; $user_prefs = $dockerManPaths['user-prefs']; switch ($_POST['action']) { +case 'docker_load_start': + $daemon = "/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load"; + if (!exec("pgrep -f $daemon")) passthru("$daemon &>/dev/null &"); + break; +case 'docker_load_stop': + $daemon = "/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load"; + if (exec("pgrep -f $daemon")) passthru("pkill -f $daemon &>/dev/null &"); + break; case 'autostart': // update container autostart setting $container = urldecode(($_POST['container'])); From a13c914d44e7a7b92c49521ae551837acd0b0cf6 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 02:53:16 +0100 Subject: [PATCH 06/25] Revert "Docker: start/stop "docker_load" depending on view" This reverts commit 083ba8a3e1ff9d8c6bd5a317ac7ebae5fbd51857. --- plugins/dynamix.docker.manager/DockerContainers.page | 2 -- .../event/docker_started/docker_load_start | 7 +++++++ .../event/stopping_docker/docker_load_stop | 7 +++++++ plugins/dynamix.docker.manager/include/UpdateConfig.php | 8 -------- 4 files changed, 14 insertions(+), 10 deletions(-) create mode 100755 plugins/dynamix.docker.manager/event/docker_started/docker_load_start create mode 100755 plugins/dynamix.docker.manager/event/stopping_docker/docker_load_stop diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index abdf9b36f..3dfb69748 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -87,10 +87,8 @@ function resetSorting() { function listview() { var more = $.cookie('docker_listview_mode')=='advanced'; if (more) { - $.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'docker_load_start'}); $('.docker_readmore').readmore('destroy'); } else { - $.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'docker_load_stop'}); $('.docker_readmore').readmore({maxHeight:32,moreLink:"",lessLink:""}); } $('input.autostart').each(function(){ diff --git a/plugins/dynamix.docker.manager/event/docker_started/docker_load_start b/plugins/dynamix.docker.manager/event/docker_started/docker_load_start new file mode 100755 index 000000000..30c2b1d7c --- /dev/null +++ b/plugins/dynamix.docker.manager/event/docker_started/docker_load_start @@ -0,0 +1,7 @@ +#!/bin/bash +# daemonize the 'docker_load' script +DAEMON="/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load" +if [[ "$(pgrep -f $DAEMON)" == "" ]]; then + logger "Starting $(basename $DAEMON)" + $DAEMON &>/dev/null & +fi diff --git a/plugins/dynamix.docker.manager/event/stopping_docker/docker_load_stop b/plugins/dynamix.docker.manager/event/stopping_docker/docker_load_stop new file mode 100755 index 000000000..2eeb25cce --- /dev/null +++ b/plugins/dynamix.docker.manager/event/stopping_docker/docker_load_stop @@ -0,0 +1,7 @@ +#!/bin/bash +# stop docker_load daemon +DAEMON="docker_load" +if [[ "$(pgrep $DAEMON)" != "" ]]; then + logger "Stopping $DAEMON" + pkill $DAEMON +fi diff --git a/plugins/dynamix.docker.manager/include/UpdateConfig.php b/plugins/dynamix.docker.manager/include/UpdateConfig.php index 383a515a6..45946d0aa 100644 --- a/plugins/dynamix.docker.manager/include/UpdateConfig.php +++ b/plugins/dynamix.docker.manager/include/UpdateConfig.php @@ -20,14 +20,6 @@ $template_repos = $dockerManPaths['template-repos']; $user_prefs = $dockerManPaths['user-prefs']; switch ($_POST['action']) { -case 'docker_load_start': - $daemon = "/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load"; - if (!exec("pgrep -f $daemon")) passthru("$daemon &>/dev/null &"); - break; -case 'docker_load_stop': - $daemon = "/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load"; - if (exec("pgrep -f $daemon")) passthru("pkill -f $daemon &>/dev/null &"); - break; case 'autostart': // update container autostart setting $container = urldecode(($_POST['container'])); From f6f4ff5d0ce008cfce17c6e46728e2de790db825 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 02:54:38 +0100 Subject: [PATCH 07/25] Docker: start/stop "docker_load" depending on view --- plugins/dynamix.docker.manager/DockerContainers.page | 2 ++ .../event/docker_started/docker_load_start | 7 ------- plugins/dynamix.docker.manager/include/UpdateConfig.php | 8 ++++++++ 3 files changed, 10 insertions(+), 7 deletions(-) delete mode 100755 plugins/dynamix.docker.manager/event/docker_started/docker_load_start diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index 3dfb69748..abdf9b36f 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -87,8 +87,10 @@ function resetSorting() { function listview() { var more = $.cookie('docker_listview_mode')=='advanced'; if (more) { + $.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'docker_load_start'}); $('.docker_readmore').readmore('destroy'); } else { + $.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'docker_load_stop'}); $('.docker_readmore').readmore({maxHeight:32,moreLink:"",lessLink:""}); } $('input.autostart').each(function(){ diff --git a/plugins/dynamix.docker.manager/event/docker_started/docker_load_start b/plugins/dynamix.docker.manager/event/docker_started/docker_load_start deleted file mode 100755 index 30c2b1d7c..000000000 --- a/plugins/dynamix.docker.manager/event/docker_started/docker_load_start +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# daemonize the 'docker_load' script -DAEMON="/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load" -if [[ "$(pgrep -f $DAEMON)" == "" ]]; then - logger "Starting $(basename $DAEMON)" - $DAEMON &>/dev/null & -fi diff --git a/plugins/dynamix.docker.manager/include/UpdateConfig.php b/plugins/dynamix.docker.manager/include/UpdateConfig.php index 45946d0aa..383a515a6 100644 --- a/plugins/dynamix.docker.manager/include/UpdateConfig.php +++ b/plugins/dynamix.docker.manager/include/UpdateConfig.php @@ -20,6 +20,14 @@ $template_repos = $dockerManPaths['template-repos']; $user_prefs = $dockerManPaths['user-prefs']; switch ($_POST['action']) { +case 'docker_load_start': + $daemon = "/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load"; + if (!exec("pgrep -f $daemon")) passthru("$daemon &>/dev/null &"); + break; +case 'docker_load_stop': + $daemon = "/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker_load"; + if (exec("pgrep -f $daemon")) passthru("pkill -f $daemon &>/dev/null &"); + break; case 'autostart': // update container autostart setting $container = urldecode(($_POST['container'])); From 351714cf111ed170ab3c8c4c1cd84e1c089042ad Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 03:41:55 +0100 Subject: [PATCH 08/25] Docker containers list update --- .../include/DockerContainers.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php index c595ac695..7ae31cfcd 100644 --- a/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -120,15 +120,11 @@ foreach ($images as $image) { if (count($image['usedBy'])) continue; $id = $image['Id']; $menu[] = sprintf("addDockerImageContext('%s','%s');", $id, implode(',',$image['Tags'])); - echo ""; - echo "
"; - echo "
"; - echo ""; - echo "
"; - echo "(orphan image)
Image ID: $id
"; - echo "
".implode('
',array_map('htmlspecialchars',$image['Tags']))."
"; - echo ""; - echo "
Created ".htmlspecialchars($image['Created'])."
"; + echo ""; + echo "(orphan image)
stopped"; + echo "Image ID: $id
"; + echo implode(', ',array_map('htmlspecialchars',$image['Tags'])); + echo "Created ".htmlspecialchars($image['Created']).""; } echo "\0".implode($menu).implode($docker)."\0".(pgrep('rc.docker')!==false ? 1:0); ?> From 19f57ad73a58b676ed9b48f36a6a3a05134f7c00 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 04:33:38 +0100 Subject: [PATCH 09/25] Dashboard: style correction --- plugins/dynamix/styles/default-azure.css | 2 +- plugins/dynamix/styles/default-black.css | 2 +- plugins/dynamix/styles/default-gray.css | 2 +- plugins/dynamix/styles/default-white.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index e0cd26e25..962f79f26 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -153,7 +153,7 @@ table.share_status.share tr td:last-child{width:4%;text-align:right;padding-righ table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0} table.share_status.table{margin-top:36px} table.share_status.table tr>td{width:50%} -table.share_status.dashboard{float:left;margin:6px 10px 20px 10px;border:1px solid #606e7f} +table.share_status.dashboard{float:left;margin:6px 10px 14px 10px;border:1px solid #606e7f} table.share_status.dashboard thead tr:first-child>td{line-height:5rem;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;border:none;padding-top:10px} table.share_status.dashboard tbody tr>td{line-height:normal;padding-top:3px;padding-bottom:3px} table.share_status.dashboard tbody tr{border-bottom:none} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index 6247cb721..f91bdc18e 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -150,7 +150,7 @@ table.share_status.share tr td:last-child{width:4%;text-align:right;padding-righ table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0} table.share_status.table{margin-top:36px} table.share_status.table tr>td{width:50%} -table.share_status.dashboard{float:left;margin:6px 10px 20px 10px;border:1px solid #2b2b2b} +table.share_status.dashboard{float:left;margin:6px 10px 14px 10px;border:1px solid #2b2b2b} table.share_status.dashboard thead tr:last-child{border-bottom:none} table.share_status.dashboard thead tr:first-child>td{background-color:transparent;height:4rem;line-height:4rem;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:capitalize;vertical-align:middle} table.share_status.dashboard tbody tr:nth-child(even){background-color:transparent} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index d4bb5a7f7..a94dbfe7c 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -153,7 +153,7 @@ table.share_status.share tr td:last-child{width:4%;text-align:right;padding-righ table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0} table.share_status.table{margin-top:36px} table.share_status.table tr>td{width:50%} -table.share_status.dashboard{float:left;margin:6px 10px 20px 10px;border:1px solid #606e7f} +table.share_status.dashboard{float:left;margin:6px 10px 14px 10px;border:1px solid #606e7f} table.share_status.dashboard thead tr:first-child>td{line-height:5rem;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;border:none;padding-top:10px} table.share_status.dashboard tbody tr>td{line-height:normal;padding-top:3px;padding-bottom:3px} table.share_status.dashboard tbody tr{border-bottom:none} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index 2242e0e27..6f3770159 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -150,7 +150,7 @@ table.share_status.share tr td:last-child{width:4%;text-align:right;padding-righ table.share_status.fixed tr>td+td{min-width:39px;font-size:1.1rem;text-align:center;padding:0} table.share_status.table{margin-top:36px} table.share_status.table tr>td{width:50%} -table.share_status.dashboard{float:left;margin:6px 10px 20px 10px;border:1px solid #e3e3e3} +table.share_status.dashboard{float:left;margin:6px 10px 14px 10px;border:1px solid #e3e3e3} table.share_status.dashboard thead tr:last-child{border-bottom:none} table.share_status.dashboard thead tr:first-child>td{background-color:transparent;height:4rem;line-height:4rem;font-size:1.6rem;font-weight:bold;letter-spacing:1.8px;text-transform:capitalize;vertical-align:middle} table.share_status.dashboard tbody tr:nth-child(even){background-color:transparent} From dfa57aac5fd521050f716d3128be3ce5026feee8 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 04:38:45 +0100 Subject: [PATCH 10/25] width adjustment for tablet/mobile --- plugins/dynamix/include/DefaultPageLayout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index bd2dc17b4..717797814 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -25,7 +25,7 @@ $themes2 = in_array($theme,['gray','azure']); - + "> From 6f08f43c55a72721bf04f5432f6fa15413570edd Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 09:44:43 +0100 Subject: [PATCH 11/25] Docker and VM list updates --- .../DockerContainers.page | 13 ++----- .../include/DockerContainers.php | 3 +- plugins/dynamix.vm.manager/VMMachines.page | 15 +++----- .../dynamix.vm.manager/include/VMMachines.php | 30 ++++++++++++--- .../include/libvirt_helpers.php | 38 ------------------- .../javascript/vmmanager.js | 2 +- plugins/dynamix/styles/default-azure.css | 7 ++++ plugins/dynamix/styles/default-black.css | 7 ++++ plugins/dynamix/styles/default-gray.css | 7 ++++ plugins/dynamix/styles/default-white.css | 7 ++++ 10 files changed, 64 insertions(+), 65 deletions(-) diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index abdf9b36f..e5005fe13 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -26,23 +26,16 @@ $cpus = cpu_list(); @@ -112,7 +105,7 @@ function loadlist() { $('#docker_list').html(data[0]).sortable({helper:sortableHelper,items:'tr.sortable',opacity:0.4,update:function(e,i){ var row = $('#docker_list').find('tr:first'); var names = ''; var index = ''; - row.parent().children().find('td.ct-name').each(function(){names+=$(this).text().replace(/Container ID.*$/,'')+';';index+=$(this).parent().parent().children().index($(this).parent())+';';}); + row.parent().children().find('td.ct-name').each(function(){names+=$(this).find('.appname').text()+';';index+=$(this).parent().parent().children().index($(this).parent())+';';}); $.post('/plugins/dynamix.docker.manager/include/UserPrefs.php',{names:names,index:index}); }}); $('head').append(' From bfc69802edb88c6dbc518c1c9fb52cfd1c33c656 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 09:51:04 +0100 Subject: [PATCH 13/25] VM list style update --- plugins/dynamix.vm.manager/VMMachines.page | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 720685a85..2af4cf0fe 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -104,12 +104,12 @@ div.four label{float:left;display:table-cell;width:25%} div.four label:nth-child(4n+4){float:none;clear:both} div.four label.cpu1{width:32%} div.four label.cpu2{width:26%} -th.six{width:6%} +th.eight{width:8%} tbody>tr.sortable:hover{cursor:move} table.domdisk tbody tr:nth-child(even){background-color:transparent} - +
DescriptionCPUsMemoryvDisksGraphicsAutostart
DescriptionCPUsMemoryvDisksGraphicsAutostart
From 36821592089948292adddb1f7b2cf74c87a2d9cd Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 09:54:52 +0100 Subject: [PATCH 14/25] VM list table update --- plugins/dynamix.vm.manager/VMMachines.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 2af4cf0fe..c2fc5553a 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -109,7 +109,7 @@ tbody>tr.sortable:hover{cursor:move} table.domdisk tbody tr:nth-child(even){background-color:transparent} - +
DescriptionCPUsMemoryvDisksGraphicsAutostart
NameDescriptionCPUsMemoryvDisksGraphicsAutostart
From a20707d40d0f970b1cb4948ddff513fc1e66d06f Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 09:57:11 +0100 Subject: [PATCH 15/25] Docker list table update --- plugins/dynamix.docker.manager/DockerContainers.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index e5005fe13..3fc69d2af 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -40,7 +40,7 @@ input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;bac - +
VersionNetworkPort Mappings (App to Host)Volume Mappings (App to Host)CPU loadMemory loadAutostartLog
NameVersionNetworkPort Mappings (App to Host)Volume Mappings (App to Host)CPU loadMemory loadAutostartLog
From ac72006fe61ff2f5bfa3f6d31ee5b00207cfc50f Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 10:12:39 +0100 Subject: [PATCH 16/25] Style update --- plugins/dynamix/DashStats.page | 1 + plugins/dynamix/styles/default-azure.css | 2 +- plugins/dynamix/styles/default-black.css | 2 +- plugins/dynamix/styles/default-gray.css | 2 +- plugins/dynamix/styles/default-white.css | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index 313421d2f..b100cdbb7 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -140,6 +140,7 @@ if ($low) $memory_maximum = pow(2,ceil(log($memory_installed)/log(2))); diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index 2241c292d..52df2c56a 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -256,7 +256,7 @@ span.three{margin-left:-23px} span.tub{margin-right:8px;font-size:2.4rem;cursor:pointer} span.score{font-size:1.1rem;color:#ffffff;position:absolute} span#dropbox{background:none;line-height:6rem;margin-right:20px} -span.outer{float:left;margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer{margin-bottom:20px;margin-right:20px;cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index 83d08b449..37694fe17 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -241,7 +241,7 @@ span.two{margin-left:-20px} span.three{margin-left:-23px} span.tub{margin-right:8px;font-size:2.4rem;cursor:pointer} span.score{font-size:1.2rem;color:#1c1b1b;position:absolute} -span.outer{float:left;margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer{margin-bottom:20px;margin-right:20px;cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index cb3f94e01..18f4b37c1 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -256,7 +256,7 @@ span.three{margin-left:-23px} span.tub{margin-right:8px;font-size:2.4rem;cursor:pointer} span.score{font-size:1.1rem;color:#ffffff;position:absolute} span#dropbox{background:none;line-height:6rem;margin-right:20px} -span.outer{float:left;margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer{margin-bottom:20px;margin-right:20px;cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index 6a536aab3..fe39b4b2a 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -241,7 +241,7 @@ span.two{margin-left:-20px} span.three{margin-left:-23px} span.tub{margin-right:8px;font-size:2.4rem;cursor:pointer} span.score{font-size:1.2rem;color:#1c1b1b;position:absolute} -span.outer{float:left;margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer{margin-bottom:20px;margin-right:20px;cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} From 2cbcfd8a1b3054a31f218a4f8041bc7658cc53ca Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 10:25:12 +0100 Subject: [PATCH 17/25] Dashboard: style update --- plugins/dynamix/DashStats.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index b100cdbb7..9c00bbe30 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -141,7 +141,7 @@ if ($low) $memory_maximum = pow(2,ceil(log($memory_installed)/log(2))); From 905cd4b5b985165f83d0d38b81396c9e9f539080 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 10:29:57 +0100 Subject: [PATCH 18/25] Style correction --- plugins/dynamix.docker.manager/DockerContainers.page | 1 + plugins/dynamix.vm.manager/VMMachines.page | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index 3fc69d2af..ef8df7fff 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -36,6 +36,7 @@ th.five{width:5%} th.nine{width:9%} th.load{width:100px} input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent} +table tbody td{line-height:normal} diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index c2fc5553a..a33770d07 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -107,6 +107,7 @@ div.four label.cpu2{width:26%} th.eight{width:8%} tbody>tr.sortable:hover{cursor:move} table.domdisk tbody tr:nth-child(even){background-color:transparent} +table tbody td{line-height:normal} From 789825e221e49dc0d5060ada2ba4742ee6573dfb Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 10:32:39 +0100 Subject: [PATCH 19/25] Style correction --- plugins/dynamix.plugin.manager/Plugins.page | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/dynamix.plugin.manager/Plugins.page b/plugins/dynamix.plugin.manager/Plugins.page index 9360cc01a..db134de6c 100644 --- a/plugins/dynamix.plugin.manager/Plugins.page +++ b/plugins/dynamix.plugin.manager/Plugins.page @@ -26,6 +26,7 @@ $check = $notify['version'] ? 0 : 1; From 0226d40350514c15c1ac34ceb7cff7a7fc887d97 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 10:50:24 +0100 Subject: [PATCH 21/25] Style correction --- plugins/dynamix/DashStats.page | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index 144c5b959..d78ef65d1 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -140,11 +140,11 @@ if ($low) $memory_maximum = pow(2,ceil(log($memory_installed)/log(2))); From 5d2df1ee463c8a6c2e7c5c79c3d5adbad102dea1 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 11:06:33 +0100 Subject: [PATCH 22/25] Dashboard: suppress none active services --- plugins/dynamix/DashStats.page | 10 +- plugins/dynamix/include/DashboardApps.php | 176 +++++++++++----------- 2 files changed, 89 insertions(+), 97 deletions(-) diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index d78ef65d1..21ed585e8 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -251,12 +251,12 @@ foreach ($ports as $port) {
NameDescriptionCPUsMemoryvDisksGraphicsAutostart
- + - + @@ -457,7 +457,7 @@ function loadlist(init) { }); context.init({preventDoubleContext:false,left:true,above:false}); } - $.post('/webGui/include/DashboardApps.php',{display:'',docker:'',vm:''},function(d) { + $.post('/webGui/include/DashboardApps.php',{display:''},function(d) { var data = d.split(/\0/); $('.docker_view').html(data[0]); $('.vm_view').html(data[1]); @@ -749,10 +749,10 @@ $(function() { 0):?> toggleView('fan_view',true); - + toggleView('docker_view',true); - + toggleView('vm_view',true); toggleView('parity_view',true); diff --git a/plugins/dynamix/include/DashboardApps.php b/plugins/dynamix/include/DashboardApps.php index 07934cdeb..5de76272b 100644 --- a/plugins/dynamix/include/DashboardApps.php +++ b/plugins/dynamix/include/DashboardApps.php @@ -20,105 +20,97 @@ $display = $_POST['display']; $menu = []; if ($display=='icons' || $display=='docker') { - echo ""; } echo "\0"; if ($display=='icons' || $display=='vms') { - echo ""; } echo "\0"; From 8ecf742b7150662f906134d3bf1b381969c2291a Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 11:59:46 +0100 Subject: [PATCH 23/25] Selection corrections --- plugins/dynamix.docker.manager/include/DockerContainers.php | 4 ++-- plugins/dynamix.docker.manager/javascript/docker.js | 2 +- plugins/dynamix.vm.manager/include/VMMachines.php | 2 +- plugins/dynamix/include/DashboardApps.php | 4 ++-- plugins/dynamix/styles/default-azure.css | 3 ++- plugins/dynamix/styles/default-black.css | 3 ++- plugins/dynamix/styles/default-gray.css | 3 ++- plugins/dynamix/styles/default-white.css | 3 ++- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php index 0fe4868a1..84d3e9303 100644 --- a/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -84,7 +84,7 @@ foreach ($containers as $ct) { } else { $appname = htmlspecialchars($name); } - echo "$image$appname
$status"; + echo "$image$appname
$status"; echo "Container ID: $id
"; if ($ct['BaseImage']) echo "".htmlspecialchars(${ct['BaseImage']})."
"; echo "By: "; @@ -122,7 +122,7 @@ foreach ($images as $image) { $id = $image['Id']; $menu[] = sprintf("addDockerImageContext('%s','%s');", $id, implode(',',$image['Tags'])); echo ""; diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js index e1ecb5cd2..2768cbfe1 100644 --- a/plugins/dynamix.docker.manager/javascript/docker.js +++ b/plugins/dynamix.docker.manager/javascript/docker.js @@ -146,7 +146,7 @@ function rmImage(image, imageName) { }); } function eventControl(params, spin) { - if (spin) $('#'+params['container']).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin'); + if (spin) $('#'+params['container']).parent().find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin'); $.post(eventURL, params, function(data) { if (data.success === true) { if (spin) setTimeout(spin+'()',500); else location=window.location.href; diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php index 7bc76dc22..2f1b5aa7e 100644 --- a/plugins/dynamix.vm.manager/include/VMMachines.php +++ b/plugins/dynamix.vm.manager/include/VMMachines.php @@ -103,7 +103,7 @@ foreach ($vms as $vm) { /* VM information */ echo ""; + echo "$image$vm
$status"; echo ""; echo ""; echo ""; diff --git a/plugins/dynamix/include/DashboardApps.php b/plugins/dynamix/include/DashboardApps.php index 5de76272b..79fb31f65 100644 --- a/plugins/dynamix/include/DashboardApps.php +++ b/plugins/dynamix/include/DashboardApps.php @@ -51,7 +51,7 @@ if ($display=='icons' || $display=='docker') { $update = $updateStatus=='false' ? 'blue-text' : ''; $icon = $info['icon'] ?: '/plugins/dynamix.docker.manager/images/question.png'; $image = substr($icon,-4)=='.png' ? "" : (substr($icon,0,5)=='icon-' ? "" : ""); - echo "$image$name
$status"; + echo "$image$name
$status"; } $none = count($containers) ? "No running docker containers" : "No docker containers defined"; echo ""; @@ -107,7 +107,7 @@ if ($display=='icons' || $display=='vms') { break; } $image = substr($icon,-4)=='.png' ? "" : (substr($icon,0,5)=='icon-' ? "" : ""); - echo "$image$vm
$status"; + echo "$image$vm
$status"; } $none = count($vms) ? "No running virtual machines" : "No virtual machines defined"; echo ""; diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index 52df2c56a..db6005647 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -256,7 +256,8 @@ span.three{margin-left:-23px} span.tub{margin-right:8px;font-size:2.4rem;cursor:pointer} span.score{font-size:1.1rem;color:#ffffff;position:absolute} span#dropbox{background:none;line-height:6rem;margin-right:20px} -span.outer{margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer{margin-bottom:20px;margin-right:20px} +span.hand{cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index 37694fe17..2f0848645 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -241,7 +241,8 @@ span.two{margin-left:-20px} span.three{margin-left:-23px} span.tub{margin-right:8px;font-size:2.4rem;cursor:pointer} span.score{font-size:1.2rem;color:#1c1b1b;position:absolute} -span.outer{margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer{margin-bottom:20px;margin-right:20px} +span.hand{cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index 18f4b37c1..3a4b683b1 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -256,7 +256,8 @@ span.three{margin-left:-23px} span.tub{margin-right:8px;font-size:2.4rem;cursor:pointer} span.score{font-size:1.1rem;color:#ffffff;position:absolute} span#dropbox{background:none;line-height:6rem;margin-right:20px} -span.outer{margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer{margin-bottom:20px;margin-right:20px} +span.hand{cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index fe39b4b2a..96066e6ea 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -241,7 +241,8 @@ span.two{margin-left:-20px} span.three{margin-left:-23px} span.tub{margin-right:8px;font-size:2.4rem;cursor:pointer} span.score{font-size:1.2rem;color:#1c1b1b;position:absolute} -span.outer{margin-bottom:20px;margin-right:20px;cursor:pointer} +span.outer{margin-bottom:20px;margin-right:20px} +span.hand{cursor:pointer} span.outer.started>img,span.outer.started>i.img{opacity:1.0} span.outer.stopped>img,span.outer.stopped>i.img{opacity:0.3} span.outer.paused>img,span.outer.paused>i.img{opacity:0.6} From 9573dc50d92f9ee1153a039729664ca7b7328764 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 16:25:10 +0100 Subject: [PATCH 24/25] Remove title from UPS summary --- plugins/dynamix.apcupsd/UPSsummary.page | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix.apcupsd/UPSsummary.page b/plugins/dynamix.apcupsd/UPSsummary.page index 9a0f68d1e..cd297fe23 100644 --- a/plugins/dynamix.apcupsd/UPSsummary.page +++ b/plugins/dynamix.apcupsd/UPSsummary.page @@ -1,5 +1,4 @@ -Menu="Dashboard:2" -Title="UPS Summary" +Menu="Dashboard:1" Tag="icon-ups" Cond="file_exists('/var/run/apcupsd.pid')" --- @@ -29,7 +28,7 @@ function getUPSstatus() { } $(getUPSstatus); - +
UPS StatusBattery ChargeRuntime LeftNominal PowerUPS LoadUPS Load %
 
From 3d79a92e077ab5e4ad57b5cd9bf3afff2dfc1ebc Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 11 Jan 2019 16:27:43 +0100 Subject: [PATCH 25/25] Remove UPS tag (unused) --- plugins/dynamix.apcupsd/UPSsummary.page | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/dynamix.apcupsd/UPSsummary.page b/plugins/dynamix.apcupsd/UPSsummary.page index cd297fe23..bc14653f0 100644 --- a/plugins/dynamix.apcupsd/UPSsummary.page +++ b/plugins/dynamix.apcupsd/UPSsummary.page @@ -1,5 +1,4 @@ Menu="Dashboard:1" -Tag="icon-ups" Cond="file_exists('/var/run/apcupsd.pid')" ---