diff --git a/archive/community.applications-2021.12.06-x86_64-1.txz b/archive/community.applications-2021.12.06-x86_64-1.txz index 7e48d74a..84221e4e 100644 Binary files a/archive/community.applications-2021.12.06-x86_64-1.txz and b/archive/community.applications-2021.12.06-x86_64-1.txz differ 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 b27f8367..8e1f158f 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 @@ -2,7 +2,7 @@ aab3481fc0356a16dbac7022781880f3 ./Apps.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page 7ee0b23dbd92ed55f611360a983f9565 ./ca_settings.page 1b49ec9797713ce869ea0c1066a109f2 ./default.cfg -b84098319347b813b87f50722e33b10c ./include/exec.php +f70e90c67290e43ed60d228a5dc7c0d3 ./include/exec.php b6920c2d8b2ea81a4dabbd935b93895e ./include/helpers.php 95709ae0ed53e2889a93849a69b37892 ./include/paths.php 410c0166bae560754e231486050621f6 ./javascript/libraries.js @@ -22,4 +22,4 @@ e3dc9ed23036a09d69d5cd5c3111751e ./scripts/showStatistics.php 2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php a8900ea90ba3a4937a4648ae92f9e848 ./skins/Narrow/css.php cfa1511913f794c8c5980460dfcdf049 ./skins/Narrow/skin.html -e2290f61f2a45efd36d5efaa27528569 ./skins/Narrow/skin.php +37dc71da8b07799676e29d7a6c6bf484 ./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 537ef91f..cede850b 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 @@ -415,7 +415,7 @@ function getConvertedTemplates() { function appOfDay($file) { global $caPaths,$caSettings,$sortOrder; - $max = $caSettings['descriptions'] == "yes" ? 7 : 10; + $max = 7; switch ($caSettings['startup']) { case "random": @@ -709,9 +709,7 @@ function get_content() { if ( $type['cat'] ) $o['display'] .= "".tr("SHOW MORE"); $o['display'] .= ""; - $homeClass = $type['type'] == "spotlight" ? "caHomeSpotlight" : ""; - if ( $caSettings['descriptions'] == "yes" ) - $homeClass = "caHomeSpotlight"; + $homeClass = "caHomeSpotlight"; $o['display'] .= "
".my_display_apps($display,"1")."
"; $o['script'] = "$('#templateSortButtons,#sortButtons').hide();$('.ca_holder').addClass('mobileHolderFix');"; 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 324f2233..b4b02ccc 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 @@ -34,14 +34,11 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) { $caSettings['dockerRunning'] = "true"; - // $info = $DockerTemplates->getAllInfo(); $info = getAllInfo(); - //$dockerRunning = $DockerClient->getDockerContainers(); $dockerUpdateStatus = readJsonFile($caPaths['dockerUpdateStatus']); } else { unset($caSettings['dockerRunning']); $info = array(); -// $dockerRunning = array(); $dockerUpdateStatus = array(); } @@ -836,7 +833,6 @@ function displaySearchResults($pageNumber) { $num_pages = $tempFile['num_pages']; $file = $tempFile['results']; $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")."Show CA templates


"; $ct .= "
"; @@ -876,8 +872,7 @@ function displayCard($template) { extract($template); - if ( $caSettings['descriptions'] == "yes" ) - $class="spotlightHome"; + $class = "spotlightHome"; $appType = $Plugin ? "appPlugin" : "appDocker"; $appType = $Language ? "appLanguage": $appType; @@ -949,7 +944,7 @@ function displayCard($template) { $display_repoName = str_replace("' Repository","",str_replace("'s Repository","",$display_repoName)); - $bottomClass = $class ? "ca_bottomLineSpotLight" : ""; + $bottomClass = "ca_bottomLineSpotLight"; if ( $DockerHub ) { $backgroundClickable = "dockerCardBackground"; $card .= " @@ -971,13 +966,11 @@ function displayCard($template) {
".tr("Support")."
"; - if ( $class == "spotlightHome" ) { - if ( $actionsContext ) { - if ( count($actionsContext) == 1) - $card .= "
{$actionsContext[0]['text']}
"; - else - $card .= "
".tr("Actions")."
"; - } + if ( $actionsContext ) { + if ( count($actionsContext) == 1) + $card .= "
{$actionsContext[0]['text']}
"; + else + $card .= "
".tr("Actions")."
"; } $card .= ""; @@ -1046,30 +1039,28 @@ function displayCard($template) { $card .= "
"; - if ( $class=='spotlightHome' ) { - $Overview = $Overview ?: $Description; - - $ovr = html_entity_decode($Overview); - $ovr = trim($ovr); - $ovr = str_replace(["[","]"],["<",">"],$ovr); - $ovr = str_replace("\n","
",$ovr); - $ovr = str_replace(" ","    ",$ovr); - $ovr = markdown(strip_tags($ovr,"
")); + $Overview = $Overview ?: $Description; + + $ovr = html_entity_decode($Overview); + $ovr = trim($ovr); + $ovr = str_replace(["[","]"],["<",">"],$ovr); + $ovr = str_replace("\n","
",$ovr); - $ovr = str_replace("\n","
",$ovr); - # $Overview = explode("
",$ovr)[0]; - $Overview = str_replace("
"," ",$ovr); - $descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription"; - $card .= "
$Overview
"; - if ( $RecommendedDate ) { - $card .= " -
-
-
".tr(date("M Y",$RecommendedDate),0)."
-
- "; - } + $ovr = str_replace(" ","    ",$ovr); + $ovr = markdown(strip_tags($ovr,"
")); + + $ovr = str_replace("\n","
",$ovr); + $Overview = str_replace("
"," ",$ovr); + $descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription"; + $card .= "
$Overview
"; + if ( $RecommendedDate ) { + $card .= " +
+
+
".tr(date("M Y",$RecommendedDate),0)."
+
+ "; } $card .= ""; if ( $Installed || $Uninstall) {