diff --git a/archive/community.applications-2021.11.04-x86_64-1.txz b/archive/community.applications-2021.11.04-x86_64-1.txz index f8fddc2c..f3d19d3a 100644 Binary files a/archive/community.applications-2021.11.04-x86_64-1.txz and b/archive/community.applications-2021.11.04-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 c3c9843d..220e16f2 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 @@ -299,6 +299,10 @@ $(function(){ doSearch(false,repo); }); + $('body').on("click",".templateSearch",function() { + doSearch(false); + }); + $('body').on("click",".xmlInstall",function() { var type = $(this).data("type"); var xml = $(this).data("xml"); 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 67750a21..753c01dc 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 @@ -dbcaed60ede3ac9aaa96b6a8a186f4eb ./Apps.page +fd836d964720aa8c8f5fee785725aed2 ./Apps.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page 7ee0b23dbd92ed55f611360a983f9565 ./ca_settings.page 1b49ec9797713ce869ea0c1066a109f2 ./default.cfg -53f072907318f5134c9a3f1622a77695 ./include/exec.php +0ea4186e2b1727fb21c1b7da85f5f7e3 ./include/exec.php 5810179d140aadc0a17b2d8782a32cba ./include/helpers.php 8ba23d3d51816bbb91245cfc3fcb8024 ./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 -dec2bf4cf4d3d57619d2c3ba49d59b9f ./skins/Narrow/css.php +c8e4e9a16b47ecc0acf66d46be497599 ./skins/Narrow/css.php e965c8fafd1eae7a0387e37cee3aeaf9 ./skins/Narrow/skin.html -797f8022c23372b48bdb1603401256ff ./skins/Narrow/skin.php +c35c87a76d5f7052c9de5ca6a114e50e ./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 cf01ae5f..8f8dabc5 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 @@ -64,6 +64,7 @@ if ($caSettings['debugging'] == "yes") { file_put_contents($caPaths['logging'],"MD5's: \n".shell_exec("cd /usr/local/emhttp/plugins/community.applications && md5sum -c ca.md5")."\n",FILE_APPEND); $lingo = $_SESSION['locale'] ?: "en_US"; file_put_contents($caPaths['logging'],"Language: $lingo\n\n",FILE_APPEND); + file_put_contents($caPaths['logging'],"Settings:\n".print_r($caSettings,true)."\n",FILE_APPEND); } file_put_contents($caPaths['logging'],date('Y-m-d H:i:s')." POST CALLED ({$_POST['action']})\n".print_r($_POST,true),FILE_APPEND); } @@ -1216,9 +1217,7 @@ function uninstall_docker() { $DockerClient->removeContainer($containerName,$dockerRunning[$container]['Id']); $DockerClient->removeImage($dockerRunning[$container]['ImageId']); -// $info = $caSettings['dockerRunning'] ? $DockerClient->getDockerContainers() : array(); $info = getAllInfo(true); -// writeJsonFile($caPaths['info'],$info); postReturn(['status'=>"Uninstalled"]); } 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 3dac7fb0..1eefadff 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 @@ -421,6 +421,8 @@ ul.subCategory {list-style-type:none;margin-left:2rem;padding:0px;cursor:pointer table tbody td {line-height:1.8rem;} table {background-color:transparent;} #templates_content {overflow-x:hidden;margin-bottom:3rem;} +.templateSearch{cursor:pointer;font-size:1.5rem;} +.templateSearch:hover{color:;} .trendingDown::before {content:"\f063";font-family:fontAwesome;} .trendingUp::before {content:"\f062";font-family:fontAwesome;} .unpinned {font-size:2rem;cursor:pointer;margin-left:1rem;padding-left:.5rem;padding-right:.5rem;cursor:pointer;padding:.3rem;} 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 6e48fe88..03cbdb8d 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 @@ -303,7 +303,7 @@ function getPageNavigation($pageNumber,$totalApps,$dockerSearch,$displayCount = if ($startingPage < 3 ) $startingPage = 1; else - $o .= "1"; + $o .= "1"; $endingPage = $pageNumber + 5; if ( $endingPage > $totalPages ) @@ -809,7 +809,7 @@ function displaySearchResults($pageNumber) { $templates = readJsonFile($caPaths['community-templates-info']); $caSettings['descriptions'] = "yes"; - $ct = tr("NOTE You must visit the dockerHub page to gather the information required to install correctly")."

"; + $ct = "
".tr("NOTE You must visit the dockerHub page to gather the information required to install correctly")."Show CA templates


"; $ct .= "
"; $columnNumber = 0;