diff --git a/archive/community.applications-2023.11.11-x86_64-1.txz b/archive/community.applications-2023.11.11-x86_64-1.txz index 284fcd3d..d54e7e8d 100644 Binary files a/archive/community.applications-2023.11.11-x86_64-1.txz and b/archive/community.applications-2023.11.11-x86_64-1.txz differ 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 fa366213..67422651 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 @@ -677,10 +677,6 @@ $(function(){ $(".multi_installAll").click(function() { selectAllPrevious(); enableMultiInstall(); }); $(".startupButton").click(function() { $(".maxPerPage").hide();hideSortIcons();updateContent(this); }); - $(".checkForUpdatesButton").click(function() { - openBox('/plugins/=$plugin?>/scripts/checkForUpdates.sh',tr('Check For Updates'),600,1100,true,"postCheckForUpdates"); - }); - $(".multi_installButton").click(function() { if ( $(".multi_installButton").hasClass("actionCenter") ) { updateMulti(); @@ -949,7 +945,7 @@ function showSpecialCategory(button) { function showSpecials(button) { showSortIcons(); $(".caMenuItem").removeClass("selectedMenu"); - $(".multi_installDiv,.checkForUpdates").hide(); + $(".multi_installDiv").hide(); data.selected_category = "DOESNTMATTERWHATSHERE"; data.section = "AppStore"; changeCategory(button,false); @@ -960,7 +956,7 @@ function changeCategory(button,subSwitch) { var description = $(button).text(); var category = $(button).attr("data-category"); - $(".multi_installDiv,.checkForUpdates").hide(); + $(".multi_installDiv").hide(); getContent(false,category,description,false); } @@ -1043,7 +1039,7 @@ function doSearch(button,newSearch) { data.section = "AppStore"; $('#searchBox').val(filter); - $(".multi_installDiv,.checkForUpdates").hide(); + $(".multi_installDiv").hide(); if ($('#searchButton').hasClass('fa-search')) { if (filter) { @@ -1461,10 +1457,8 @@ function getPrevApps(installed,filter,dontClear) { post({action:'previous_apps',installed:installed,filter:filter},function(result) { if ( installed == true ) { $(".multi_installDiv").hide(); - $(".checkForUpdates").show(); } else { $(".multi_installDiv").show(); - $(".checkForUpdates").hide(); if ( ! dontClear ) { clearMultiInstall(); } @@ -1627,7 +1621,7 @@ function appStore() { function initializeAppStore() { data.section = "AppStore"; data.selected_category = ""; - $(".multi_installDiv,.checkForUpdates").hide(); + $(".multi_installDiv").hide(); } function checkPLGupdate() { @@ -1690,7 +1684,7 @@ function pins() { clearCategory(); showSortIcons(); $("#Category").html(""); - $(".dockerSearch,.multi_installDiv,.checkForUpdates").hide(); + $(".dockerSearch,.multi_installDiv").hide(); post({action:'pinnedApps'},function(result) { refreshDisplay(); myCloseAlert(); @@ -1961,16 +1955,15 @@ function updateMulti() { }, function( isConfirm ) { if ( isConfirm ) { myCloseAlert(); - if ( docker.length && plugin.length ) { - $.cookie("ca_plugininstallpending",plugin,{path:"/;SameSite=Lax"}); - } + if ( docker.length ) { + var postUpdateFunction = plugin.length ? "actionCentre" : "installMultiPluginUpdatesAfterDocker"; saveState(); setTimeout(function(){ - openDocker('update_container '+docker.join('*'),tr('Install '+makePlural("Application",dockerCount)),'','reloadPage'); + openDocker('update_container '+docker.join('*'),tr('Install '+makePlural("Application",dockerCount)),'',postUpdateFunction); },1000); } else { - ca_openPlugin('multiplugin update '+plugin,tr('Install '+makePlural("Application",pluginCount)),'','refresh'); + ca_openPlugin('multiplugin update '+plugin,tr('Install '+makePlural("Application",pluginCount)),'','actionCentre'); enableSearch(); } } else { @@ -1979,6 +1972,13 @@ function updateMulti() { }); } +function installMultiPluginUpdatesAfterDocker() { + setTimeout(function(){ + ca_openPlugin('multiplugin update '+plugin,tr('Install '+makePlural("Application",pluginCount)),'','actionCentre'); + enableSearch(); + },1000); +} + function reloadPage() { location.reload(); } @@ -2048,7 +2048,7 @@ function installMulti() { }); post({action:'saveMultiPluginPending',plugin:plugin},function(data) { - ca_openPlugin('multiplugin install '+plugin,tr('Install '+makePlural("Application",pluginCount)),'','refresh'); + ca_openPlugin('multiplugin install '+plugin,tr('Install '+makePlural("Application",pluginCount)),'','refreshDisplay'); }); openBox('/plugins/=$plugin?>/scripts/installMultiPlugin.php&arg1='+plugin,tr('Install '+makePlural("Application",pluginCount)),600,900,true); @@ -2246,7 +2246,7 @@ function cookiesEnabled() { } function showCredits() { - $(".multi_installDiv,.dockerSearch,.checkForUpdates").hide(); + $(".multi_installDiv,.dockerSearch").hide(); clearCategory(); clearSearchBox(); var credits = $('#caCredits').html(); updateDisplay(credits); @@ -2254,7 +2254,7 @@ function showCredits() { } function showStatistics() { - $(".multi_installDiv,.dockerSearch,.checkForUpdates").hide(); + $(".multi_installDiv,.dockerSearch").hide(); clearCategory(); clearSearchBox(); post({action:'statistics'},function(result) { updateDisplay(result.statistics); @@ -2264,7 +2264,7 @@ function showStatistics() { } function caChangeLog() { - $(".multi_installDiv,.dockerSearch,.checkForUpdates").hide(); + $(".multi_installDiv,.dockerSearch").hide(); clearCategory(); clearSearchBox(); post({action:'caChangeLog'},function(result) { updateDisplay(result.changelog); @@ -3111,7 +3111,7 @@ function dockerSearch(pageNumber) { var filter = $('#searchBox').val(); var dockerURL = "https://registry.hub.docker.com/search?q=" + filter; data.docker = "searching docker"; - $(".dockerSearch,.multi_installDiv,.checkForUpdates").hide(); + $(".dockerSearch,.multi_installDiv").hide(); $("#Category").html(sprintf(tr("DockerHub Search for %s"),filter)+" "); post({action:'search_dockerhub',filter:filter,page:pageNumber},function(result) { updateDisplay(result.display); 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 da797192..72928f26 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,4 +1,4 @@ -2af5c88e41ab29b31e4145d1832a372e ./Apps.page +712203cddc719d5b432e2246981fd146 ./Apps.page 385834d91dc8758bfcd5d34f1c3e530e ./CA_notices.page 2c2a1b7d148fe51ee38813d1a0e71589 ./ca_settings.page 01ed7990078dee7cecfeda9a4e49377e ./default.cfg @@ -21,6 +21,6 @@ a1cb6e1930f2ad689ce9e7fc2e39c846 ./scripts/notices.php 4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh 52355989c2bec01cfd55fe619588a033 ./scripts/updatePluginSupport.php 5a0516d49f7c195b67e4d61913b12bd5 ./skins/Narrow/css.php -53cc49a55e85e0ec20dcd94b965821ed ./skins/Narrow/skin.html +269e66607463412a75aca9e7d48b0325 ./skins/Narrow/skin.html 94d6cdbb0833a08f31457c4d92313630 ./skins/Narrow/skin.php c26b187a50c966adff7bfb9cab6fca16 ./event/disks_mounted diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html index 0796cb76..ca86e891 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html @@ -53,7 +53,6 @@
-