mirrors/community.applications
1
0
Fork 0
mirror of https://github.com/Squidly271/community.applications.git synced 2025-06-03 14:52:13 +08:00
Code Issues Projects Releases Wiki Activity

Remove skin with no descriptions

Browse Source
This commit is contained in:
Squidly271 2021-12-06 19:02:43 -05:00
parent 23dde981d4
commit 09fbb34af0
4 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -2,7 +2,7 @@ aab3481fc0356a16dbac7022781880f3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
7ee0b23dbd92ed55f611360a983f9565 ./ca_settings.page
1b49ec9797713ce869ea0c1066a109f2 ./default.cfg
b84098319347b813b87f50722e33b10c ./include/exec.php
f70e90c67290e43ed60d228a5dc7c0d3 ./include/exec.php
b6920c2d8b2ea81a4dabbd935b93895e ./include/helpers.php
95709ae0ed53e2889a93849a69b37892 ./include/paths.php
410c0166bae560754e231486050621f6 ./javascript/libraries.js
@ -22,4 +22,4 @@ e3dc9ed23036a09d69d5cd5c3111751e ./scripts/showStatistics.php
2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php
a8900ea90ba3a4937a4648ae92f9e848 ./skins/Narrow/css.php
cfa1511913f794c8c5980460dfcdf049 ./skins/Narrow/skin.html
e2290f61f2a45efd36d5efaa27528569 ./skins/Narrow/skin.php
37dc71da8b07799676e29d7a6c6bf484 ./skins/Narrow/skin.php

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

