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

below

Browse Source 
Add: hover text over some icons
Fixed:: download stat wasn't showing on the sidebar
This commit is contained in:
Squidly271 2021-10-26 22:13:29 -04:00
parent c49cd41170
commit 2020388812
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -22,4 +22,4 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md
2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php
e5096f10b5d6af95d569dc8b920a0482 ./skins/Narrow/css.php
4ff34c148d3dde1a420303faecd414ae ./skins/Narrow/skin.html
2db3009364c6769a1dfffc459528fb22 ./skins/Narrow/skin.php
07f6417aecc08650582605a157c9e11c ./skins/Narrow/skin.php

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

@ -113,13 +113,15 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
}
foreach ($dockerRunning as $testDocker) {
if ( ($tmpRepo == $testDocker['Image'] || "$tmpRepo:latest" == $testDocker['Image']) && ($template['Name'] == $testDocker['Name']) ) {
$template['Installed'] = ! $template['Uninstall']; // Stops the Installed flag from appearing within Installed apps
// $template['Installed'] = ! $template['Uninstall']; // Stops the Installed flag from appearing within Installed apps
$template['Installed'] = true;
break;
}
}
} else {
$pluginName = basename($template['PluginURL']);
$template['Installed'] = checkInstalledPlugin($template) && ! $template['Uninstall'];
$template['Installed'] = checkInstalledPlugin($template) ;
}
@ -680,7 +682,20 @@ function displayCard($template) {
$appType = $Language ? "appLanguage": $appType;
$appType = (strpos($Category,"Drivers") !== false) && $Plugin ? "appDriver" : $appType;
$appType = $RepositoryTemplate ? "appRepository" : $appType;
switch ($appType) {
case "appPlugin":
$typeTitle = tr("This application is a plugin");
break;
case "appDocker":
$typeTitle = tr("This application is a docker container");
break;
case "appLanguage":
$typeTitle = tr("This is a language pack");
break;
case "appDriver":
$typeTitle = tr("This application is a driver (plugin)");
break;
}
if ($InstallPath)
$Path = $InstallPath;
@ -693,7 +708,6 @@ function displayCard($template) {
if ( $Language )
$author = "Unraid";
if ( !$RepositoryTemplate ) {
$cardClass = "ca_appPopup";
$supportContext = array();
@ -722,15 +736,12 @@ function displayCard($template) {
$supportContext[] = array("icon"=>"ca_reddit","link"=>$Reddit,"text"=>tr("Reddit"));
if ( $Facebook )
$supportContext[] = array("icon"=>"ca_facebook","link"=>$Facebook,"text"=>tr("Facebook"));
if ( $WebPage )
$supportContext[] = array("icon"=>"ca_webpage","link"=>$WebPage,"text"=>tr("Web Page"));
$Name = str_replace("' Repository","",str_replace("'s Repository","",$author));
$Name = str_replace(" Repository","",$Name);
$author = "";
}
$display_repoName = str_replace("' Repository","",str_replace("'s Repository","",$display_repoName));
@ -750,14 +761,13 @@ function displayCard($template) {
";
$card .= "
<span class='$appType'></span>
<span class='$appType' title='".htmlentities($typeTitle)."'></span>
";
if ( $ca_fav )
$card .= "<span class='favCardBackground' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'></span>";
else
$card .= "<span class='favCardBackground' style='display:none;' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'></span>";
if ( $ca_fav ) {
$favText = $RepositoryTemplate ? tr("This is your favourite repository") : tr("This application is from your favourite repository");
$card .= "<span class='favCardBackground' title='".htmlentities($favText)."' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'></span>";
} else
$card .= "<span class='favCardBackground' title='".htmlentities($favText)."' style='display:none;' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'></span>";
if ($Removable && !$DockerInfo) {
$previousAppName = $Plugin ? $PluginURL : $Name;
@ -769,7 +779,7 @@ function displayCard($template) {
$card .= "<div class='ca_iconArea'>";
if ( ! $IconFA )
$card .= "
<img class='ca_displayIcon'src='$Icon'></img>
<img class='ca_displayIcon' src='$Icon'></img>
";
else {
$displayIcon = $template['IconFA'] ?: $template['Icon'];
@ -821,7 +831,7 @@ function displayCard($template) {
$card .= "</div>";
} else if ( $RecommendedDate ) {
$card .= "<div class='spotlightCardBackground'>";
$card .= "<div class='spotlightPopupText'></div>";
$card .= "<div class='spotlightPopupText' title='".tr("This is a spotlight application")."'></div>";
$card .= "</div>";
}
return str_replace(["\t","\n"],"",$card);
@ -932,6 +942,7 @@ function displayPopup($template) {
<tr><td class='popupTableLeft'>".tr("Categories")."</td><td class='popupTableRight'>$Category</td></tr>
<tr><td class='popupTableLeft'>".tr("Added")."</td><td class='popupTableRight'>$DateAdded</td></tr>
";
$downloadText = getDownloads($downloads);
if ($downloadText)
$card .= "<tr><td class='popupTableLeft'>".tr("Downloads")."</td><td class='popupTableRight'>$downloadText</td></tr>";
if (!$Plugin && !$LanguagePack)
@ -967,7 +978,7 @@ function displayPopup($template) {
<div class='donateDiv'><span class='donate'><a href='$DonateLink' target='_blank'>".tr("Donate")."</a></span></div>
";
}
$downloadText = getDownloads($downloads);
$card .= "
</div>
</div>