Squidly271/community.applications
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: see below

Browse Source 
Fixed: Repository cards wouldn't display a description if settings allowed
This commit is contained in:
Squidly271 2021-10-24 10:12:21 -04:00
parent f40158c609
commit 3bdd24d675
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2021.10.24-x86_64-1.txz Normal file
View File

Binary file not shown.

2
source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page
View File

@ -344,7 +344,7 @@ $(function(){
}
});
$("body").on("click",".repoPopup,.ca_repoinfo,.ca_reporeadmore,.ca_repoFromPopUp", function() {
$("body").on("click",".repoPopup,.ca_repoinfo,.ca_reporeadmore,.ca_repoFromPopUp,.cardDescriptionRepo", function() {
context.destroy("#supportPopup");
context.destroy("#actionsPopup");
if ( ! $(".sidebar").is(":visible") ) {

6
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
View File

@ -1,8 +1,8 @@
2468ebb77d77d23bbab55cef613714b2 ./Apps.page
0c0a9cff11a8d7ecf3ee1c22a9905ad3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
7ee0b23dbd92ed55f611360a983f9565 ./ca_settings.page
993c0dff1a44225d5070cada0d805f75 ./default.cfg
f4179352b63801da18127b34a2c2c7e9 ./include/exec.php
dc7953105b0ae56d0740487c00c94ef5 ./include/exec.php
3fddb80cc00d46ff551e9ff42c70ba73 ./include/helpers.php
aeec70878e94eead3aef390110e786e8 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
@ -22,4 +22,4 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md
2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php
87b6713bbc510b0e59f9fb75af7ddbfd ./skins/Narrow/css.php
4ff34c148d3dde1a420303faecd414ae ./skins/Narrow/skin.html
04e6f1da0298fb648d1a813d5bd47b9c ./skins/Narrow/skin.php
6f3c76ba45e758e3468dc439e7ba89f4 ./skins/Narrow/skin.php

3
source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
View File

@ -958,11 +958,10 @@ function dismiss_plugin_warning() {
# Displays the list of installed or previously installed apps #
###############################################################
function previous_apps() {
global $caPaths, $caSettings, $DockerClient;
global $caPaths, $caSettings;
$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']);

8
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php
View File

@ -11,7 +11,6 @@ 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']);
@ -78,9 +77,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['CardDescription'] = tr("No description present");
$template['Description'] = tr("No description present");
else
$template['CardDescription'] = $template['bio'];
$template['Description'] = $template['bio'];
$template['bio'] = strip_tags(markdown($template['bio']));
$template['display_dockerName'] = $template['RepoName'];
@ -800,7 +799,8 @@ 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>";
$descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription";
$card .= "<div class='$descClass 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)."'>