diff --git a/archive/community.applications-2022.09.05-x86_64-1.txz b/archive/community.applications-2022.09.05-x86_64-1.txz new file mode 100644 index 00000000..724e9fd8 Binary files /dev/null and b/archive/community.applications-2022.09.05-x86_64-1.txz differ 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 5f36f449..6a413254 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 @@ -7,8 +7,6 @@ f25b1ed0b1cddfb4ff95a10ced212a0d ./include/helpers.php 116042a918060278e77379b0dd73482c ./include/paths.php 532fffdf939594c143e679da02bd841e ./javascript/libraries.js 71f911a818d88d3d567f8a2898094ee2 ./README.md -ff1fa32f5bc288631673066da4a36ebe ./scripts/caPostHook.php -981bc776ea83d2f15387e29870554e3f ./scripts/caPreHook.php d3d8286046cc7d6edf8f596067c163a2 ./scripts/checkForUpdates.php 99a9d58a49a7f6812f18bd4be2b563b9 ./scripts/checkForUpdates.sh 677ac9a29993ec57e09ec6a1856f1a11 ./scripts/dockerConvert.php @@ -24,4 +22,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 25bdaed6f62ac73f9ef7c3ce0c125ef7 ./skins/Narrow/css.php 7eb021a105e2f7a15675ec8a14e6f05e ./skins/Narrow/skin.html -360f985a0e0e789a02eb66d7d24a6742 ./skins/Narrow/skin.php +30432b07beef03988cb3828f81d5ae0b ./skins/Narrow/skin.php 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 3f4e8729..b7e32fb8 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 @@ -164,7 +164,9 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) $actionsContext[] = array("icon"=>"ca_fa-install","text"=>tr("Install second instance"),"action"=>"popupInstallXML('".addslashes($template['Path'])."','second','".str_replace(" "," ",htmlspecialchars($installComment))."','".portsUsed($template)."');"); } } - $actionsContext[] = array("icon"=>"ca_fa-edit","text"=>tr("Edit"),"action"=>"popupInstallXML('".addslashes($info[$ind]['template'])."','edit');"); + if ( is_file($info[$ind]['template']) ) + $actionsContext[] = array("icon"=>"ca_fa-edit","text"=>tr("Edit"),"action"=>"popupInstallXML('".addslashes($info[$ind]['template'])."','edit');"); + $actionsContext[] = array("divider"=>true); if ($info[$ind]['template']) $actionsContext[] = array("icon"=>"ca_fa-delete","text"=>tr("Uninstall"),"action"=>"uninstallDocker('".addslashes($info[$ind]['template'])."','{$template['Name']}');"); @@ -574,7 +576,7 @@ function getPopupDescriptionSkin($appNumber) { if ( $template['Plugin'] ) { $templateURL = $template['PluginURL']; - download_url($templateURL."1",$caPaths['pluginTempDownload'],"",5); + download_url($templateURL,$caPaths['pluginTempDownload'],"",5); $template['Changes'] = @plugin("changes",$caPaths['pluginTempDownload']) ?: $template['Changes']; $template['pluginVersion'] = @plugin("version",$caPaths['pluginTempDownload']) ?: $template['pluginVersion']; @@ -631,7 +633,9 @@ function getPopupDescriptionSkin($appNumber) { else $actionsContext[] = array("icon"=>"ca_fa-install","text"=>tr("Install second instance"),"action"=>"popupInstallXML('".addslashes($template['Path'])."','second','','".portsUsed($template)."');"); } - $actionsContext[] = array("icon"=>"ca_fa-edit","text"=>tr("Edit"),"action"=>"popupInstallXML('".addslashes($info[$name]['template'])."','edit');"); + if ( is_file($info[$name]['template']) ) + $actionsContext[] = array("icon"=>"ca_fa-edit","text"=>tr("Edit"),"action"=>"popupInstallXML('".addslashes($info[$name]['template'])."','edit');"); + $actionsContext[] = array("divider"=>true); if ( $info[$name]['template'] ) $actionsContext[] = array("icon"=>"ca_fa-delete","text"=>"".tr("Uninstall")."","action"=>"uninstallDocker('".addslashes($info[$name]['template'])."','{$template['Name']}');");