diff --git a/archive/community.applications-2021.10.24-x86_64-1.txz b/archive/community.applications-2021.10.24-x86_64-1.txz index 4903dab4..0014a1f1 100644 Binary files a/archive/community.applications-2021.10.24-x86_64-1.txz and b/archive/community.applications-2021.10.24-x86_64-1.txz differ diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page index 53d38739..86571272 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page @@ -344,7 +344,7 @@ $(function(){ } }); - $("body").on("click",".repoPopup,.ca_repoinfo,.ca_reporeadmore,.ca_repoFromPopUp,.cardDescriptionRepo", function() { + $("body").on("click",".repoPopup,.ca_repoinfo,.ca_reporeadmore,.ca_repoFromPopUp", function() { context.destroy("#supportPopup"); context.destroy("#actionsPopup"); if ( ! $(".sidebar").is(":visible") ) { diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 index 04cbd428..7a7d9a3a 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 @@ -1,8 +1,8 @@ -0c0a9cff11a8d7ecf3ee1c22a9905ad3 ./Apps.page +2468ebb77d77d23bbab55cef613714b2 ./Apps.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page 7ee0b23dbd92ed55f611360a983f9565 ./ca_settings.page 993c0dff1a44225d5070cada0d805f75 ./default.cfg -dc7953105b0ae56d0740487c00c94ef5 ./include/exec.php +f4179352b63801da18127b34a2c2c7e9 ./include/exec.php 3fddb80cc00d46ff551e9ff42c70ba73 ./include/helpers.php aeec70878e94eead3aef390110e786e8 ./include/paths.php eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js @@ -20,6 +20,6 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md 9eba209fba4bbf1a02e57ddafebfdf8c ./scripts/showStatistics.php 4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh 2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php -87b6713bbc510b0e59f9fb75af7ddbfd ./skins/Narrow/css.php +e5096f10b5d6af95d569dc8b920a0482 ./skins/Narrow/css.php 4ff34c148d3dde1a420303faecd414ae ./skins/Narrow/skin.html -6f3c76ba45e758e3468dc439e7ba89f4 ./skins/Narrow/skin.php +2db3009364c6769a1dfffc459528fb22 ./skins/Narrow/skin.php diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php index 3c6b87bd..b980cf11 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php @@ -958,10 +958,11 @@ function dismiss_plugin_warning() { # Displays the list of installed or previously installed apps # ############################################################### function previous_apps() { - global $caPaths, $caSettings; + global $caPaths, $caSettings, $DockerClient; $installed = getPost("installed",""); $filter = getPost("filter",""); +// $info = $caSettings['dockerRunning'] ? $DockerClient->getDockerContainers() : array(); $info = $caSettings['dockerRunning'] ? readJsonFile($caPaths['info']) : array(); @unlink($caPaths['community-templates-allSearchResults']); @unlink($caPaths['community-templates-catSearchResults']); diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php index aa4a016f..f5538103 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php @@ -309,7 +309,7 @@ p {margin:auto;text-align:left;margin-bottom:10px;} /* override dynamix styling .pageDots::after {content:"...";} .pageDots{color:grey;cursor:default;} .pageLeft::after {content:"\f137";font-family:fontAwesome;} -.pageNavigation {font-size:1.5rem;} +.pageNavigation {font-size:1.5rem;padding-bottom:20rem;} .pageNavNoClick {font-size:1.5rem;cursor:default !important;} .pageNavNoClick:hover{color:initial !important;} .pageNumber{margin-left:1rem;margin-right:1rem;cursor:pointer;text-decoration:none !important;} diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php index 8dd0d1a7..33ad4119 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php @@ -11,6 +11,7 @@ function display_apps($pageNumber=1,$selectedApps=false,$startup=false) { if ( is_file($caPaths['repositoriesDisplayed']) ) { $file = readJsonFile($caPaths['repositoriesDisplayed']); + //$startup = true; } else { if ( is_file($caPaths['community-templates-catSearchResults']) ) $file = readJsonFile($caPaths['community-templates-catSearchResults']); @@ -77,9 +78,9 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) $template['Icon'] = $template['icon'] ?: "/plugins/dynamix.docker.manager/images/question.png"; if ( ! $template['bio'] ) - $template['Description'] = tr("No description present"); + $template['CardDescription'] = tr("No description present"); else - $template['Description'] = $template['bio']; + $template['CardDescription'] = $template['bio']; $template['bio'] = strip_tags(markdown($template['bio'])); $template['display_dockerName'] = $template['RepoName']; @@ -799,8 +800,7 @@ function displayCard($template) { $ovr = str_replace("\n","
",$ovr); $Overview = explode("
",$ovr)[0]; - $descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription"; - $card .= "
$Overview
"; + $card .= "
$Overview
"; if ( $RecommendedDate ) { $card .= "
@@ -871,6 +871,9 @@ function displayPopup($template) { $card.= "
".tr("Support")."
"; $card .= $LanguagePack != "en_US" ? "
" : ""; + if ( ! $caSettings['dockerRunning'] && (! $Plugin && ! $Language) ) { + $card .= "
".tr("Docker Service Not Enabled - Only Plugins Available To Be Installed Or Managed")."
"; + } $card .= "