@ -415,7 +415,7 @@ function getConvertedTemplates() {
function appOfDay($file) {
global $caPaths,$caSettings,$sortOrder;
$max = $caSettings['descriptions'] == "yes" ? 7 : 10;
$max = 7;
switch ($caSettings['startup']) {
case "random":
@ -709,9 +709,7 @@ function get_content() {
if ( $type['cat'] )
$o['display'] .= "<span class='homeMore' data-des='{$type['text1']}' data-category='{$type['cat']}' data-sortby='{$type['sortby']}' data-sortdir='{$type['sortdir']}'>".tr("SHOW MORE");
$o['display'] .= "</div>";
$homeClass = $type['type'] == "spotlight" ? "caHomeSpotlight" : "";
if ( $caSettings['descriptions'] == "yes" )
$homeClass = "caHomeSpotlight";
$homeClass = "caHomeSpotlight";
$o['display'] .= "<div class='ca_homeTemplates $homeClass'>".my_display_apps($display,"1")."</div>";
$o['script'] = "$('#templateSortButtons,#sortButtons').hide();$('.ca_holder').addClass('mobileHolderFix');";

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

@ -34,14 +34,11 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) {
$caSettings['dockerRunning'] = "true";
// $info = $DockerTemplates->getAllInfo();
$info = getAllInfo();
//$dockerRunning = $DockerClient->getDockerContainers();
$dockerUpdateStatus = readJsonFile($caPaths['dockerUpdateStatus']);
} else {
unset($caSettings['dockerRunning']);
$info = array();
// $dockerRunning = array();
$dockerUpdateStatus = array();
}
@ -836,7 +833,6 @@ function displaySearchResults($pageNumber) {
$num_pages = $tempFile['num_pages'];
$file = $tempFile['results'];
$templates = readJsonFile($caPaths['community-templates-info']);
$caSettings['descriptions'] = "yes";
$ct = "<div>".tr("NOTE You must visit the dockerHub page to gather the information required to install correctly")."<span class='templateSearch' style='float:right'>Show CA templates</span></div><br><br>";
$ct .= "<div class='ca_templatesDisplay'>";
@ -876,8 +872,7 @@ function displayCard($template) {
extract($template);
if ( $caSettings['descriptions'] == "yes" )
$class="spotlightHome";
$class = "spotlightHome";
$appType = $Plugin ? "appPlugin" : "appDocker";
$appType = $Language ? "appLanguage": $appType;
@ -949,7 +944,7 @@ function displayCard($template) {
$display_repoName = str_replace("' Repository","",str_replace("'s Repository","",$display_repoName));
$bottomClass = $class ? "ca_bottomLineSpotLight" : "";
$bottomClass = "ca_bottomLineSpotLight";
if ( $DockerHub ) {
$backgroundClickable = "dockerCardBackground";
$card .= "
@ -971,13 +966,11 @@ function displayCard($template) {
<div class='supportButton supportButtonCardContext' id='support".preg_replace("/[^a-zA-Z0-9]+/", "",$Name)."$ID' data-context='".json_encode($supportContext)."'>".tr("Support")."</div>
";
if ( $class == "spotlightHome" ) {
if ( $actionsContext ) {
if ( count($actionsContext) == 1)
$card .= "<div class='actionsButton' onclick={$actionsContext[0]['action']}>{$actionsContext[0]['text']}</div>";
else
$card .= "<div class='actionsButton actionsButtonContext' id='actions".preg_replace("/[^a-zA-Z0-9]+/", "",$Name)."$ID' data-context='".json_encode($actionsContext,JSON_HEX_QUOT | JSON_HEX_APOS)."'>".tr("Actions")."</div>";
}
if ( $actionsContext ) {
if ( count($actionsContext) == 1)
$card .= "<div class='actionsButton' onclick={$actionsContext[0]['action']}>{$actionsContext[0]['text']}</div>";
else
$card .= "<div class='actionsButton actionsButtonContext' id='actions".preg_replace("/[^a-zA-Z0-9]+/", "",$Name)."$ID' data-context='".json_encode($actionsContext,JSON_HEX_QUOT | JSON_HEX_APOS)."'>".tr("Actions")."</div>";
}
$card .= "<span class='$appType' title='".htmlentities($typeTitle)."'></span>";
@ -1046,30 +1039,28 @@ function displayCard($template) {
$card .= "
</div>
";
if ( $class=='spotlightHome' ) {
$Overview = $Overview ?: $Description;
$ovr = html_entity_decode($Overview);
$ovr = trim($ovr);
$ovr = str_replace(["[","]"],["<",">"],$ovr);
$ovr = str_replace("\n","<br>",$ovr);
$ovr = str_replace(" ","&nbsp;&nbsp;&nbsp;&nbsp;",$ovr);
$ovr = markdown(strip_tags($ovr,"<br>"));
$Overview = $Overview ?: $Description;
$ovr = html_entity_decode($Overview);
$ovr = trim($ovr);
$ovr = str_replace(["[","]"],["<",">"],$ovr);
$ovr = str_replace("\n","<br>",$ovr);
$ovr = str_replace("\n","<br>",$ovr);
# $Overview = explode("<br>",$ovr)[0];
$Overview = str_replace("<br>"," ",$ovr);
$descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription";
$card .= "<div class='$descClass $backgroundClickable' data-apppath='$Path' data-appname='$Name' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'><div class='cardDesc'>$Overview</div></div>";
if ( $RecommendedDate ) {
$card .= "
<div class='homespotlightIconArea ca_center' data-apppath='$Path' data-appname='$Name' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'>
<div><img class='spotlightIcon' src='{$caPaths['SpotlightIcon']}'></img></div>
<div class='spotlightDate'>".tr(date("M Y",$RecommendedDate),0)."</div>
</div>
";
}
$ovr = str_replace(" ","&nbsp;&nbsp;&nbsp;&nbsp;",$ovr);
$ovr = markdown(strip_tags($ovr,"<br>"));
$ovr = str_replace("\n","<br>",$ovr);
$Overview = str_replace("<br>"," ",$ovr);
$descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription";
$card .= "<div class='$descClass $backgroundClickable' data-apppath='$Path' data-appname='$Name' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'><div class='cardDesc'>$Overview</div></div>";
if ( $RecommendedDate ) {
$card .= "
<div class='homespotlightIconArea ca_center' data-apppath='$Path' data-appname='$Name' data-repository='".htmlentities($RepoName,ENT_QUOTES)."'>
<div><img class='spotlightIcon' src='{$caPaths['SpotlightIcon']}'></img></div>
<div class='spotlightDate'>".tr(date("M Y",$RecommendedDate),0)."</div>
</div>
";
}
$card .= "</div>";
if ( $Installed || $Uninstall) {