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

Don't allow any actions in case of a feed failure

Browse Source
This commit is contained in:
Squidly271 2021-05-23 08:10:45 -04:00
parent fc390c94a4
commit 945ee228b5
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -168,7 +168,7 @@ $(function(){
// Override the OS switch language function so that CA can save it's current state when switching via the OS
$("#nav-item.LanguageButton").find("a").attr("onclick","CAswitchLanguage('<?=$previousLocale?>')");
$("#title").append("<div class='searchArea'><span id='sortIconArea' style='display:none;'><i class='sortIcons fa fa-sort-alpha-asc enabledIcon ca_staticTips' title='<?tr("Sort By Name Ascending")?>' data-sortBy='Name' data-sortDir='Up'></i><i class='sortIcons fa fa-sort-alpha-desc ca_staticTips' title='<?tr("Sort By Name Descending")?>' data-sortBy='Name' data-sortDir='Down'></i><i class='sortIcons fa fa-sort-numeric-desc ca_staticTips' title='<?tr("Sort By Downloads")?>' data-sortBy='downloads' data-sortDir='Down'></i><i class='sortIcons fa fa-sort-amount-desc ca_staticTips' title='<?tr("Sort By Trend")?>' data-sortBy='trending' data-sortDir='Down'></i><i class='sortIcons fa fa-calendar ca_staticTips' title='<?tr("Sort By Date Added")?>' data-sortBy='FirstSeen' data-sortDir='Down'></i></span><span id='sortIcon' class='fa ca_toolsView disabledIcon'> <span class='fa-sort-alpha-asc'></span></span>&nbsp;<span id='searchFilter' class='status' style='margin-top:-1rem;'><input type='text' id='searchBox' placeholder='<?tr('Search')?>' autofocus><button class='searchSubmit' style='margin-right:10px' onclick='doSearch(true)'><i id='searchButton' class='fa fa-search fa-lg'></i></button></div>");
$("#title").append("<div class='searchArea onlyShowWithFeed'><span id='sortIconArea' style='display:none;'><i class='sortIcons fa fa-sort-alpha-asc enabledIcon ca_staticTips' title='<?tr("Sort By Name Ascending")?>' data-sortBy='Name' data-sortDir='Up'></i><i class='sortIcons fa fa-sort-alpha-desc ca_staticTips' title='<?tr("Sort By Name Descending")?>' data-sortBy='Name' data-sortDir='Down'></i><i class='sortIcons fa fa-sort-numeric-desc ca_staticTips' title='<?tr("Sort By Downloads")?>' data-sortBy='downloads' data-sortDir='Down'></i><i class='sortIcons fa fa-sort-amount-desc ca_staticTips' title='<?tr("Sort By Trend")?>' data-sortBy='trending' data-sortDir='Down'></i><i class='sortIcons fa fa-calendar ca_staticTips' title='<?tr("Sort By Date Added")?>' data-sortBy='FirstSeen' data-sortDir='Down'></i></span><span id='sortIcon' class='fa ca_toolsView disabledIcon'> <span class='fa-sort-alpha-asc'></span></span>&nbsp;<span id='searchFilter' class='status' style='margin-top:-1rem;'><input type='text' id='searchBox' placeholder='<?tr('Search')?>' autofocus><button class='searchSubmit' style='margin-right:10px' onclick='doSearch(true)'><i id='searchButton' class='fa fa-search fa-lg'></i></button></div>");
searchBoxInput = document.getElementById("searchBox");
searchBoxAwesomplete = new Awesomplete(searchBoxInput);

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

@ -1,6 +1,6 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
e36e94f105b4b3ce57e6d6fd29243e32 ./CommunityApps.page
92193e39c529a0a8a2fb7c038a5dc030 ./CommunityApps.page
6db73582f22dab13d329e862067ee84e ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md
1a908064914041c48be7bf0dab77515a ./ca_settings.page
@ -11,12 +11,12 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md
6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg
8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg
54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg
83e99938994e5d45de53ba97d7d7a1c8 ./include/exec.php
344103f5f410c4354f6e3688dd4195df ./include/exec.php
9ee9c5f6f0f3148dd0f97e459ca49e74 ./include/helpers.php
8f1129e0cdb994c6d1900192252433d8 ./include/paths.php
9ba7ea3ef8bad60cb8335da9c0daea4f ./javascript/libraries.js
e605780f0c220d94298c20a6914af598 ./skins/Narrow/css.php
58a140a38ceb6836a5b7c5b9bca85b6c ./skins/Narrow/skin.html
483f8f65bc760215ed59e719bf1e4cb3 ./skins/Narrow/skin.html
bf55e915707fea27c5f80b5588d285a1 ./skins/Narrow/skin.php
38d1f40cbc64eed32cdb3292e1ec1f6e ./scripts/PluginAPI.php
bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php

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

@ -1498,7 +1498,7 @@ function get_categories() {
$categories = readJsonFile($caPaths['categoryList']);
if ( ! is_array($categories) || empty($categories) ) {
$cat = "<span class='ca_fa-warning'></span> Category list N/A<br><br>";
postReturn(['categories'=>$cat]);
postReturn(['categories'=>$cat,'script'=>"$('.onlyShowWithFeed').hide();"]);
return;
} else {
if ($translationsAllowed) {

42
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html
View File

@ -1,31 +1,31 @@
<div id="Category" class="categoryLine ca_italic">&nbsp;</div>
<div class='menuItems'>
<ul class='caMenu'>
<li class='caMenuItem sectionMenu' data-category='installed_apps'><?tr("Installed Apps");?></li>
<ul class='subCategory'>
<li class='caMenuItem sectionMenu' data-category='inst_docker'><?tr("Docker");?></li>
<li class='caMenuItem sectionMenu' data-category='inst_plugins'><?tr("Plugins");?></li>
<ul class='caMenu '>
<li class='caMenuItem sectionMenu onlyShowWithFeed' data-category='installed_apps'><?tr("Installed Apps");?></li>
<ul class='subCategoryonlyShowWithFeed'>
<li class='caMenuItem sectionMenu onlyShowWithFeed' data-category='inst_docker'><?tr("Docker");?></li>
<li class='caMenuItem sectionMenu onlyShowWithFeed' data-category='inst_plugins'><?tr("Plugins");?></li>
</ul>
<li class='caMenuItem sectionMenu' data-category='previous_apps'><?tr("Previous Apps");?></li>
<ul class='subCategory'>
<li class='caMenuItem sectionMenu onlyShowWithFeed' data-category='previous_apps'><?tr("Previous Apps");?></li>
<ul class='subCategory onlyShowWithFeed'>
<li class='caMenuItem sectionMenu' data-category='prev_docker'><?tr("Docker");?></li>
<li class='caMenuItem sectionMenu' data-category='prev_plugins'><?tr("Plugins");?></li>
</ul>
<li class='caMenuItem sectionMenu caPinnedMenu' data-category='pinned_apps'><?tr("Pinned Apps");?></li>
<li class='caMenuItem favouriteRepo'><?tr("Favourite Repo");?></li>
<hr>
<li class='startupButton caMenuItem' data-category='onlynew'><?tr("New Apps");?></li>
<li class='startupButton caMenuItem' data-category='new'><?tr("Updated Apps");?></li>
<li class='startupButton caMenuItem' data-category='random'><?tr("Random Apps");?></li>
<li class='startupButton caMenuItem' data-category='topperforming'><?tr("Top New Installs");?></li>
<li class='startupButton caMenuItem' data-category='trending'><?tr("Trending Apps");?></li>
<hr>
<span id='category_list'></span>
<li class='categoryMenu caMenuItem allApps' data-category='All'><?tr("All Apps");?></li>
<li class='caMenuItem sectionMenu caPinnedMenu onlyShowWithFeed' data-category='pinned_apps'><?tr("Pinned Apps");?></li>
<li class='caMenuItem favouriteRepo onlyShowWithFeed'><?tr("Favourite Repo");?></li>
<hr class='onlyShowWithFeed'>
<li class='startupButton caMenuItem onlyShowWithFeed' data-category='onlynew'><?tr("New Apps");?></li>
<li class='startupButton caMenuItem onlyShowWithFeed' data-category='new'><?tr("Updated Apps");?></li>
<li class='startupButton caMenuItem onlyShowWithFeed' data-category='random'><?tr("Random Apps");?></li>
<li class='startupButton caMenuItem onlyShowWithFeed' data-category='topperforming'><?tr("Top New Installs");?></li>
<li class='startupButton caMenuItem onlyShowWithFeed' data-category='trending'><?tr("Trending Apps");?></li>
<hr class='onlyShowWithFeed'>
<span id='category_list' class='onlyShowWithFeed'></span>
<li class='categoryMenu caMenuItem allApps onlyShowWithFeed' data-category='All'><?tr("All Apps");?></li>
<hr class='category_hr'>
<li class='categoryMenu caMenuItem caRepositoryMenu' data-category='repos'><?tr("Repositories");?></li>
<li class='caMenuItem clearSearch caMenuDisabled'><?tr("Clear Search");?></li>
<hr class='category_hr'>
<li class='categoryMenu caMenuItem caRepositoryMenu onlyShowWithFeed' data-category='repos'><?tr("Repositories");?></li>
<li class='caMenuItem clearSearch caMenuDisabled onlyShowWithFeed'><?tr("Clear Search");?></li>
<hr class='category_hr onlyShowWithFeed'>
<li class='caMenuItem' onclick='window.location="/Apps/ca_settings"'><?tr("Settings");?></a></li>
<li class='caMenuItem statistics' onclick='disableSort();scrollToTop();showStatistics();'><?tr("Statistics");?></li>
<li class='caMenuItem' onclick='disableSort();scrollToTop();showCredits();'><?tr("Credits");?></li>