mirrors
/
community.applications
mirror of https://github.com/Squidly271/community.applications.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Display template errors on sidebar

pull/11/head
Squidly271 2021-11-10 09:36:07 -05:00
parent 06c0aef2e4
commit a4c2f56d2b
6 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

2
source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page
View File

@ -2095,9 +2095,11 @@ function showSidebarApp(apppath,appname) {
},
callbacks: {
open: function() {
$('body').addClass("dimScreenShot");
closeSidebar();
},
close: function() {
$('body').removeClass("dimScreenShot");
showSidebarApp(data.sidebarapppath,data.sidebarappname);
}
}

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

@ -1,10 +1,10 @@
5af077fe584df9ac650668f8d64b52ec ./Apps.page
78d1be5b5f54ffdef83fa718a765185b ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
7ee0b23dbd92ed55f611360a983f9565 ./ca_settings.page
1b49ec9797713ce869ea0c1066a109f2 ./default.cfg
18ade20ccdeb4bd9429af4fd9eae48f4 ./include/exec.php
b27be72c48168f6df05a3ebb4ab0a210 ./include/helpers.php
cc8b89a7e27b40866770c2ac513e7e3f ./include/paths.php
95709ae0ed53e2889a93849a69b37892 ./include/paths.php
410c0166bae560754e231486050621f6 ./javascript/libraries.js
8c24d585c7dd3ff9ef961bb2c2705711 ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md
@ -20,6 +20,6 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md
09b5297db02076376519d92e2ce76cc6 ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php
038b040dbe3283fc9a9eb4f9eb0d845b ./skins/Narrow/css.php
390fa20f199993bf8d747216aaa60515 ./skins/Narrow/css.php
cfa1511913f794c8c5980460dfcdf049 ./skins/Narrow/skin.html
2b90c86c2661fcd9c3db7d14185a2fb8 ./skins/Narrow/skin.php
7318dd57cb16f7188ac6dc417a740fde ./skins/Narrow/skin.php

1
source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php
View File

@ -66,6 +66,5 @@ $caPaths['info'] = $caPaths['tempFiles']."/info.j
$caPaths['dockerSearchResults'] = $caPaths['tempFiles']."/dockerSearch.json";
$caPaths['dockerSearchInstall'] = $caPaths['tempFiles']."/dockerConvert.xml";
$caPaths['dockerSearchActive'] = $caPaths['tempFiles']."/dockerSearchActive";
$caPaths['VideoStill'] = "https://github.com/Squidly271/community.applications/raw/master/webImages/movie-850.svg";
$caPaths['SpotlightIcon'] = "https://raw.githubusercontent.com/Squidly271/community.applications/master/webImages/Unraid.svg";
?>

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

