master
Squidly271 2023-05-07 09:14:59 -04:00
parent 2326a42bc0
commit 0bca325dd8
5 changed files with 26 additions and 8 deletions

View File

@ -2,8 +2,8 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "community.applications">
<!ENTITY author "Andrew Zawadzki">
<!ENTITY version "2023.04.27">
<!ENTITY md5 "7a3458cedad60b2fb6ed1b52e04d4746">
<!ENTITY version "2023.05.07">
<!ENTITY md5 "8a2f8fe28ba548d0cff806133a177010">
<!ENTITY launch "Apps">
<!ENTITY plugdir "/usr/local/emhttp/plugins/&name;">
<!ENTITY github "Squidly271/community.applications">
@ -13,6 +13,14 @@
<PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" min="6.9.0" support="https://forums.unraid.net/topic/38582-plug-in-community-applications" icon="users">
<CHANGES>
###2023.05.07
- Added: Ability for authors to override Icon entry based upon theme
- PHP8 fixes
- Fixed: After a dockerHub conversion, CA wouldn't return to the proper state of displayed apps
- Fixed: A spotlighted app that had a description that needed a readmore couldn't easily be expanded to read the entire description on the sidebar
- Added: Support for magic mouse gesture or mouse wheel left/right to change pages
- Added: Link to Registry on the support dropdown from the card
###2023.04.26b
- 6.9.2 Compatibility

View File

@ -2,7 +2,7 @@
106b521c1feebda4d7b3f558cc016cda ./CA_notices.page
39053aadf8ec0771de1e2c2dd47e9058 ./ca_settings.page
01ed7990078dee7cecfeda9a4e49377e ./default.cfg
7e22b781295bbf10fe0089378b9ba76b ./include/exec.php
433232dcb984130cbd51a3c331dc94e4 ./include/exec.php
6315b71595f089a310861ef2e1954d84 ./include/helpers.php
3f6ae4c4fef3077dd2ca45117f780846 ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
@ -22,4 +22,4 @@ f2a86fd875cb73bb095388e69ca035fd ./scripts/showStatistics.php
5c088a7cf82229cb64edfd4c415a84a0 ./scripts/updatePluginSupport.php
c91992cf753a12f379773603c800958c ./skins/Narrow/css.php
d642a25efb891e51471fc4c7636da885 ./skins/Narrow/skin.html
5446bc6588094f9a81c23dcfe6c30266 ./skins/Narrow/skin.php
a485fbc40a8b8a21dd359032bab90d2d ./skins/Narrow/skin.php

View File

@ -9,6 +9,7 @@
ini_set('memory_limit','256M'); // REQUIRED LINE
$unRaidSettings = parse_ini_file("/etc/unraid-version");
### Translations section has to be first so that nothing else winds up caching the file(s)
$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
@ -29,10 +30,12 @@ require_once "$docroot/webGui/include/Markdown.php";
################################################################################
$caSettings = parse_plugin_cfg("community.applications");
$dynamixSettings = parse_plugin_cfg("dynamix");
$caSettings['dockerSearch'] = "yes";
$caSettings['unRaidVersion'] = $unRaidSettings['version'];
$caSettings['favourite'] = isset($caSettings['favourite']) ? str_replace("*","'",$caSettings['favourite']) : "";
$caSettings['dynamixTheme'] = $dynamixSettings['theme'];
$caSettings['maxPerPage'] = (integer)$caSettings['maxPerPage'] ?: "24"; // Handle possible corruption on file
if ( $caSettings['maxPerPage'] < 24 ) $caSettings['maxPerPage'] = 24;
@ -1840,7 +1843,7 @@ function getRepoDescription() {
# Creates the XML for a container install #
###########################################
function createXML() {
global $caPaths;
global $caPaths, $caSettings;
$xmlFile = getPost("xml","");
$type = getPost("type","");
@ -1864,7 +1867,8 @@ function createXML() {
$template['Overview'] = $template['OriginalOverview'];
if ( $template['OriginalDescription'] )
$template['Description'] = $template['OriginalDescription'];
$template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];
// Handle paths directly referencing disks / poola that aren't present in the user's system, and replace the path with the first disk present
$unRaidDisks = parse_ini_file($caPaths['disksINI'],true);

View File

@ -96,6 +96,8 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$template['ModeratorComment'] = $extraDeprecated[$template['Repository']];
}
}
$template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];
if ( $template['RepositoryTemplate'] ) {
$template['Icon'] = $template['icon'] ?? "/plugins/dynamix.docker.manager/images/question.png";
@ -619,9 +621,11 @@ function getPopupDescriptionSkin($appNumber) {
$template['IconFA'] = $template['IconFA'] ?: $template['Icon'];
$templateIcon = startsWith($template['IconFA'],"icon-") ? "{$template['IconFA']} unraidIcon" : "fa fa-{$template['IconFA']}";
$template['display_icon'] = "<i class='$templateIcon popupIcon'></i>";
} else
} else {
$template['Icon'] = $template["Icon-{$caSettings['dynamixTheme']}"] ?? $template['Icon'];
$template['display_icon'] = "<img class='popupIcon screenshot' href='{$template['Icon']}' src='{$template['Icon']}' alt='Application Icon'>";
}
if ( $template['Requires'] ) {
$template['Requires'] = Markdown(strip_tags(str_replace(["\r","\n","&#xD;"],["","<br>",""],trim($template['Requires'])),"<br>"));
preg_match_all("/\/\/(.*?)&#92;/m",$template['Requires'],$searchMatches);
@ -1141,6 +1145,8 @@ function displayCard($template) {
$supportContext[] = ["icon"=>"ca_discord","link"=>$Discord,"text"=>tr("Discord")];
if ( $Support )
$supportContext[] = ["icon"=>"ca_fa-support","link"=>$Support,"text"=> $SupportLanguage ?: tr("Support Forum")];
if ( $Registry ?? false)
$supportContext[] = ["icon"=>"docker","link"=>$Registry,"text"=>tr("Registry")];
} else {
$holderClass='repositoryCard';
$cardClass = "ca_repoinfo";