Don't artificially cut off dockerHub descriptions at 240 chars
Fix edge case on previous apps when select all is pressed followed by a single manual install
Relocate Clear Search to something more logical
Only show Drivers watermark if its a plugin
Allow updates to apps from within popup
pull/11/head
Squidly271 2021-07-31 09:56:09 -04:00
parent adc40ae980
commit 477dd5363c
7 changed files with 17 additions and 15 deletions

View File

@ -1532,6 +1532,7 @@ function restoreState() {
}); });
}); });
populateAutoComplete(); populateAutoComplete();
clearMultiInstall();
} }
function disableSearch() { function disableSearch() {

View File

@ -1,6 +1,6 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page 767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
ecb6bd9538b889f2614b18ada6ac3a17 ./CommunityApps.page 09029539a3780927f0a37aede9d57a16 ./CommunityApps.page
8c24d585c7dd3ff9ef961bb2c2705711 ./PluginAPI.page 8c24d585c7dd3ff9ef961bb2c2705711 ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md b398273cf7daa62ab00d2de2336ca25f ./README.md
2cdb7da0d67a11278ada7fd029707738 ./ca_settings.page 2cdb7da0d67a11278ada7fd029707738 ./ca_settings.page
@ -11,13 +11,13 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md
6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg 6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg
8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg 8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg
54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg 54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg
b8650e814e9ad8f6e9c65076489980e7 ./include/exec.php ce58643666305cd071a0a159da8466d6 ./include/exec.php
06b55b88a6ed1834a15c7fd72b2c819d ./include/helpers.php 06b55b88a6ed1834a15c7fd72b2c819d ./include/helpers.php
3893704ad833c765384c5fcf3147a7f7 ./include/paths.php 3893704ad833c765384c5fcf3147a7f7 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
4e97f00c3f0a52603239b00acf890990 ./skins/Narrow/css.php 4e97f00c3f0a52603239b00acf890990 ./skins/Narrow/css.php
e7bf62923b2d7109b6848554701e12f6 ./skins/Narrow/skin.html 1668b7fa961aef793fca369a793e7f16 ./skins/Narrow/skin.html
6ec09baee0cd11c2685184e5648feb8f ./skins/Narrow/skin.php c59d799bdc620da06500b8d59700f878 ./skins/Narrow/skin.php
430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php 430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php
bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php
ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh

View File

@ -941,7 +941,7 @@ function search_dockerhub() {
$o['Author'] = $details[0]; $o['Author'] = $details[0];
$o['Name'] = $details[1]; $o['Name'] = $details[1];
$o['Description'] = $result['description']; $o['Description'] = $result['description'];
$o['CardDescription'] = (strlen($o['Description']) > 240) ? substr($o['Description'],0,240)." ..." : $o['Description']; $o['CardDescription'] = $o['Description'];
$o['Automated'] = $result['is_automated']; $o['Automated'] = $result['is_automated'];
$o['Stars'] = $result['star_count']; $o['Stars'] = $result['star_count'];
$o['Official'] = $result['is_official']; $o['Official'] = $result['is_official'];

View File

@ -1,6 +1,8 @@
<div id="Category" class="categoryLine ca_italic">&nbsp;</div> <div id="Category" class="categoryLine ca_italic">&nbsp;</div>
<div class='menuItems'> <div class='menuItems'>
<ul class='caMenu '> <ul class='caMenu '>
<li class='caMenuItem clearSearch caMenuDisabled onlyShowWithFeed'><?tr("Clear Search");?></li>
<hr class='category_hr'>
<li class='caMenuItem sectionMenu onlyShowWithFeed' data-category='installed_apps'><?tr("Installed Apps");?></li> <li class='caMenuItem sectionMenu onlyShowWithFeed' data-category='installed_apps'><?tr("Installed Apps");?></li>
<ul class='subCategory onlyShowWithFeed'> <ul class='subCategory onlyShowWithFeed'>
<li class='caMenuItem sectionMenu onlyShowWithFeed dockerSpecific' data-category='inst_docker'><?tr("Docker");?></li> <li class='caMenuItem sectionMenu onlyShowWithFeed dockerSpecific' data-category='inst_docker'><?tr("Docker");?></li>
@ -24,7 +26,6 @@
<li class='categoryMenu caMenuItem allApps onlyShowWithFeed' data-category='All'><?tr("All Apps");?></li> <li class='categoryMenu caMenuItem allApps onlyShowWithFeed' data-category='All'><?tr("All Apps");?></li>
<hr class='category_hr'> <hr class='category_hr'>
<li class='categoryMenu caMenuItem caRepositoryMenu onlyShowWithFeed' data-category='repos'><?tr("Repositories");?></li> <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'> <hr class='category_hr onlyShowWithFeed'>
<li class='caMenuItem' onclick='window.location="/Apps/ca_settings"'><?tr("Settings");?></a></li> <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 statistics' onclick='disableSort();scrollToTop();showStatistics();'><?tr("Statistics");?></li>

View File

@ -647,6 +647,13 @@ function getPopupDescriptionSkin($appNumber) {
} }
} }
} else { } else {
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>";
}
}
if ( file_exists("/var/log/plugins/$pluginName") ) { if ( file_exists("/var/log/plugins/$pluginName") ) {
$pluginSettings = $pluginName == "community.applications.plg" ? "ca_settings" : plugin("launch","/var/log/plugins/$pluginName"); $pluginSettings = $pluginName == "community.applications.plg" ? "ca_settings" : plugin("launch","/var/log/plugins/$pluginName");
if ( $pluginSettings ) if ( $pluginSettings )
@ -828,14 +835,7 @@ function getPopupDescriptionSkin($appNumber) {
} }
if ( trim($template['Changes']) ) { if ( trim($template['Changes']) ) {
if ( $template['Plugin'] ) { if ( $template['Plugin'] ) {
if ( file_exists("/var/log/plugins/$pluginName") ) {
$appInformation = tr("Currently Installed Version:")." ".plugin("version","/var/log/plugins/$pluginName");
if ( plugin("version","/var/log/plugins/$pluginName") != plugin("version",$caPaths['pluginTempDownload']) ) {
copy($caPaths['pluginTempDownload'],"/tmp/plugins/$pluginName");
$appInformation .= " - <a class='ca_bold popUpLink updatePlugin' onclick='installPlugin(&quot;$pluginName&quot;,true,true);'>".tr("Install The Update")."</a></span>";
} else
$appInformation .= " - <font color='#4cc337'>".tr("Latest Version")."</font>";
}
$appInformation .= $template['Changes']; $appInformation .= $template['Changes'];
} elseif ($template['Language']) { } elseif ($template['Language']) {
$appInformation .= trim($template['Changes']); $appInformation .= trim($template['Changes']);
@ -999,7 +999,7 @@ function displayCard($template) {
$holder = $template['Plugin'] ? "ca_holderPlugin" : "ca_holderDocker"; $holder = $template['Plugin'] ? "ca_holderPlugin" : "ca_holderDocker";
$holder = $template['Language'] ? "ca_holderLanguage" : $holder; $holder = $template['Language'] ? "ca_holderLanguage" : $holder;
$holder = $template['RepositoryTemplate'] ? "ca_holderRepository" : $holder; $holder = $template['RepositoryTemplate'] ? "ca_holderRepository" : $holder;
$holder = strpos($template['OriginalCategories'],"Drivers") !== false ? "ca_holderDriver" : $holder; $holder = (strpos($template['OriginalCategories'],"Drivers") !== false) && $template['Plugin'] ? "ca_holderDriver" : $holder;
if ( $template['ca_fav'] ) if ( $template['ca_fav'] )
$holder .= " ca_holderFav"; $holder .= " ca_holderFav";