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

more inline

Browse Source
This commit is contained in:
Squidly271 2021-08-11 09:00:50 -04:00
parent b0763906d0
commit 2e94965ecc
6 changed files with 71 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2021.08.10-x86_64-1.txz
View File

Binary file not shown.

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

Binary file not shown.

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

@ -304,7 +304,6 @@ $(function(){
doSearch(false,repo);
});
$('.favouriteRepo').on("click",function() {
if ( popupVisible(this) ) return;
if ( $(this).hasClass("caMenuDisabled") )
@ -325,6 +324,31 @@ $(function(){
});
});
$('body').on("click",".pluginInstall",function() {
if ( popupVisible(this) ) return;
var plugin = $(this).data("url");
var type = $(this).data("update") ? true : false;
installPlugin(plugin,type);
});
$("body").on("click",".uninstallApp",function() {
if ( popupVisible(this) ) return;
var type = $(this).data("type");
var name = $(this).data("name");
var app = $(this).data("app");
switch (type) {
case "docker":
uninstallDocker(app,name);
break;
case "plugin":
uninstallApp(app,name);
break;
}
});
$('.menuItems').on("click",'.categoryMenu',function() {
if ( popupVisible(this) ) return;
if ( $(this).hasClass("caMenuDisabled") )
@ -457,25 +481,40 @@ $(function(){
});
});
$('.mainArea').on("click",".languageSwitch",function() {
$('body').on("click",".languageSwitch",function() {
if ( popupVisible(this) ) return;
CAswitchLanguage($(this).data("language"));
});
$('.mainArea').on("click",".languageInstall",function() {
$('body').on("click",".languageInstall",function() {
installLanguage($(this).data("language_xml"),$(this).data("language"));
});
$('.mainArea').on("click",".languageRemove",function() {
$('body').on("click",".languageRemove",function() {
if ( popupVisible(this) ) return;
removeLanguage($(this).data("language"));
});
$('.mainArea').on("click",".languageUpdate",function() {
$('body').on("click",".languageUpdate",function() {
if ( popupVisible(this) ) return;
updateLanguage($(this).data("language"));
});
$('body').on("click",".deletePrivateApp",function() {
if ( popupVisible(this) ) return;
var path = $(this).data("path");
var name = $(this).data("name");
var author = $(this).data("author");
deletePrivateApp(path,name,author);
});
$("body").on("click",".removeApp",function() {
if ( popupVisible(this) ) return;
var path = $(this).data("path");
var name = $(this).data("name");
removeApp(path,name);
});
<?if ( version_compare($unRaidSettings['version'],"6.9.0-beta38","<") ):?>
$('.mainArea').on("mouseover",".ca_discord",function() {
$(this).attr("src","/plugins/community.applications/images/discord-hover.svg");
@ -974,10 +1013,7 @@ function popupVisible(el) {
return $(".popupHolder").is(":visible");
}
function installPlugin(pluginURL,popup=false,update=false) {
if ( ! popup)
if ( popupVisible() )
return;
function installPlugin(pluginURL,update=false) {
type = update ? "update" : "install";
title = update ? "<?tr("Update Plugin")?>" : "<?tr("Install Plugin")?>";
$(".tooltipstered").tooltipster("hide");
@ -1036,7 +1072,7 @@ function removeApp(application, humanName) {
disableSearch();
swal({
title: "<?tr("Delete Template?")?>",
text: sprintf(tr("Are you sure you want to delete %s from the list of previously installed applications?"),"<font color='red'><strong><span class='ca_italic'>"+humanName+"</span></strong></font>")+"<br><font size='0'>"+application+"</font>",
text: sprintf(tr("Are you sure you want to delete %s from the list of previously installed applications?"),"<span class='ca_italic ca_bold caHighlight'>"+humanName+"</span>")+"<br><font size='0'>"+application+"</font>",
type: "warning",
confirmButtonText: "<?tr("Yes, delete it!")?>",
cancelButtonText: "<?tr("Cancel")?>",
@ -1062,7 +1098,7 @@ function uninstallApp(application,humanName) {
disableSearch();
swal({
title: "<?tr("Uninstall Application?")?>",
text: sprintf(tr("Are you sure you want to uninstall %s?"),"<font color='red'><strong><span class='ca_italic'>"+humanName+"</span></strong></font>"),
text: sprintf(tr("Are you sure you want to uninstall %s?"),"<span class='ca_italic ca_bold caHighlight'>"+humanName+"</span>"),
type: "warning",
showCancelButton: true,
showConfirmButton: true,
@ -1100,7 +1136,7 @@ function deletePrivateApp(path,name,author) {
disableSearch();
swal({
title: "<?tr("Remove Private Application?")?>",
text: sprintf(tr("Are you sure you want to remove the private application %s by %s?"),"<span class='ca_italic'><font color='red'><span class='ca_bold'>"+name+"</span></font>","<font color='red'><span class='ca_bold'>"+author+"</span></font>")+"<br><font size='0'>("+displayPath+")",
text: sprintf(tr("Are you sure you want to remove the private application %s by %s?"),"<span class='ca_italic'><span class='ca_bold caHighlight'>"+name+"</span>","<span class='ca_bold caHighlight'>"+author+"</span>")+"<br><font size='0'>("+displayPath+")",
type: "warning",
showCancelButton: true,
showConfirmButton: true,
@ -1129,7 +1165,7 @@ function uninstallDocker(application,humanName) {
disableSearch();
swal({
title: "<?tr("Uninstall Application?")?>",
text: sprintf(tr("Are you sure you want to uninstall %s?"),"<font color='red'><strong><span class='ca_italic'>"+humanName+"</span></strong></font>"),
text: sprintf(tr("Are you sure you want to uninstall %s?"),"<span class='ca_italic ca_bold caHighlight'>"+humanName+"</span>"),
type: "warning",
showCancelButton: true,
showConfirmButton: true,
@ -1337,7 +1373,7 @@ function deleteMulti() {
var selected = getSelectedApps();
swal({
title: "<?tr("Delete Template?")?>",
text: sprintf(tr("Are you sure you want to delete %s applications from the previously installed list?"),"<font color='red'><strong>"+selected.deletePaths.length+"</strong></font>"),
text: sprintf(tr("Are you sure you want to delete %s applications from the previously installed list?"),"<span class='caHighlight ca_bold'>"+selected.deletePaths.length+"</span>"),
type: "warning",
confirmButtonText: "<?tr("Delete")?>",
cancelButtonText: "<?tr("Cancel")?>",
@ -1396,7 +1432,7 @@ function installMulti() {
}
var text = sprintf(tr("Are you sure you want to install %s docker and %s plugin application(s)?"),dockerCount,pluginCount);
text = text.concat(dockerCount ? "<br><span class='ca_italic'><?tr("Docker applications will be installed utilizing the most recently saved template with no user input on your part")?></span>" : "");
text = text.concat(cookieWarning ? "<br><font color='red'>"+cookieWarning+"</font>" : "");
text = text.concat(cookieWarning ? "<br><span class='caHighlight>"+cookieWarning+"</span>" : "");
swal({
title: dockerCount+pluginCount > 1 ? tr("Install Applications") : tr("Install Application"),
text: text,
@ -1790,8 +1826,7 @@ function CAswitchLanguage(language) {
window.location.reload();
});
}
function installLanguage(languageURL,language,popup=false) {
if ( ! popup && popupVisible() ) return;
function installLanguage(languageURL,language) {
$(".tooltipstered").tooltipster("hide");
disableSearch();

6
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
0b04c5fa156cf14d7db3695a03cc44c9 ./CommunityApps.page
71d9d6c1f50d8b7301cc9b36c76b3b36 ./CommunityApps.page
7c88ace586933a4a60b0ef2f8a97a662 ./default.cfg
4344942541019c3b5464d508c7f0dd30 ./images/community.applications.png
6e48a62b91bdd066f023f46c6b491afd ./images/discord-azure.svg
@ -9,7 +9,7 @@
6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg
8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg
54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg
c3da3edf0e6eb1970f962c6fab2be134 ./include/exec.php
a67f60711fc505e4d65b2b2e2351bb65 ./include/exec.php
c2ce310c9303a1006bfc04589a596a91 ./include/helpers.php
3893704ad833c765384c5fcf3147a7f7 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
@ -29,4 +29,4 @@ f9c3f431935fb20801f3fef152dc7b58 ./scripts/showStatistics.php
02759ea835ee4ce5a051fead96ab9b9b ./scripts/updatePluginSupport.php
4e97f00c3f0a52603239b00acf890990 ./skins/Narrow/css.php
1668b7fa961aef793fca369a793e7f16 ./skins/Narrow/skin.html
e6e3dd4b0f35c2f1374af23096fd5e89 ./skins/Narrow/skin.php
2465c546e8a2eb3afafc1b0558ddfd61 ./skins/Narrow/skin.php

6
source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
View File

@ -236,9 +236,7 @@ function DownloadApplicationFeed() {
if ( $o['Language'] ) {
$o['Category'] = "Language:";
$o['Compatible'] = true;
// $o['Description'] = str_replace(" - ","<br>",trim($o['Description'])); // temp fix since this undoes a change feed makes. Don't make this change in the feed in the future.
}
// above doesn't work properly with <br>'s being present when set to the overflow thingy
# Move the appropriate stuff over into a CA data file
$o['ID'] = $i;
@ -1014,8 +1012,8 @@ function previous_apps() {
if ( !$filter || $filter == "docker" ) {
foreach ($all_files as $xmlfile) {
$o = readXmlFile($xmlfile);
$o['Description'] = fixDescription($o['Description']);
$o['Overview'] = fixDescription($o['Overview']);
$o['CardDescription'] = $o['Overview'];
$o['InstallPath'] = $xmlfile;
$o['UnknownCompatible'] = true;
@ -1079,8 +1077,8 @@ function previous_apps() {
foreach ($all_files as $xmlfile) {
$o = readXmlFile($xmlfile);
if ( ! $o ) continue;
$o['Description'] = fixDescription($o['Description']);
$o['Overview'] = fixDescription($o['Overview']);
$o['CardDescription'] = $o['Overview'];
$o['InstallPath'] = $xmlfile;
$o['UnknownCompatible'] = true;
$o['Removable'] = true;

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

@ -174,7 +174,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$template['display_favouriteButton'] = "<span class='appIcons ca_tooltip $favClass ca_fav' data-repository='".htmlentities($template['RepoName'],ENT_QUOTES)."' title='$favMsg'></span>";
}
$template['display_ModeratorComment'] .= $template['ModeratorComment'] ? "</span></strong><font color='purple'>{$template['ModeratorComment']}</font>" : "";
$template['display_ModeratorComment'] .= $template['ModeratorComment'] ? "<font color='purple'>{$template['ModeratorComment']}</font>" : "";
if ( $pinnedApps["{$template['Repository']}&{$template['SortName']}"] ) {
$pinned = "pinned";
@ -188,14 +188,14 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
unset($template['display_pinButton']);
if ( $template['Uninstall'] && $template['Name'] != "Community Applications" ) {
$template['display_Uninstall'] = "<a class='ca_tooltip ca_fa-delete' title='".tr("Uninstall Application")."' ";
$template['display_Uninstall'] .= ( $template['Plugin'] ) ? "onclick='uninstallApp(&quot;{$template['InstallPath']}&quot;,&quot;{$template['Name']}&quot;);'>" : "onclick='uninstallDocker(&quot;{$info[$name]['template']}&quot;,&quot;{$template['Name']}&quot;);'>";
$template['display_Uninstall'] = "<a class='ca_tooltip ca_fa-delete uninstallApp' title='".tr("Uninstall Application")."' ";
$template['display_Uninstall'] .= ( $template['Plugin'] ) ? "data-type='plugin' data-app='{$template['InstallPath']}' data-name='{$template['Name']}'>" : "data-type='docker' data-app='{$info[$name]['template']}' data-name='{$template['Name']}'>";
$template['display_Uninstall'] .= "</a>";
} else {
if ( $template['Private'] == "true" )
$template['display_Uninstall'] = "<a class='ca_tooltip ca_fa-delete' title='".tr("Remove Private Application")."' onclick='deletePrivateApp(&quot;{$template['Path']}&quot;,&quot;{$template['SortName']}&quot;,&quot;{$template['SortAuthor']}&quot;);'></a>";
$template['display_Uninstall'] = "<a class='ca_tooltip ca_fa-delete deletePrivateApp' title='".tr("Remove Private Application")."' data-path='{$template['Path']}' data-name='{$template['SortName']}' data-author='{$template['SortAuthor']}'></a>";
}
$template['display_removable'] = $template['Removable'] && ! $selected ? "<a class='ca_tooltip ca_fa-delete' title='".tr("Remove Application From List")."' onclick='removeApp(&quot;{$template['InstallPath']}&quot;,&quot;{$template['Name']}&quot;);'></a>" : "";
$template['display_removable'] = $template['Removable'] && ! $selected ? "<a class='ca_tooltip ca_fa-delete removeApp' title='".tr("Remove Application From List")."' data-path='{$template['InstallPath']}' data-name='{$template['Name']}'></a>" : "";
if ( $template['display_Uninstall'] && $template['display_removable'] )
unset($template['display_Uninstall']); # prevent previously installed private apps from having 2 x's in previous apps section
@ -216,10 +216,10 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
unset($template['display_multi_install']);
unset($template['display_removable']);
} else {
$template['display_pluginInstallIcon'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-install appIcons' title='".tr("Install plugin")."' onclick=installPlugin('{$template['PluginURL']}');></a>";
$template['display_pluginInstallIcon'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-install appIcons pluginInstall' title='".tr("Install plugin")."' data-url='{$template['PluginURL']}';></a>";
}
if ( $template['UpdateAvailable'] ) {
$template['display_pluginUpdate'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-update appIcons updatePlugin' title='".tr("Install The Update")."' onclick=installPlugin('$pluginName',false,true);></a>";
$template['display_pluginUpdate'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-update appIcons pluginInstall' title='".tr("Install The Update")."' data-url='$pluginName' data-update='true';></a>";
}
} else {
if ( $caSettings['dockerRunning'] ) {
@ -652,7 +652,7 @@ function getPopupDescriptionSkin($appNumber) {
if ( file_exists("/var/log/plugins/$pluginName") ) {
if ( plugin("version","/var/log/plugins/$pluginName") != plugin("version",$caPaths['pluginTempDownload']) ) {
copy($caPaths['pluginTempDownload'],"/tmp/plugins/$pluginName");
$installLine .= "<div><a class='appIconsPopUp ca_fa-update' onclick='installPlugin(&quot;$pluginName&quot;,true,true);'> ".tr("Update")."</a></div>";
$installLine .= "<div><a class='appIconsPopUp ca_fa-update pluginInstall' data-url='$pluginName' data-update='true'> ".tr("Update")."</a></div>";
}
}
if ( file_exists("/var/log/plugins/$pluginName") ) {
@ -661,7 +661,7 @@ function getPopupDescriptionSkin($appNumber) {
$installLine .= "<div><a class='appIconsPopUp ca_fa-pluginSettings' href='/Apps/$pluginSettings' target='$tabMode'> ".tr("Settings")."</a></div>";
} else {
$buttonTitle = $template['InstallPath'] ? tr("Reinstall") : tr("Install");
$installLine .= "<div><a style='cursor:pointer' class='appIconsPopUp ca_fa-install pluginInstall' onclick=installPlugin('{$template['PluginURL']}',true);> $buttonTitle</a></div>";
$installLine .= "<div><a style='cursor:pointer' class='appIconsPopUp ca_fa-install pluginInstall' data-url='{$template['PluginURL']}'> $buttonTitle</a></div>";
}
}
}
@ -677,14 +677,14 @@ function getPopupDescriptionSkin($appNumber) {
$currentLanguage = (is_dir("/usr/local/emhttp/languages/$currentLanguage") ) ? $currentLanguage : "en_US";
if ( in_array($countryCode,$installedLanguages) ) {
if ( $currentLanguage != $countryCode ) {
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-switchto' onclick=CAswitchLanguage('$countryCode');> {$template['SwitchLanguage']}</a></div>";
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-switchto languageSwitch' data-language='$countryCode'> {$template['SwitchLanguage']}</a></div>";
}
} else {
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-install languageInstall' onclick='installLanguage(&quot;{$template['TemplateURL']}&quot;,&quot;$countryCode&quot;,true);'> {$template['InstallLanguage']}</a></div>";
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-install languageInstall' data-language_xml='{$template['TemplateURL']}' data-language='$countryCode'> {$template['InstallLanguage']}</a></div>";
}
if ( file_exists("/var/log/plugins/lang-$countryCode.xml") ) {
if ( languageCheck($template) ) {
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-update languageInstall' onclick=updateLanguage('$countryCode');> {$template['UpdateLanguage']}</a></div>";
$installLine .= "<div><a class='ca_tooltip appIconsPopUp ca_fa-update languageUpdate' data-language='$countryCode'> {$template['UpdateLanguage']}</a></div>";
}
}
if ( $countryCode !== "en_US" ) {
@ -696,8 +696,8 @@ function getPopupDescriptionSkin($appNumber) {
if ( $template['Support'] || $template['Project'] ) {
$supportText = $template['SupportLanguage'] ?: tr("Support");
$installLine .= $template['Support'] ? "<div><a class='appIconsPopUp ca_fa-support' href='{$template['Support']}' target='_blank'> $supportText</strong></a></div>" : "";
$installLine .= $template['Project'] ? "<div><a class='appIconsPopUp ca_fa-project' href='{$template['Project']}' target='_blank'> ".tr("Project")."</strong></a></div>" : "";
$installLine .= $template['Support'] ? "<div><a class='appIconsPopUp ca_fa-support' href='{$template['Support']}' target='_blank'> $supportText</a></div>" : "";
$installLine .= $template['Project'] ? "<div><a class='appIconsPopUp ca_fa-project' href='{$template['Project']}' target='_blank'> ".tr("Project")."</a></div>" : "";
}
$installLine .= "<div><a class='appIconsPopUp ca_repository' onclick='showRepo(this);' data-appid='{$template['ID']}'> ".tr("Profile")."</a></div>";
$installLine .= "</div>";