Squidly271/community.applications
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove inline xmlinstall onclick from popup

Browse Source
This commit is contained in:
Squidly271 2021-08-05 18:59:24 -04:00
parent 477dd5363c
commit 522500e111
4 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

18
source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page
View File

@ -313,11 +313,16 @@ $(function(){
doSearch(false,repo);
});
$('.mainArea').on("click",".xmlInstall",function() {
$('body').on("click",".xmlInstall",function() {
if ( popupVisible(this) ) return;
var type = $(this).data("type");
var xml = $(this).data("xml");
xmlInstall(type,xml);
saveState();
post({action:'createXML',xml:xml},function(result){
if ( result.status == "ok" ) {
openNewWindow("/Apps/AddContainer?xmlTemplate="+type+":"+xml);
}
});
});
$('.menuItems').on("click",'.categoryMenu',function() {
@ -1231,15 +1236,6 @@ function displayTags(leadTemplate,popup=false) {
});
}
function xmlInstall(type,xml) {
saveState();
post({action:'createXML',xml:xml},function(result){
if ( result.status == "ok" ) {
openNewWindow("/Apps/AddContainer?xmlTemplate="+type+":"+xml);
}
});
}
function makePlural(string,count) {
return ( (count > 1) || (count == 0) ) ? string + "s" : string;
}

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

@ -1,9 +1,7 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
09029539a3780927f0a37aede9d57a16 ./CommunityApps.page
8c24d585c7dd3ff9ef961bb2c2705711 ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md
2cdb7da0d67a11278ada7fd029707738 ./ca_settings.page
ad4710ab4aa46dac8818218449292b15 ./CommunityApps.page
7c88ace586933a4a60b0ef2f8a97a662 ./default.cfg
4344942541019c3b5464d508c7f0dd30 ./images/community.applications.png
6e48a62b91bdd066f023f46c6b491afd ./images/discord-azure.svg
@ -15,18 +13,20 @@ ce58643666305cd071a0a159da8466d6 ./include/exec.php
06b55b88a6ed1834a15c7fd72b2c819d ./include/helpers.php
3893704ad833c765384c5fcf3147a7f7 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
4e97f00c3f0a52603239b00acf890990 ./skins/Narrow/css.php
1668b7fa961aef793fca369a793e7f16 ./skins/Narrow/skin.html
c59d799bdc620da06500b8d59700f878 ./skins/Narrow/skin.php
430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php
8c24d585c7dd3ff9ef961bb2c2705711 ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md
717f49d6faabd7e1d7cf0940beb5cd5e ./scripts/checkForUpdates.php
bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php
ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
ce77df69331ccd3bf4037389325a01e1 ./scripts/installUpdate.php
5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh
729c178196af99c94116246f0c8be7a5 ./scripts/notices.php
430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php
1efbd780e8ead27a768d1631fb51150c ./scripts/pluginInstall.sh
f9c3f431935fb20801f3fef152dc7b58 ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
02759ea835ee4ce5a051fead96ab9b9b ./scripts/updatePluginSupport.php
717f49d6faabd7e1d7cf0940beb5cd5e ./scripts/checkForUpdates.php
ce77df69331ccd3bf4037389325a01e1 ./scripts/installUpdate.php
4e97f00c3f0a52603239b00acf890990 ./skins/Narrow/css.php
1668b7fa961aef793fca369a793e7f16 ./skins/Narrow/skin.html
67e3158f428371a636821ac0de629958 ./skins/Narrow/skin.php

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

@ -632,16 +632,16 @@ function getPopupDescriptionSkin($appNumber) {
if ( ! filter_var($dockerUpdateStatus[$tmpRepo]['status'],FILTER_VALIDATE_BOOLEAN) ) {
$installLine .= "<div><a class='appIconsPopUp ca_fa-update' onclick='updateDocker(&quot;$name&quot;);'> ".tr("Update")."</a></div>";
}
$installLine .= $caSettings['defaultReinstall'] == "true" ? "<div><a class='appIconsPopUp ca_fa-install xmlInstall' onclick='xmlInstall(&quot;default&quot;,&quot;".addslashes($template['Path'])."&quot;);'> ".tr("Reinstall (default)")."</a></div>" : "";
$installLine .= "<div><a class='appIconsPopUp ca_fa-edit' onclick='xmlInstall(&quot;edit&quot;,&quot;".addslashes($info[$name]['template'])."&quot;);'> ".tr("Edit")."</a></div>";
$installLine .= $caSettings['defaultReinstall'] == "true" ? "<div><a class='appIconsPopUp ca_fa-install xmlInstall' data-type='default' data-xml='".addslashes($template['Path'])."'> ".tr("Reinstall (default)")."</a></div>" : "";
$installLine .= "<div><a class='appIconsPopUp ca_fa-edit xmlInstall' data-type='edit' data-xml='".addslashes($info[$name]['template'])."'> ".tr("Edit")."</a></div>";
if ( $info[$name]['url'] && $info[$name]['running'] ) {
$installLine .= "<div><a class='appIconsPopUp ca_fa-globe' href='{$info[$name]['url']}' target='_blank'> ".tr("WebUI")."</a></div>";
}
} else {
if ( $template['InstallPath'] )
$installLine .= "<div><a class='appIconsPopUp ca_fa-install' onclick='xmlInstall(&quot;user&quot;,&quot;".addslashes($template['InstallPath'])."&quot;);'> ".tr("Reinstall")."</a></div>";
$installLine .= "<div><a class='appIconsPopUp ca_fa-install xmlInstall' data-type='user' data-xml='".addslashes($template['InstallPath'])."'> ".tr("Reinstall")."</a></div>";
else {
$install = "<div><a class='appIconsPopUp ca_fa-install' onclick='xmlInstall(&quot;default&quot;,&quot;".addslashes($template['Path'])."&quot;);'> ".tr("Install")."</a></div>";
$install = "<div><a class='appIconsPopUp ca_fa-install xmlInstall' data-type='default' data-xml='".addslashes($template['Path'])."'> ".tr("Install")."</a></div>";
$installLine .= $template['BranchID'] ? "<div><a style='cursor:pointer' class='appIconsPopUp ca_fa-install' onclick='displayTags({$template['ID']},true);'> ".tr("Install")."</a></div>" : $install;
}
}