mirrors/community.applications
1
0
Fork 0
mirror of https://github.com/Squidly271/community.applications.git synced 2025-06-03 14:52:13 +08:00
Code Issues Projects Releases Wiki Activity

below

Browse Source 
Don't allow a plugin install if one already in progress.
Change Spotlight icon
This commit is contained in:
Squidly271 2023-04-11 20:17:33 -04:00
parent 3695646056
commit 61dbc7f26a
6 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -1489,7 +1489,7 @@ function uninstallApp(application,humanName) {
if (data.inProgress) { if (data.inProgress) {
swal({ swal({
title: "<?tr("Installation already in progress")?>", title: "<?tr("Installation already in progress")?>",
text: "<?tr("Another plugin installation or update is already in progress, and this one cannot start. Wait until the current installation or update is completed and try again")?>", text: "<?tr("Another plugin installation or update is already in progress and this one cannot start. Wait until the current installation or update is completed and try again")?>",
allowOutsideClick: false, allowOutsideClick: false,
showConfirmButton: true, showConfirmButton: true,
showCancelButton: false, showCancelButton: false,
@ -2071,7 +2071,7 @@ function updateDisplay(content) {
$(this).html(description + "... <span class='card_readmore'><?=tr("Read more")?></span>"); $(this).html(description + "... <span class='card_readmore'><?=tr("Read more")?></span>");
} }
}); });
$(".ca_applicationName,.betaPopupText,.installedCardText,.upgradePopupText").each(function() { $(".ca_applicationName,.betaPopupText,.installedCardText,.upgradePopupText,.ltofficialPopupText").each(function() {
while (isOverflown(this)) { while (isOverflown(this)) {
var existingSize = $(this).css("font-size"); var existingSize = $(this).css("font-size");

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

@ -1,10 +1,10 @@
1bae65306743fa52da3bb262f0304bcf ./Apps.page 88af72171bdf94201de853ad7a236cf7 ./Apps.page
106b521c1feebda4d7b3f558cc016cda ./CA_notices.page 106b521c1feebda4d7b3f558cc016cda ./CA_notices.page
eb1f0ee4148747c0473e73e4e973994f ./ca_settings.page eb1f0ee4148747c0473e73e4e973994f ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
451cc69d66e2504aa3e9977cb2e233b8 ./include/exec.php 451cc69d66e2504aa3e9977cb2e233b8 ./include/exec.php
1182f793790a06f0d8ac38674904ec76 ./include/helpers.php 1182f793790a06f0d8ac38674904ec76 ./include/helpers.php
8e053d6cd83fbe2202c13b692beabb4f ./include/paths.php 7cc3e1ffd81120a1cf407857225db275 ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js 532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md 71f911a818d88d3d567f8a2898094ee2 ./README.md
ec075d8b9758ba00bda9b02c4692f972 ./scripts/checkForUpdates.php ec075d8b9758ba00bda9b02c4692f972 ./scripts/checkForUpdates.php
@ -20,6 +20,6 @@ ed42a35b3524b55e2024cdd56a795733 ./scripts/pluginInstall.php
f2a86fd875cb73bb095388e69ca035fd ./scripts/showStatistics.php f2a86fd875cb73bb095388e69ca035fd ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh 4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
5c088a7cf82229cb64edfd4c415a84a0 ./scripts/updatePluginSupport.php 5c088a7cf82229cb64edfd4c415a84a0 ./scripts/updatePluginSupport.php
93144bebc8bab49bbf3cad72cffbb1bd ./skins/Narrow/css.php 9f9f7cbbb7962b6c70c9a4cda77d5cdf ./skins/Narrow/css.php
d642a25efb891e51471fc4c7636da885 ./skins/Narrow/skin.html d642a25efb891e51471fc4c7636da885 ./skins/Narrow/skin.html
4951429426a98eafa9e18b755528e52a ./skins/Narrow/skin.php fffb0e7d9806fa2b5ddf9954a087a26e ./skins/Narrow/skin.php

5
source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php
View File

@ -86,7 +86,10 @@ $caPaths['info'] = $caPaths['tempFiles']."/info.j
$caPaths['dockerSearchResults'] = $caPaths['tempFiles']."/dockerSearch.json"; $caPaths['dockerSearchResults'] = $caPaths['tempFiles']."/dockerSearch.json";
$caPaths['dockerSearchInstall'] = $caPaths['tempFiles']."/dockerConvert.xml"; $caPaths['dockerSearchInstall'] = $caPaths['tempFiles']."/dockerConvert.xml";
$caPaths['dockerSearchActive'] = $caPaths['tempFiles']."/dockerSearchActive"; $caPaths['dockerSearchActive'] = $caPaths['tempFiles']."/dockerSearchActive";
$caPaths['SpotlightIcon'] = "https://raw.githubusercontent.com/Squidly271/community.applications/master/webImages/Unraid.svg";
$caPaths['dockerConvertFlash'] = $dockerManPaths['templates-user']."/my-CA_TEST_CONTAINER_DOCKERHUB.xml"; $caPaths['dockerConvertFlash'] = $dockerManPaths['templates-user']."/my-CA_TEST_CONTAINER_DOCKERHUB.xml";
$caPaths['pluginPending'] = "/tmp/plugins/pluginPending/"; $caPaths['pluginPending'] = "/tmp/plugins/pluginPending/";
//$caPaths['SpotlightIcon'] = "https://raw.githubusercontent.com/Squidly271/community.applications/master/webImages/Unraid.svg";
$dynamixSettings = parse_ini_file($caPaths['dynamixSettings']);
$caPaths['SpotlightIcon'] = "https://github.com/Squidly271/community.applications/raw/master/webImages/spotlight_{$dynamixSettings['theme']}.png";
?> ?>

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

@ -326,6 +326,10 @@ input[type=button][disabled]{background:none;}
.notice.shift{margin-top:0px;} .notice.shift{margin-top:0px;}
.officialCardBackground{clip-path: polygon(0 0,100% 0, 100% 100%);background-color: #854153;top:0px;height:9rem;width:9rem;position: relative;left:-10rem;margin-right:-9rem;} .officialCardBackground{clip-path: polygon(0 0,100% 0, 100% 100%);background-color: #854153;top:0px;height:9rem;width:9rem;position: relative;left:-10rem;margin-right:-9rem;}
.officialPopupText{position:absolute;transform:rotate(45deg);-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-o-transform: rotate(45deg);color:white;font-size:2rem;position:absolute;top:2.25rem;right:-1rem;width:100%;overflow:hidden;height:2.5rem;} .officialPopupText{position:absolute;transform:rotate(45deg);-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-o-transform: rotate(45deg);color:white;font-size:2rem;position:absolute;top:2.25rem;right:-1rem;width:100%;overflow:hidden;height:2.5rem;}
.LTOfficialCardBackground{clip-path: polygon(0 0,100% 0, 100% 100%);background-color: #F15A2C;top:0px;height:9rem;width:9rem;position: relative;left:-10rem;margin-right:-9rem;}
.ltofficialPopupText{position:absolute;transform:rotate(45deg);-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-o-transform: rotate(45deg);color:white;font-size:2rem;position:absolute;top:2.25rem;right:-1rem;width:100%;overflow:hidden;height:2.5rem;}
p {margin:auto;text-align:left;margin-bottom:10px;} /* override dynamix styling for popup */ p {margin:auto;text-align:left;margin-bottom:10px;} /* override dynamix styling for popup */
.pageDots::after{content:"...";} .pageDots::after{content:"...";}
.pageDots{color:grey;cursor:default;} .pageDots{color:grey;cursor:default;}
@ -407,13 +411,13 @@ a.popup-donate:hover{color:<?=$donateText?>;background-color:<?=$unRaid66color?>
.specialCategory{font-size:1.5rem;} .specialCategory{font-size:1.5rem;}
.spinner{z-index:999999 !important;} /* ensure always ontop */ .spinner{z-index:999999 !important;} /* ensure always ontop */
.spinnerBackground{position:fixed;top:0;left:0;width:100%;height:100vh;display:none;background:transparent;z-index:9999;} .spinnerBackground{position:fixed;top:0;left:0;width:100%;height:100vh;display:none;background:transparent;z-index:9999;}
.spotlightDate{font-size:1.5rem;} .spotlightDate{font-size:1.5rem;margin-left:-3rem;}
.spotlightCardBackground{clip-path: polygon(0 0,100% 0, 100% 100%);background-color: #009900;top:0px;height:9rem;width:9rem;position: relative;left:-10rem;margin-right:-9rem;} .spotlightCardBackground{clip-path: polygon(0 0,100% 0, 100% 100%);background-color: #009900;top:0px;height:9rem;width:9rem;position: relative;left:-10rem;margin-right:-9rem;}
.spotlightHome{min-width:36rem !important;max-width:36rem !important;height:24rem !important;margin-bottom:1rem;} .spotlightHome{min-width:36rem !important;max-width:36rem !important;height:24rem !important;margin-bottom:1rem;}
.spotlightPopupBackground{clip-path: polygon(0 0,100% 0, 100% 100%);background-color: #009900;top:<?=$betaPopupOffset?>;height:9rem;width:9rem;position: absolute;right: 0;} .spotlightPopupBackground{clip-path: polygon(0 0,100% 0, 100% 100%);background-color: #009900;top:<?=$betaPopupOffset?>;height:9rem;width:9rem;position: absolute;right: 0;}
.spotlightHeader{font-size:2rem;} .spotlightHeader{font-size:2rem;}
.spotlightIconArea{display:inline-block;float:left;width:10rem;} .spotlightIconArea{display:inline-block;float:left;width:10rem;}
.spotlightIcon{height:3.6rem;margin-top:1rem;margin-bottom:0.5rem;} .spotlightIcon{height:15rem;margin-bottom:-2.5rem;margin-left:-3rem;margin-top:-2rem;}
.spotlightInfoArea{margin-left:2rem;padding-left:10rem;} .spotlightInfoArea{margin-left:2rem;padding-left:10rem;}
.spotlightPopup{display:inline-block;} .spotlightPopup{display:inline-block;}
.spotlightPopupText{position:absolute;color:white;font-size:2rem;position:absolute;top:1.2rem;right:2rem;} .spotlightPopupText{position:absolute;color:white;font-size:2rem;position:absolute;top:1.2rem;right:2rem;}

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

@ -1299,14 +1299,14 @@ function displayCard($template) {
$descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription"; $descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription";
$card .= "<div class='$descClass $backgroundClickable'><div class='cardDesc'>$Overview</div></div>"; $card .= "<div class='$descClass $backgroundClickable'><div class='cardDesc'>$Overview</div></div>";
/* if ( $RecommendedDate ) { if ( $RecommendedDate ) {
$card .= " $card .= "
<div class='homespotlightIconArea ca_center''> <div class='homespotlightIconArea ca_center''>
<div><img class='spotlightIcon' src='{$caPaths['SpotlightIcon']}' alt='Spotlight'></img></div> <div><img class='spotlightIcon' src='{$caPaths['SpotlightIcon']}' alt='Spotlight'></img></div>
<div class='spotlightDate'>".tr(date("M Y",$RecommendedDate),0)."</div> <div class='spotlightDate'>".tr(date("M Y",$RecommendedDate),0)."</div>
</div> </div>
"; ";
} */ }
$card .= "</div>"; $card .= "</div>";
if ( $Installed || $Uninstall ) { if ( $Installed || $Uninstall ) {
$flagTextStart = tr("Installed")."<br>"; $flagTextStart = tr("Installed")."<br>";
@ -1353,7 +1353,13 @@ function displayCard($template) {
} elseif ( $Official ) { } elseif ( $Official ) {
$card .= " $card .= "
<div class='officialCardBackground'> <div class='officialCardBackground'>
<div class='officialPopupText ca_center' title='This is an official container'>".tr("OFFICIAL")."</div> <div class='officialPopupText ca_center' title='".tr('This is an official container')."'>".tr("OFFICIAL")."</div>
</div>
";
} elseif ( $LTOfficial ) {
$card .= "
<div class='LTOfficialCardBackground'>
<div class='ltofficialPopupText ca_center' title='".tr("This is an offical plugin")."'>".tr("OFFICIAL")."</div>
</div> </div>
"; ";
} elseif ( $Beta ) { } elseif ( $Beta ) {
@ -1362,13 +1368,13 @@ function displayCard($template) {
<div class='betaPopupText ca_center'>".tr("BETA")."</div> <div class='betaPopupText ca_center'>".tr("BETA")."</div>
</div> </div>
"; ";
} elseif ( $RecommendedDate ) { }/* elseif ( $RecommendedDate ) {
$card .= " $card .= "
<div class='spotlightCardBackground'> <div class='spotlightCardBackground'>
<div class='spotlightPopupText' title='".tr("This is a spotlight application")."'></div> <div class='spotlightPopupText' title='".tr("This is a spotlight application")."'></div>
</div> </div>
"; ";
} elseif ( $Trusted ) { } */ elseif ( $Trusted ) {
$card .= " $card .= "
<div class='spotlightCardBackground'> <div class='spotlightCardBackground'>
<div class='betaPopupText ca_center' title='".tr("This container is digitally signed")."'>".tr("Digitally Signed")."</div> <div class='betaPopupText ca_center' title='".tr("This container is digitally signed")."'>".tr("Digitally Signed")."</div>