optional displays of descriptions on cards

This commit is contained in:
Squidly271 2021-10-17 15:49:13 -04:00
parent 2204e0c23c
commit 4b5edbd59b
7 changed files with 31 additions and 14 deletions

View File

@ -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

View File

@ -64,6 +64,14 @@ function tr($string,$ret=false) {
> <?tr("This option enables another button on the cards and popups which will allow you to reinstall an installed application using it's default template values. This option can be confusing at times, and is only generally used if you wish to install and have an application running twice simultaneously");?>
<?tr("Show descriptions on application cards:");?>
: <select name='descriptions' size='1'>
<?=mk_option($cfg['descriptions'],'no',tr("No",true))?>
<?=mk_option($cfg['descriptions'],'yes',tr("Yes",true))?>
</select>
> <?tr("This option dictates whether the descriptions appear on the cards or not")?>
<?tr("Allow CA to check for updates to applications:");?>
: <select name="updateCheck" size="1">
<?=mk_option($cfg['updateCheck'],"yes",tr("Yes",true))?>

View File

@ -4,4 +4,5 @@ defaultReinstall="false"
notifications="no"
debugging="no"
updateCheck="yes"
dev="no"
dev="no"
descriptions="no"

View File

@ -693,13 +693,15 @@ function get_content() {
$display[] = $spot;
}
if ( $displayApplications['community'] ) {
$o['display'] .= "<div class='ca_homeTemplatesHeader'>{$type['text1']}</div>";
$o['display'] .= "<div class='ca_homeTemplatesLine2'>{$type['text2']} ";
if ( $type['cat'] )
$o['display'] .= "<span class='homeMore' data-des='{$type['text1']}' data-category='{$type['cat']}' data-sortby='{$type['sortby']}' data-sortdir='{$type['sortdir']}'>".tr("SHOW MORE");
$o['display'] .= "</div>";
$homeClass = $type['type'] == "spotlight" ? "caHomeSpotlight" : "";
if ( $caSettings['descriptions'] == "yes" )
$homeClass = "caHomeSpotlight";
$o['display'] .= "<div class='ca_homeTemplates $homeClass'>".my_display_apps($display,"1")."</div>";
$o['script'] = "$('#templateSortButtons,#sortButtons').hide();$('.ca_holder').addClass('mobileHolderFix');";

View File

@ -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) {
</div>
";
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","<br>",$ovr);
$Overview = explode("<br>",$ovr)[0];
$card .= "
<div class='cardDescription ca_backgroundClickable' data-apppath='$Path' data-appname='$Name' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'><div class='cardDesc'>$Overview</div></div>
<div class='homespotlightIconArea ca_center' data-apppath='$Path' data-appname='$Name' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'>
<div><img class='spotlightIcon' src='https://raw.githubusercontent.com/Squidly271/community.applications/master/webImages/Unraid.svg'></img></div>
<div class='spotlightDate'>".tr(date("M Y",$RecommendedDate),0)."</div>
</div>
";
$card .= "<div class='cardDescription ca_backgroundClickable' data-apppath='$Path' data-appname='$Name' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'><div class='cardDesc'>$Overview</div></div>";
if ( $RecommendedDate ) {
$card .= "
<div class='homespotlightIconArea ca_center' data-apppath='$Path' data-appname='$Name' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'>
<div><img class='spotlightIcon' src='https://raw.githubusercontent.com/Squidly271/community.applications/master/webImages/Unraid.svg'></img></div>
<div class='spotlightDate'>".tr(date("M Y",$RecommendedDate),0)."</div>
</div>
";
}
}
$card .= "</div>";
if ( $Installed ) {