From ace79a70519f3543359912a3b6a6f2ca8aadd603 Mon Sep 17 00:00:00 2001 From: Andrew Z Date: Sat, 6 Nov 2021 17:06:37 -0400 Subject: [PATCH] Support ReadMe --- plugins/dynamix.docker.manager/include/CreateDocker.php | 6 ++++++ plugins/dynamix.docker.manager/include/DockerClient.php | 1 + plugins/dynamix.docker.manager/include/DockerContainers.php | 3 ++- plugins/dynamix.docker.manager/javascript/docker.js | 5 ++++- plugins/dynamix/include/DashboardApps.php | 3 ++- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index c2b5bbc06..c6a6740d6 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -814,6 +814,11 @@ _(Project Page)_: :docker_client_project_page_help: +_(Read Me First)_: +: + +:docker_client_readme_help: +
_(Docker Hub URL)_: @@ -832,6 +837,7 @@ Donation Link: Template URL: : +
_(Icon URL)_: diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index 96416718a..5c34960fd 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -314,6 +314,7 @@ class DockerTemplates { $tmp['Support'] = $tmp['Support'] ?? $this->getTemplateValue($image, 'Support'); $tmp['Project'] = $tmp['Project'] ?? $this->getTemplateValue($image, 'Project'); $tmp['DonateLink'] = $tmp['DonateLink'] ?? $this->getTemplateValue($image, 'DonateLink'); + $tmp['ReadMe'] = $tmp['ReadMe'] ?? $this->getTemplateValue($image, 'ReadMe'); if (!$tmp['updated'] || $reload) { if ($reload) $DockerUpdate->reloadUpdateStatus($image); $tmp['updated'] = var_export($DockerUpdate->getUpdateStatus($image),true); diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php index 8afc11ca3..98ad43a00 100644 --- a/plugins/dynamix.docker.manager/include/DockerContainers.php +++ b/plugins/dynamix.docker.manager/include/DockerContainers.php @@ -77,7 +77,8 @@ foreach ($containers as $ct) { $project = html_entity_decode($info['Project']); $registry = html_entity_decode($info['registry']); $donateLink = html_entity_decode($info['DonateLink']); - $menu[] = sprintf("addDockerContainerContext('%s','%s','%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),addslashes($registry),addslashes($donateLink)); + $readme = html_entity_decode($info['ReadMe']); + $menu[] = sprintf("addDockerContainerContext('%s','%s','%s',%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),addslashes($registry),addslashes($donateLink),addslashes($readme)); $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'; diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js index 0a7e4c6d8..d2c4b0893 100644 --- a/plugins/dynamix.docker.manager/javascript/docker.js +++ b/plugins/dynamix.docker.manager/javascript/docker.js @@ -1,6 +1,6 @@ var eventURL = '/plugins/dynamix.docker.manager/include/Events.php'; -function addDockerContainerContext(container, image, template, started, paused, update, autostart, webui, shell, id, Support, Project, Registry, donateLink) { +function addDockerContainerContext(container, image, template, started, paused, update, autostart, webui, shell, id, Support, Project, Registry, donateLink, ReadMe) { var opts = []; if (started && !paused) { if (webui !== '' && webui != '#') opts.push({text:_('WebUI'), icon:'fa-globe', href:webui, target:'_blank'}); @@ -32,6 +32,9 @@ function addDockerContainerContext(container, image, template, started, paused, if ( Support || Project ) { opts.push({divider:true}); } + if (ReadMe) { + opts.push({text:_('Read Me First'), icon:'fa-book', href:ReadMe, target:'_blank'}); + } if (Project) { opts.push({text:_('Project Page'), icon:'fa-life-ring', href:Project, target:'_blank'}); } diff --git a/plugins/dynamix/include/DashboardApps.php b/plugins/dynamix/include/DashboardApps.php index 9984810e5..8408f00c6 100644 --- a/plugins/dynamix/include/DashboardApps.php +++ b/plugins/dynamix/include/DashboardApps.php @@ -51,7 +51,8 @@ if ($_POST['docker'] && ($display=='icons' || $display=='docker')) { $project = html_entity_decode($info['Project']); $registry = html_entity_decode($info['registry']); $donateLink = html_entity_decode($info['DonateLink']); - $menu[] = sprintf("addDockerContainerContext('%s','%s','%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), addslashes($registry), addslashes($donateLink)); + $readme = html_entity_decode($info['ReadMe']); + $menu[] = sprintf("addDockerContainerContext('%s','%s','%s',%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), addslashes($registry), addslashes($donateLink), addslashes($readme)); $shape = $running ? ($paused ? 'pause' : 'play') : 'square'; $status = $running ? ($paused ? 'paused' : 'started') : 'stopped'; $color = $status=='started' ? 'green-text' : ($status=='paused' ? 'orange-text' : 'red-text');