diff --git a/plugins/dynamix.docker.manager/DockerRepositories.page b/plugins/dynamix.docker.manager/DockerRepositories.page index 677bd7154..88913ff93 100644 --- a/plugins/dynamix.docker.manager/DockerRepositories.page +++ b/plugins/dynamix.docker.manager/DockerRepositories.page @@ -1,11 +1,11 @@ Menu="Docker:2" -Title="Docker Repositories" +Title="Template Repositories" Tag="clone" Cond="(pgrep('dockerd')!==false)" --- pullImage($image, function ($line) use (&$alltotals, &$laststatus, &$waitID, &$strError, $image, $DockerClient, $DockerUpdate, $echo) { $cnt = json_decode($line, true); - $id = (isset($cnt['id'])) ? trim($cnt['id']) : ''; - $status = (isset($cnt['status'])) ? trim($cnt['status']) : ''; - if (isset($cnt['error'])) { - $strError = $cnt['error']; - } + $id = $cnt['id'] ?? ''; + $status = $cnt['status'] ?? ''; + if ($cnt['error']) $strError = $cnt['error']; if ($waitID !== false) { if ($echo) { echo "\n"; @@ -406,26 +404,26 @@ function pullImage($name, $image, $echo=true) { break; case 'Downloading': if ($laststatus[$id] != $status) { - if ($echo) echo "\n"; + if ($echo) echo "\n"; } $total = $cnt['progressDetail']['total']; $current = $cnt['progressDetail']['current']; if ($total > 0) { $percentage = round(($current / $total) * 100); - if ($echo) echo "\n"; + if ($echo) echo "\n"; } else { // Docker must not know the total download size (http-chunked or something?) // just show the current download progress without the percentage $alltotals[$id] = $current; - if ($echo) echo "\n"; + if ($echo) echo "\n"; } break; default: if ($laststatus[$id] == "Downloading") { - if ($echo) echo "\n"; + if ($echo) echo "\n"; } if ($laststatus[$id] != $status) { - if ($echo) echo "\n"; + if ($echo) echo "\n"; } break; } diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page index cdfecf49c..97c54010f 100644 --- a/plugins/dynamix/ArrayOperation.page +++ b/plugins/dynamix/ArrayOperation.page @@ -75,6 +75,7 @@ tr#copy,tr#file{display:none} td.gap{padding-left:26px!important} span#pass{display:none;margin-left:20px} + -echo ($display['resize'] ? "