diff --git a/archive/community.applications-2021.10.17-x86_64-1.txz b/archive/community.applications-2021.10.17-x86_64-1.txz index eed46ee8..15203dd0 100644 Binary files a/archive/community.applications-2021.10.17-x86_64-1.txz and b/archive/community.applications-2021.10.17-x86_64-1.txz differ diff --git a/archive/community.applications-2021.10.17b-x86_64-1.txz b/archive/community.applications-2021.10.17b-x86_64-1.txz new file mode 100644 index 00000000..79e0ba1c Binary files /dev/null and b/archive/community.applications-2021.10.17b-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 1dad6ea1..07d82736 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 @@ 0617ae7ed4011e05bef9cd6cac85dd5b ./Apps.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page -a7d2bd7a00a40feea38c424b3ab3af78 ./ca_settings.page -1a8d4d4ff5e8ddf8e911280e39e3d10d ./default.cfg -bc9057b2964bc3ebc45d3b7ce333f48f ./include/exec.php +f2299b00bd768b7fdadb11d839e4bf15 ./ca_settings.page +993c0dff1a44225d5070cada0d805f75 ./default.cfg +74a6d735602f95c0354b106644850e12 ./include/exec.php 881abd00cf784d706bba6a06f3b8c810 ./include/helpers.php 4eaa5bd1f2e88781133c1571a81e6d0c ./include/paths.php eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js @@ -22,4 +22,4 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md 2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php 289acc42c9cde7699c9c6f6e2815c6e1 ./skins/Narrow/css.php 4ff34c148d3dde1a420303faecd414ae ./skins/Narrow/skin.html -e649b589fe212eb3eca3f6e55c7fde17 ./skins/Narrow/skin.php +6d48505c777bff6a195c4eae77fe3f6c ./skins/Narrow/skin.php diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca_settings.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca_settings.page index b71f6052..5b205b1f 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca_settings.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca_settings.page @@ -64,6 +64,14 @@ function tr($string,$ret=false) { > + +: + =mk_option($cfg['descriptions'],'no',tr("No",true))?> + =mk_option($cfg['descriptions'],'yes',tr("Yes",true))?> + + +> + : =mk_option($cfg['updateCheck'],"yes",tr("Yes",true))?> diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/default.cfg b/source/community.applications/usr/local/emhttp/plugins/community.applications/default.cfg index b1acd996..2b4422c3 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/default.cfg +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/default.cfg @@ -4,4 +4,5 @@ defaultReinstall="false" notifications="no" debugging="no" updateCheck="yes" -dev="no" \ No newline at end of file +dev="no" +descriptions="no" \ No newline at end of file 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 fda038d5..dcdb3af2 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 @@ -693,13 +693,15 @@ function get_content() { $display[] = $spot; } if ( $displayApplications['community'] ) { - $o['display'] .= "{$type['text1']}"; $o['display'] .= "{$type['text2']} "; if ( $type['cat'] ) $o['display'] .= "".tr("SHOW MORE"); $o['display'] .= ""; $homeClass = $type['type'] == "spotlight" ? "caHomeSpotlight" : ""; + if ( $caSettings['descriptions'] == "yes" ) + $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 35fef498..775e0253 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 @@ -664,7 +664,10 @@ function displayCard($template) { } extract($template); - + + if ( $caSettings['descriptions'] == "yes" ) + $class="spotlightHome"; + $appType = $Plugin ? "appPlugin" : "appDocker"; $appType = $Language ? "appLanguage": $appType; $appType = (strpos($Category,"Drivers") !== false) && $Plugin ? "appDriver" : $appType; @@ -776,6 +779,7 @@ function displayCard($template) { "; if ( $class=='spotlightHome' ) { + $Overview = $Overview ?: $Description; $ovr = html_entity_decode($Overview); $ovr = trim($ovr); $ovr = str_replace(["[","]"],["<",">"],$ovr); @@ -786,13 +790,15 @@ function displayCard($template) { $ovr = str_replace("\n","",$ovr); $Overview = explode("",$ovr)[0]; - $card .= " - $Overview - - - ".tr(date("M Y",$RecommendedDate),0)." - - "; + $card .= "$Overview"; + if ( $RecommendedDate ) { + $card .= " + + + ".tr(date("M Y",$RecommendedDate),0)." + + "; + } } $card .= ""; if ( $Installed ) {