diff --git a/archive/community.applications-2021.06.11-x86_64-1.txz b/archive/community.applications-2021.06.11-x86_64-1.txz new file mode 100644 index 00000000..acc6e0d7 Binary files /dev/null and b/archive/community.applications-2021.06.11-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 6ea9639b..53db23c0 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 @@ -11,13 +11,13 @@ a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page 6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg 8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg 54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg -84ea299cecf582c96f637d8657148831 ./include/exec.php +ba7e6456556f29f6e8fa0ade0dcadd30 ./include/exec.php d7f50413cbaac1c6cb9ceaaef48f270a ./include/helpers.php 8f1129e0cdb994c6d1900192252433d8 ./include/paths.php eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js -4799ad5cd2aa76e01d0634df9178f0d7 ./skins/Narrow/css.php +83889732fae782879bd3bc9406c3fc25 ./skins/Narrow/css.php 944beab17894885ed9ae22db3920a054 ./skins/Narrow/skin.html -d975e0703c7a5ded05c77632da3dbdb1 ./skins/Narrow/skin.php +803c7bb7182371831f27dea9ebcfeddb ./skins/Narrow/skin.php 38d1f40cbc64eed32cdb3292e1ec1f6e ./scripts/PluginAPI.php bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh @@ -25,6 +25,6 @@ ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh 5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh 729c178196af99c94116246f0c8be7a5 ./scripts/notices.php 1efbd780e8ead27a768d1631fb51150c ./scripts/pluginInstall.sh -10e9f1a136907d8df1c46f1669831db8 ./scripts/showStatistics.php +f9c3f431935fb20801f3fef152dc7b58 ./scripts/showStatistics.php 4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh 02759ea835ee4ce5a051fead96ab9b9b ./scripts/updatePluginSupport.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 934a694a..69e86739 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 @@ -1393,17 +1393,17 @@ function statistics() { $o .= "".tr("Number Of Docker Applications")."{$statistics['docker']}"; $o .= "".tr("Number Of Plugin Applications")."{$statistics['plugin']}"; $o .= "".tr("Number Of Templates")."{$statistics['totalApplications']}"; - $o .= "".tr("Number Of Repositories")."{$statistics['repositories']}"; + $o .= "".tr("Number Of Repositories")."{$statistics['repositories']}"; if ($statistics['private']) { - $o .= "".tr("Number Of Private Docker Applications")."{$statistics['private']}"; + $o .= "".tr("Number Of Private Docker Applications")."{$statistics['private']}"; } - $o .= "".tr("Number Of Invalid Templates")."{$statistics['invalidXML']}"; - $o .= "".tr("Number Of Template Errors")."{$statistics['caFixed']}+"; - $o .= "".tr("Number Of Blacklisted Apps")."{$statistics['blacklist']}"; - $o .= "".tr("Number Of Incompatible Applications")."{$statistics['totalIncompatible']}"; - $o .= "".tr("Number Of Deprecated Applications")."{$statistics['totalDeprecated']}"; - $o .= "".tr("Number Of Moderation Entries")."{$statistics['totalModeration']}+"; - $o .= "".tr("Primary Server")." / ".tr("Backup Server").""; + $o .= "".tr("Number Of Invalid Templates")."{$statistics['invalidXML']}"; + $o .= "".tr("Number Of Template Errors")."{$statistics['caFixed']}+"; + $o .= "".tr("Number Of Blacklisted Apps")."{$statistics['blacklist']}"; + $o .= "".tr("Number Of Incompatible Applications")."{$statistics['totalIncompatible']}"; + $o .= "".tr("Number Of Deprecated Applications")."{$statistics['totalDeprecated']}"; + $o .= "".tr("Number Of Moderation Entries")."{$statistics['totalModeration']}+"; + $o .= "".tr("Primary Server")." / ".tr("Backup Server").""; $o .= ""; $o .= "
".tr("Application Policy")."
"; diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/showStatistics.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/showStatistics.php index a222b75b..ff1769cf 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/showStatistics.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/showStatistics.php @@ -60,7 +60,7 @@ switch ($_GET['arg1']) { ksort($repos,SORT_FLAG_CASE | SORT_NATURAL); echo ""; foreach (array_keys($repos) as $repo) { - echo ""; + echo ""; } echo "
$repo{$repos[$repo]}
$repo{$repos[$repo]}
"; break; diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php index 5d0fb30d..0199215b 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/css.php @@ -88,6 +88,7 @@ switch ($theme) { } ?> .tooltipster-box{background:!important} +.modComment {color:#d67777;} a {color:;} .tooltipster-content{color:!important} body.stop-scrolling{height:70%;overflow:inherit;} /* disable SweetAlert killing the scroll bar ( stops the wiggle ) */ @@ -165,13 +166,10 @@ table tbody td {line-height:1.8rem;} .ca_highlight {color:#0e5d08;font-weight:bold;} .ca_description {color:#505E6F;} .cardDescription {cursor:pointer;} +.cardDescription:hover {color: !important;} a.ca_appPopup {text-decoration:none;cursor:pointer;} .ca_repoPopup {text-decoration:none!important;cursor:pointer;color:inherit;} a.ca_repoPopup:hover {color:;} -a.ca_reporeadmore {cursor:pointer;text-decoration:none;} -a.ca_appreadmore {cursor:pointer;text-decoration:none;} -a.ca_reporeadmore:hover {color:;} -a.ca_appreadmore:hover {color:;} .ca_href {cursor:pointer;} input[type=checkbox] {width:2rem;height:2rem;margin-right:1rem;margin-top:-.5rem;margin-left:0rem;} .enabledIcon {cursor:pointer;color:;} 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 af28871e..5a1cbb6b 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 @@ -296,9 +296,6 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) } } -/* if ( endsWith($template['CardDescription'],"...") ) { - $template['CardDescription'] .= " ".tr("Read more").""; - } */ $template['display_dockerName'] = ""; $template['display_dockerName'] .= $template['Name_highlighted'] ?: $template['Name']; $template['display_dockerName'] .= ""; @@ -696,7 +693,7 @@ function getPopupDescriptionSkin($appNumber) { $templateDescription .= " "; $templateDescription .= ""; - $templateDescription .= ($template['Private'] == "true") ? "Private Repository" : ""; + $templateDescription .= ($template['Private'] == "true") ? "Private Repository" : ""; $templateDescription .= ( $dockerVars['DOCKER_AUTHORING_MODE'] == "yes" && $template['TemplateURL']) ? "".tr("Application Template")."" : ""; if ( $template['Category'] ) { $templateDescription .= "".tr("Categories:")."".$template['Category']; @@ -772,7 +769,7 @@ function getPopupDescriptionSkin($appNumber) { $templateDescription .= "
  ".tr("Another browser tab or device has updated the displayed templates. Some actions are not available")."
"; - $templateDescription .= $template['ModeratorComment'] ? "

".tr("Moderator Comments:")." ".$template['ModeratorComment'] : ""; + $templateDescription .= $template['ModeratorComment'] ? "

".tr("Moderator Comments:")." ".$template['ModeratorComment'] : ""; $templateDescription .= "


"; @@ -814,7 +811,7 @@ function getPopupDescriptionSkin($appNumber) { copy($caPaths['pluginTempDownload'],"/tmp/plugins/$pluginName"); $appInformation .= " - ".tr("Install The Update").""; } else - $appInformation .= " - ".tr("Latest Version").""; + $appInformation .= " - ".tr("Latest Version").""; } $appInformation .= Markdown($template['Changes']); } elseif ($template['Language']) {