diff --git a/archive/community.applications-2021.11.04-x86_64-1.txz b/archive/community.applications-2021.11.04-x86_64-1.txz index f3d19d3a..ef20823f 100644 Binary files a/archive/community.applications-2021.11.04-x86_64-1.txz and b/archive/community.applications-2021.11.04-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 220e16f2..a871be38 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 @@ -583,13 +583,6 @@ $(function(){ closeSidebar(); }); - $('body').on("click",".deletePrivateApp",function() { - var path = $(this).data("path"); - var name = $(this).data("name"); - var author = $(this).data("author"); - deletePrivateApp(path,name,author); - }); - $("body").on("click",".removeApp",function() { var path = $(this).data("path"); var name = $(this).data("name"); @@ -1101,36 +1094,6 @@ String.prototype.basename = function() { return this.split('/').reverse()[0]; } -function deletePrivateApp(path,name,author) { - var displayPath = path.replace("/boot/config/plugins/","..."); - disableSearch(); - swal({ - title: "", - text: sprintf(tr("Are you sure you want to remove the private application %s by %s?"),""+name+"",""+author+"")+"
("+displayPath+")", - type: "warning", - showCancelButton: true, - showConfirmButton: true, - cancelButtonText: "", - confirmButtonText: "", - closeOnConfirm: false, - showLoaderOnConfirm: true, - allowOutsideClick: true, - html: true - }, function(isConfirm) { - if ( isConfirm ) { - swal(sprintf(tr("Removing %s"),name),"","info"); - getSelectedApps(); - post({action:'removePrivateApp',path:path,noSpinner:true},function(result) { - myCloseAlert(); - refreshDisplay(); - enableSearch(); - }); - } else { - enableSearch(); - } - }); -} - function uninstallDocker(application,humanName) { closeSidebar(); disableSearch(); 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 753c01dc..63deed1d 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 @@ -fd836d964720aa8c8f5fee785725aed2 ./Apps.page +a2272d2f6216b9eb6ab98307b8a247d8 ./Apps.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page 7ee0b23dbd92ed55f611360a983f9565 ./ca_settings.page 1b49ec9797713ce869ea0c1066a109f2 ./default.cfg -0ea4186e2b1727fb21c1b7da85f5f7e3 ./include/exec.php +3217b5f6a993a0b035cd9ae006e8ec0b ./include/exec.php 5810179d140aadc0a17b2d8782a32cba ./include/helpers.php 8ba23d3d51816bbb91245cfc3fcb8024 ./include/paths.php eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js @@ -22,4 +22,4 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md 2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php c8e4e9a16b47ecc0acf66d46be497599 ./skins/Narrow/css.php e965c8fafd1eae7a0387e37cee3aeaf9 ./skins/Narrow/skin.html -c35c87a76d5f7052c9de5ca6a114e50e ./skins/Narrow/skin.php +3985196a6c947cb9a3c75b3c257d833c ./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 8f8dabc5..c2ca4d5a 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 @@ -403,6 +403,7 @@ function getConvertedTemplates() { $myTemplates[$i] = $o; $i = ++$i; } + writeJsonFile($caPaths['community-templates-info'],$myTemplates); return true; } 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 03cbdb8d..39ded2df 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 @@ -992,10 +992,8 @@ function displayCard($template) {
$Name "; if ( $CAComment || $ModeratorComment || $Deprecated || (isset($Compatible) && ! $Compatible) || $Blacklist ) { - if ( $CAComment ) - $warning = tr($CAComment); - if ( $ModeratorComment ) - $warning = tr($ModeratorComment); + if ( $CAComment || $ModeratorComment) + $warning = tr("Click info to see the notes regarding this application"); if ( $Deprecated ) $warning = tr("This application template has been deprecated"); if ( ! $Compatible )