@ -184,6 +184,7 @@ img.ca_displayIcon{height:8rem;width:8rem;}
a.ca_fa-delete{text-decoration:none;margin-left:1rem;font-size:2rem;margin-top:-0.25rem;cursor:pointer;float:right;}
.ca_fa-docker::before{font-family:'Unraid';content:'\e90b';}
.ca_fa-edit::before {content:"\f044";font-family:fontAwesome;}
.ca_fa-film::before {content:"\f008";font-family:fontAwesome;}
.ca_fa-globe::before {content:"\f0ac";font-family:fontAwesome;}
.ca_fa-info::before {content:"\f05a";font-family:fontAwesome;}
.ca_fa-install::before {content:"\f019";font-family:fontAwesome;}
@ -262,6 +263,7 @@ a.context{text-decoration:none;color:currentColor;margin:5px;}
li.context{margin-top:0.5rem;margin-bottom:0.5rem;font-size:1.5rem;}
li.context:hover{color:<?=$unRaid66color?>;}
li.debugging {cursor:pointer;}
.dimScreenShot{overflow:unset !important;}
.disabledIcon {color:#040404;font-size:2.5rem;}
i.displayIcon {font-size:5.5rem;color:#626868;padding-top:0.25rem;}
img.displayIcon {height:6.4rem;width:6.4rem;border-radius:1rem 1rem 1rem 1rem;}
@ -381,12 +383,12 @@ a.popup-donate:hover {color:<?=$donateText?>;background-color:<?=$unRaid66color?
.repoLinkArea{margin-top:1.5rem;}
.repoRight{text-align:right;}
.rightTitle{font-size:2.5rem;margin-top:2rem;margin-bottom:2rem;}
.screen{border:3px solid; border-radius: 5px 5px 5px 5px; border-color:<?=$unRaid66color?>; vertical-align:top; max-width:10rem;height:10rem;margin:10px;}
.screen{border:1px solid; border-radius: 5px 5px 5px 5px; border-color:<?=$unRaid66color?>; vertical-align:top; min-width:8rem;max-width:12rem;height:8rem;margin:10px;}
.screen:hover{opacity:50%}
.vid{border:3px solid; border-radius: 5px 5px 5px 5px; border-color:<?=$unRaid66color?>; vertical-align:top; max-width:10rem;height:10rem;margin:10px;}
.vid:hover{opacity:50%}
.screenshotText{font-size:2rem;}
.searchArea {z-index:2;width:auto;position:static;}
.vid{display:inline-block;font-size:8rem;position:relative;top:-0.5rem;color:<?=$sidebarText?>;opacity:70%;padding-right:10px;}
.vid:hover{color:<?=$unRaid66color;?>}
/* .screenshotText{font-size:2.5rem;}
*/.searchArea {z-index:2;width:auto;position:static;}
.searchSubmit{font-family:'FontAwesome';width:2rem;min-width:2rem;height:3.4rem;font-size:1.1rem;position:relative;padding-top:1.1rem;padding-bottom:1rem;padding-right:1rem;background:<?=$templateHoverBackground?>;border:none;cursor:pointer;background:<?=$templateHoverBackground?>;}
#searchBox{margin-left:0rem;margin-right:0;margin-bottom:1rem;top:-.6rem;border:none;padding:0.6rem;background:<?=$templateHoverBackground?>;padding-right:0.5rem;}
#searchButton:hover{color:<?=$unRaid66color?>;}
@ -430,6 +432,8 @@ ul.subCategory {list-style-type:none;margin-left:2rem;padding:0px;cursor:pointer
table tbody td {line-height:1.8rem;}
table {background-color:transparent;}
#templates_content {overflow-x:hidden;margin-bottom:3rem;}
.templateErrors{font-size:2.5rem;}
.templateErrorsList{margin-left:3rem;}
.templateSearch{cursor:pointer;font-size:1.5rem;}
.templateSearch:hover{color:<?=$unRaid66color?>;}
.trendingDown::before {content:"\f063";font-family:fontAwesome;}
@ -481,12 +485,12 @@ table {background-color:transparent;}
.mfp-s-error .mfp-content {display: none; }
button.mfp-close,button.mfp-arrow {overflow: visible;cursor: pointer;background: transparent;border: 0;-webkit-appearance: none;display: block;outline: none;padding: 0;z-index: 1046;box-shadow: none;touch-action: manipulation; }
button::-moz-focus-inner {padding: 0;border: 0; }
.mfp-close {cursor:pointer !important;width: fit-content !important;height: 44px;line-height: 44px;position: absolute;right: 0;top: 0;text-decoration: none;text-align: center;opacity: 0.65;padding: 0 0 18px 10px;color: #FFF;font-style: normal;font-size: 2rem;font-family: Arial, Baskerville, monospace; }
.mfp-close {cursor:pointer !important;width: fit-content !important;height: 44px;line-height: 44px;position: absolute;right: 0;top: 0;text-decoration: none;text-align: center;opacity: 0.65;padding: 0 0 18px 10px;color:#f34646;font-style: normal;font-size: 2rem;font-family: Arial, Baskerville, monospace; }
/* .mfp-close:hover,.mfp-close:focus {opacity: 1; } */
.mfp-close:hover {color:<?=$unRaid66color?> !important;}
.mfp-close:active {top: 1px; }
.mfp-close-btn-in .mfp-close {color: #333; }
.mfp-image-holder .mfp-close,.mfp-iframe-holder .mfp-close {color: #FFF;right: -6px;text-align: center;width: 100%; }
.mfp-image-holder .mfp-close,.mfp-iframe-holder .mfp-close {color: #f34646;font-weight:bold;right: -6px;text-align: center;width: 100%; }
.mfp-counter {position: absolute;top: 0;right: 0;color: #CCC;font-size: 12px;line-height: 18px;white-space: nowrap; }
.mfp-arrow {position: absolute;opacity: 0.65;margin: 0;top: 50%;margin-top: -55px;padding: 0;width: 90px;height: 110px;-webkit-tap-highlight-color: transparent; }
.mfp-arrow:active {margin-top: -54px; }

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

@ -1187,7 +1187,7 @@ function displayPopup($template) {
}
if ( $Screenshot || $Photo || $Video) {
$ScreenshotTitle = $Screenshot || $Video ? tr("Screenshots") : tr("Photos");
$card .= "<div><div class='screenshotText'>$ScreenshotTitle</div>";
// $card .= "<div><div class='screenshotText'>$ScreenshotTitle</div>";
if ( $Screenshot || $Photo ) {
$pictures = $Screenshot ? $Screenshot : $Photo;
if ( ! is_array($pictures) )
@ -1202,10 +1202,10 @@ function displayPopup($template) {
$Video = [$Video];
foreach ( $Video as $vid ) {
$card .= "<a class='screenshot mfp-iframe' href='".trim($vid)."'><img class='vid' src='{$caPaths['VideoStill']}'></img></a>";
$card .= "<a class='screenshot mfp-iframe' href='".trim($vid)."'><div class='vid ca_fa-film'></div></a>";
}
}
$card .= "</div>";
// $card .= "</div>";
}
$appType = $Plugin ? tr("Plugin") : tr("Docker");
$appType = $Language ? tr("Language") : $appType;
@ -1277,7 +1277,6 @@ function displayPopup($template) {
}
}
if ( $display_changes ) {
$card .= "
<div class='changelogTitle'>".tr("Change Log")."</div>
@ -1285,6 +1284,15 @@ function displayPopup($template) {
<div class='changelog popup_readmore'>$display_changes</div>
";
}
$moderation = readJsonFile($caPaths['fixedTemplates_txt']);
if ( $moderation[$Repo][$Repository] ) {
$card .= "<div class='templateErrors'>".tr("Template Errors")."</div>";
foreach ($moderation[$Repo][$Repository] as $error) {
$card .= "<li class='templateErrorsList'>$error</li>";
}
}
if ( $Beta ) {
$card .= "
<div class='betaPopupBackground'>