diff --git a/archive/community.applications-2021.11.13-x86_64-1.txz b/archive/community.applications-2021.11.13-x86_64-1.txz index e1c4d217..10204a0a 100644 Binary files a/archive/community.applications-2021.11.13-x86_64-1.txz and b/archive/community.applications-2021.11.13-x86_64-1.txz differ diff --git a/plugins/community.applications.plg b/plugins/community.applications.plg index e566f3cd..9c5163ce 100644 --- a/plugins/community.applications.plg +++ b/plugins/community.applications.plg @@ -35,7 +35,6 @@ - Fixed: Don't allow CA to be uninstalled from within CA - Fixed: Descriptions on repository cards would display an error when clicking on them - ###2021.10.24 - Windows 11 temporary compatibility fix - Fixed: Repository descriptions weren't showing up on cards if descriptions were allowed in Settings diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page index 07f5dd37..6e57b33b 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page @@ -358,8 +358,7 @@ $(function(){ $(".dropdown-menu").hide(); return; } - - $("body").css("overflow","hidden"); + $("body").addClass("body_sidebarScroll"); var apppath = $(this).data("apppath"); var appname = $(this).data("appname"); @@ -943,7 +942,7 @@ function closeSidebar(cookie=false,visible=false) { $(".sidenav").removeClass("sidenavShow").addClass("sidenavHide"); $("#sidenavContent").html(""); $(".back_to_top").removeClass("back_to_top_hide"); - $("body").css("overflow","auto"); + $("body").removeClass("body_sidebarScroll"); $(".sidebar").fadeOut(); } @@ -2155,7 +2154,8 @@ function showRepoPopup(repository) { $(".sidenav").removeClass("sidenavHide").addClass("sidenavShow"); $(".sidebar").fadeIn(); - $("body").css("overflow","hidden"); + $("body").addClass("body_sidebarScroll"); + $("body").css("overflow","hidden !important"); post({action:'getRepoDescription',repository:repository},function(result) { $("#sidenavContent").html(result.description); $('.popup_readmore').readmore({maxHeight:250,moreLink:" ",lessLink:" "}); diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 index 6b8a1433..72faa640 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 @@ -1,8 +1,8 @@ -cf92dbb0ee841e7034462ea1f5cb4042 ./Apps.page +c7df6e5d6283a5c09575f6e27488d5a6 ./Apps.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page 7ee0b23dbd92ed55f611360a983f9565 ./ca_settings.page 1b49ec9797713ce869ea0c1066a109f2 ./default.cfg -18ade20ccdeb4bd9429af4fd9eae48f4 ./include/exec.php +307bdfc5a280db03798fea3b6290a4c3 ./include/exec.php b27be72c48168f6df05a3ebb4ab0a210 ./include/helpers.php 95709ae0ed53e2889a93849a69b37892 ./include/paths.php 410c0166bae560754e231486050621f6 ./javascript/libraries.js @@ -20,6 +20,6 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md 09b5297db02076376519d92e2ce76cc6 ./scripts/showStatistics.php 4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh 2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php -ec3b4d48316c4303d53fda620e149749 ./skins/Narrow/css.php +29aec30281e6b795644d4570c10c21f1 ./skins/Narrow/css.php cfa1511913f794c8c5980460dfcdf049 ./skins/Narrow/skin.html -d5379f79ae367cfeafe945ab680d76ec ./skins/Narrow/skin.php +c9f07ddfc86285c4f49c9dfca3f3f0b2 ./skins/Narrow/skin.php diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php index 42247d4d..4e89cbd3 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php @@ -1307,7 +1307,11 @@ function statistics() { @unlink($caPaths['community-templates-displayed']); @unlink($caPaths['community-templates-allSearchResults']); @unlink($caPaths['community-templates-catSearchResults']); - $statistics = download_json($caPaths['statisticsURL'],$caPaths['statistics']); + if ( ! is_file($caPaths['statistics']) ) + $statistics = download_json($caPaths['statisticsURL'],$caPaths['statistics']); + else + $statistics = readJsonFile($caPaths['statistics']); + download_json($caPaths['moderationURL'],$caPaths['moderation']); $statistics['totalModeration'] = count(readJsonFile($caPaths['moderation'])); $repositories = readJsonFile($caPaths['repositoryList']); diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php index ca691468..45da730e 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php @@ -151,6 +151,7 @@ a.appIconsPopUp { text-decoration:none;color:inherit;} .betaPopupText{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;} body.stop-scrolling{height:70%;overflow:inherit;} /* disable SweetAlert killing the scroll bar ( stops the wiggle ) */ body{scrollbar-gutter:stable;cursor:default !important;} +.body_sidebarScroll{overflow:hidden !important;} .caChangeLog {cursor:pointer;} .caChart {display:none;border:none;} . {display:inline-block;width:7rem;height:3rem;} diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php index 9c2ee69d..ae3bb0bd 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php @@ -344,6 +344,8 @@ function getPopupDescriptionSkin($appNumber) { $allRepositories = readJsonFile($caPaths['repositoryList']); $pinnedApps = readJsonFile($caPaths['pinnedV2']); + if ( ! is_file($caPaths['statistics']) ) + download_json($caPaths['statisticsURL'],$caPaths['statistics']); if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) { $caSettings['dockerRunning'] = "true"; @@ -1292,10 +1294,10 @@ function displayPopup($template) {
$display_changes
"; } - $moderation = readJsonFile($caPaths['fixedTemplates_txt']); - if ( $moderation[$Repo][$Repository] ) { + $moderation = readJsonFile($caPaths['statistics']); + if ( $moderation['fixedTemplates'][$Repo][$Repository] ) { $card .= "
".tr("Template Errors")."
"; - foreach ($moderation[$Repo][$Repository] as $error) { + foreach ($moderation['fixedTemplates'][$Repo][$Repository] as $error) { $card .= "
  • $error
    • "; } }