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

Remove extraneous "Warning icon" on the cards if deprecated etc

Browse Source 
Extraneous because it's also on the "flag"
This commit is contained in:
Squidly271 2022-04-19 14:08:32 -04:00
parent 9ff5d6a94d
commit 486534b8f5
5 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2022.04.19-x86_64-1.txz
View File

Binary file not shown.

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

@ -2,7 +2,7 @@
4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg
1838139b062f12f100847b2684a90b36 ./include/exec.php
592e877e6bce65502e4df515466f7e74 ./include/exec.php
d5ba81dbd93c7b149dec96def31107e9 ./include/helpers.php
37de3a3070c32b3626315cdd67106f9b ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
@ -19,6 +19,6 @@ a1401a0bed89c182b69f0c7508282c1f ./scripts/pluginInstall.php
da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
0254b0a66007c3f6e32e7d259e8ee443 ./skins/Narrow/css.php
c7ba8f5e37c5943bdc2c8c90fd580276 ./skins/Narrow/css.php
0bdefa4e915c02ed3310c39eb5a1cef5 ./skins/Narrow/skin.html
db933417f8424e5bed789125837e0aee ./skins/Narrow/skin.php
d1dce59e345650c318386589b6de04b3 ./skins/Narrow/skin.php

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

@ -1644,7 +1644,7 @@ function get_categories() {
global $caPaths, $sortOrder, $caSettings, $DockerClient, $DockerTemplates;
$categories = readJsonFile($caPaths['categoryList']);
if ( ! is_array($categories) || empty($categories) ) {
$cat = "<span class='ca_fa-warning'></span> Category list N/A<br><br>";
$cat = "Category list N/A<br><br>";
postReturn(['categories'=>$cat]);
return;
} else {

1
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php
View File

@ -191,7 +191,6 @@ a.ca_fa-delete{text-decoration:none;margin-left:1rem;font-size:2rem;margin-top:-
.ca_fa-template::before{content:"\f08e";font-family:fontAwesome;}
.ca_fa-uninstall::before{content:"\e92f";font-family:Unraid;}
.ca_fa-update::before{content:"\f0ed";font-family:fontAwesome;}
.ca_fa-warning::before{content:"\f071";font-family:fontAwesome;}
.ca_facebook::before{content:"\f09a";font-family:fontAwesome;}
.ca_favouriteRepo{margin-right:1rem;margin-bottom:1rem;font-size:1.5rem;line-height:2rem;cursor:pointer;display:inline-block;color:<?=$supportPopupText?>!important;background: -webkit-linear-gradient(top, transparent 0%, rgba(0,0,0,0.4) 100%),-webkit-linear-gradient(left, lighten(<?=$donateBackground?>, 15%) 0%, <?=$donateBackground?> 50%, lighten(<?=$donateBackground?>, 15%) 100%); background: linear-gradient(to bottom, transparent 0%, rgba(0,0,0,0.4) 100%),linear-gradient(to right, lighten(#E68321, 15%) 0%, #E68321 50%, lighten(#E68321, 15%) 100%); background-position: 0 0; background-size: 100% 100%; border-radius: 15px; color: #fff; padding: 1px 10px 1px 10px;}
.ca_favouriteRepo:hover{text-decoration:none;background-color:<?=$unRaid66color?>;}

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

@ -1140,7 +1140,7 @@ function displayCard($template) {
$card .= "
<div class='ca_applicationName'>$Name
";
if ( $CAComment || $ModeratorComment || $Deprecated || (isset($Compatible) && ! $Compatible) || $Blacklist || $Requires) {
if ( $CAComment || $ModeratorComment || $Requires) {
if ( $CAComment || $ModeratorComment) {
$commentIcon = "ca_fa-comment";
$warning = tr("Click info to see the notes regarding this application");
@ -1151,18 +1151,7 @@ function displayCard($template) {
$warning = tr("This application has additional requirements");
}
}
if ( $Deprecated ) {
$warning = tr("This application template has been deprecated");
$commentIcon = "ca_fa-warning";
}
if ( ! $Compatible ) {
$commentIcon = "ca_fa-warning";
$warning = $VerMessage ?: tr("This application is not compatible with your version of Unraid");
}
if ( $Blacklist ) {
$commentIcon = "ca_fa-warning";
$warning = tr("This application template has been blacklisted");
}
$card .= "&nbsp;<span class='$commentIcon cardWarning' title='".htmlentities($warning,ENT_QUOTES)."'></span>";
}
$card .= "