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

more onclick

Browse Source
This commit is contained in:
Squidly271 2021-08-14 10:10:59 -04:00
parent 6fcb822cec
commit 50df50a5fa
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -324,6 +324,12 @@ $(function(){
});
});
$('body').on("click",".displayTags",function() {
if ( popupVisible(this) ) return;
var id = $(this).data("id");
displayTags(id);
});
$('body').on("click",".pluginInstall",function() {
if ( popupVisible(this) ) return;
@ -1247,10 +1253,6 @@ function pinnedApps() {
}
function displayTags(leadTemplate,popup=false) {
if ( ! popup)
if ( popupVisible() )
return;
$(".tooltipstered").tooltipster("hide");
post({action:'displayTags',leadTemplate:leadTemplate,noSpinner:true},function(result) {
disableSearch();

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

@ -1,7 +1,7 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
2cdb7da0d67a11278ada7fd029707738 ./ca_settings.page
71d9d6c1f50d8b7301cc9b36c76b3b36 ./CommunityApps.page
9a0b35bc393b8b960b6bc57018331b39 ./CommunityApps.page
7c88ace586933a4a60b0ef2f8a97a662 ./default.cfg
4344942541019c3b5464d508c7f0dd30 ./images/community.applications.png
6e48a62b91bdd066f023f46c6b491afd ./images/discord-azure.svg
@ -10,7 +10,7 @@
8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg
54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg
a67f60711fc505e4d65b2b2e2351bb65 ./include/exec.php
c2ce310c9303a1006bfc04589a596a91 ./include/helpers.php
c241f45282c9c9f5d30cebe280025a7e ./include/helpers.php
3893704ad833c765384c5fcf3147a7f7 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
8c24d585c7dd3ff9ef961bb2c2705711 ./PluginAPI.page
@ -27,6 +27,6 @@ ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh
f9c3f431935fb20801f3fef152dc7b58 ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
02759ea835ee4ce5a051fead96ab9b9b ./scripts/updatePluginSupport.php
824e02626884a428093d978cf15c73d1 ./skins/Narrow/css.php
d0c737674d21617ead6c686be782dae7 ./skins/Narrow/css.php
1668b7fa961aef793fca369a793e7f16 ./skins/Narrow/skin.html
2465c546e8a2eb3afafc1b0558ddfd61 ./skins/Narrow/skin.php
869c819f03853f6fd4046b7bea839e99 ./skins/Narrow/skin.php

5
source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php
View File

@ -553,10 +553,11 @@ function formatTags($leadTemplate) {
$o = tr("Something really went wrong here");
else {
$defaultTag = $template['BranchDefault'] ? $template['BranchDefault'] : "latest";
$o = "<table>";
$o .= "<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a class='appIconsPopUp xmlInstall' data-type='default' data-xml='{$template['Path']}'>Default</a></td><td>".tr("Install Using The Template's Default Tag")." (<span class='ca_bold'>:$defaultTag</span>)</td></tr>";
$o .= "<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a class='appIconsPopUp xmlInstall ca_normal' data-type='default' data-xml='{$template['Path']}'>Default</a></td><td class='appIconsPopUp xml Install ca_normal' data-type='default' data-xml='{$template['Path']}'>".tr("Install Using The Template's Default Tag")." (<span class='ca_bold'>:$defaultTag</span>)</td></tr>";
foreach ($childTemplates as $child) {
$o .= "<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a class='appIconsPopUp xmlInstall' data-type='default' data-xml='{$file[$child]['Path']}'>".$file[$child]['BranchName']."</a></td><td>".$file[$child]['BranchDescription']."</td></tr>";
$o .= "<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><a class='appIconsPopUp xmlInstall ca_normal' data-type='default' data-xml='{$file[$child]['Path']}'>{$file[$child]['BranchName']}</a></td><td class='appIconsPopUp xmlInstall ca_normal' data-type='default' data-xml='{$file[$child]['Path']}'>{$file[$child]['BranchDescription']}</td></tr>";
}
$o .= "</table>";
}

2
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php
View File

@ -303,6 +303,8 @@ a.appIconsPopUp { text-decoration:none;color:inherit;}
.ca_italic {font-style:italic;}
.ca_bold {font-weight:bold;}
.ca_center {margin:auto;text-align:center;}
.ca_large {font-size:2rem;}
.ca_normal {font-size:1.4rem !important;}
p {margin:auto;text-align:left;margin-bottom:10px;} /* override dynamix styling for popup */
h1 {font-size:1.5rem;} /* override dynamix styling for popup */
.ca_NoAppsFound {font-size:3rem;margin:auto;text-align:center;}

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

@ -226,7 +226,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
if ( $selected ) {
$template['InstallPath'] = $template['InstallPath'] ?: $template['Path'];
$template['display_dockerDefaultIcon'] = "<a class='ca_tooltip ca_fa-install appIcons xmlInstall' title='".tr("Click to reinstall the application using default values")."' data-type='default' data-xml='".addslashes($template['Path'])."'></a>";
$template['display_dockerDefaultIcon'] = $template['BranchID'] ? "<a class='ca_tooltip ca_fa-install appIcons' type='button' style='margin:0px' title='".tr("Click to reinstall the application using default values")."' onclick='displayTags(&quot;$ID&quot;);'></a>" : $template['display_dockerDefaultIcon'];
$template['display_dockerDefaultIcon'] = $template['BranchID'] ? "<a class='ca_tooltip ca_fa-install appIcons displayTags' data-id='$ID' type='button' style='margin:0px' title='".tr("Click to reinstall the application using default values")."'></a>" : $template['display_dockerDefaultIcon'];
$template['display_dockerEditIcon'] = "<a class='ca_tooltip appIcons ca_fa-edit xmlInstall' title='".tr("Click to edit the application values")."' data-type='edit' data-xml='".addslashes($info[$name]['template'])."'></a>";
$template['display_dockerReinstallIcon'] = $caSettings['defaultReinstall'] == "true" ? "<a class='ca_tooltip ca_fa-install appIcons xmlInstall' title='".tr("Click to reinstall")."' data-type='default' data-xml='".addslashes($template['Path'])."'></a>" : "";
$template['display_dockerUpdate'] = $template['UpdateAvailable'] ? "<a class='ca_tooltip appIcons ca_fa-update dockerUpdate' data-name='$name' title='".tr("Install The Update")."'></a>" : "";
@ -239,7 +239,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$template['display_dockerReinstallIcon'] = "<a class='ca_tooltip ca_fa-install appIcons xmlInstall' title='".tr("Click to reinstall")."' data-type='user' data-xml='".addslashes($template['InstallPath'])."'></a>";
else {
$template['display_dockerInstallIcon'] = "<a class='ca_tooltip ca_fa-install appIcons xmlInstall' title='".tr("Click to install")."' data-type='default' data-xml='".addslashes($template['Path'])."'></a>";
$template['display_dockerInstallIcon'] = $template['BranchID'] ? "<a style='cursor:pointer' class='ca_tooltip ca_fa-install appIcons' title='".tr("Click to install")."' onclick='displayTags(&quot;$ID&quot;);'></a>" : $template['display_dockerInstallIcon'];
$template['display_dockerInstallIcon'] = $template['BranchID'] ? "<a style='cursor:pointer' class='ca_tooltip ca_fa-install appIcons displayTags' title='".tr("Click to install")."' data-id='$ID'></a>" : $template['display_dockerInstallIcon'];
}
}
}
@ -644,7 +644,7 @@ function getPopupDescriptionSkin($appNumber) {
$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 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;
$installLine .= $template['BranchID'] ? "<div><a style='cursor:pointer' class='appIconsPopUp ca_fa-install displayTags' data-id='{$template['ID']}'> ".tr("Install")."</a></div>" : $install;
}
}
}