possibly working on containers. need to test mutltiple times
parent
877c304056
commit
2a122b55d9
Binary file not shown.
|
@ -271,16 +271,12 @@ $(function(){
|
|||
window.open(href,target);
|
||||
});
|
||||
|
||||
$('.mainArea').on("click",".dockerUpdate",function() {
|
||||
$('.mainArea, a').on("click",".dockerUpdate",function() {
|
||||
var container = $(this).attr("data-name");
|
||||
$("#sb-nav-close").css("visibility","hidden"); // Because docker install cannot be aborted so why allow window to close
|
||||
<? if ( $translations ): ?>
|
||||
openBox('/plugins/community.applications/scripts/installUpdate.php?ct[]='+encodeURIComponent(container),tr('Update Container'),600,1100,true,"refreshDisplay");
|
||||
<? else: ?>
|
||||
my_openBox('/plugins/community.applications/scripts/installUpdate.php?ct[]='+encodeURIComponent(container),tr('Update Container'),600,1100,true,"refreshDisplay");
|
||||
<? endif; ?>
|
||||
updateDocker(container);
|
||||
});
|
||||
|
||||
|
||||
$('.mainArea').on("click",".ca_non_favouriteRepo",function() {
|
||||
if ( popupVisible(this) ) return;
|
||||
setFavourite(this);
|
||||
|
@ -1816,6 +1812,16 @@ function removeLanguage(language) {
|
|||
openBox('/plugins/community.applications/scripts/languageInstall.sh&arg1=remove&arg2='+language,"<?tr('Remove Language Pack')?>",600,900,true,"refreshDisplay");
|
||||
}
|
||||
|
||||
function updateDocker(container) {
|
||||
$(".ca_appPopup").tooltipster("close");
|
||||
$("#sb-nav-close").css("visibility","hidden"); // Because docker install cannot be aborted so why allow window to close
|
||||
<? if ( $translations ): ?>
|
||||
openBox('/plugins/community.applications/scripts/installUpdate.php?ct[]='+encodeURIComponent(container),tr('Update Container'),600,1100,true,"refreshDisplay");
|
||||
<? else: ?>
|
||||
my_openBox('/plugins/community.applications/scripts/installUpdate.php?ct[]='+encodeURIComponent(container),tr('Update Container'),600,1100,true,"refreshDisplay");
|
||||
<? endif; ?>
|
||||
}
|
||||
|
||||
function setToolTipForFavourite() {
|
||||
$(".ca_fav").each(function(){
|
||||
if ( $(this).hasClass("ca_favouriteRepo") ) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
|
||||
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
|
||||
28d82ce41b2f90e4a29ffde79f367b7f ./CommunityApps.page
|
||||
ecb6bd9538b889f2614b18ada6ac3a17 ./CommunityApps.page
|
||||
8c24d585c7dd3ff9ef961bb2c2705711 ./PluginAPI.page
|
||||
b398273cf7daa62ab00d2de2336ca25f ./README.md
|
||||
2cdb7da0d67a11278ada7fd029707738 ./ca_settings.page
|
||||
|
@ -17,7 +17,7 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md
|
|||
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
|
||||
4e97f00c3f0a52603239b00acf890990 ./skins/Narrow/css.php
|
||||
e7bf62923b2d7109b6848554701e12f6 ./skins/Narrow/skin.html
|
||||
d16341cf1a3f271064ee2768b81417a6 ./skins/Narrow/skin.php
|
||||
6ec09baee0cd11c2685184e5648feb8f ./skins/Narrow/skin.php
|
||||
430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php
|
||||
bbd9dec6c5df486d75c46388c14f09ce ./scripts/installMulti.php
|
||||
ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh
|
||||
|
|
|
@ -477,10 +477,12 @@ function getPopupDescriptionSkin($appNumber) {
|
|||
$DockerClient = new DockerClient();
|
||||
$info = $DockerTemplates->getAllInfo();
|
||||
$dockerRunning = $DockerClient->getDockerContainers();
|
||||
$dockerUpdateStatus = readJsonFile($caPaths['dockerUpdateStatus']);
|
||||
} else {
|
||||
unset($caSettings['dockerRunning']);
|
||||
$info = array();
|
||||
$dockerRunning = array();
|
||||
$dockerUpdateStatus = array();
|
||||
}
|
||||
if ( ! is_file($caPaths['warningAccepted']) )
|
||||
$caSettings['NoInstalls'] = true;
|
||||
|
@ -626,6 +628,10 @@ function getPopupDescriptionSkin($appNumber) {
|
|||
if ( ! $template['Plugin'] ) {
|
||||
if ( $caSettings['dockerRunning'] ) {
|
||||
if ( $selected ) {
|
||||
$tmpRepo = strpos($template['Repository'],":") ? $template['Repository'] : $template['Repository'].":latest";
|
||||
if ( ! filter_var($dockerUpdateStatus[$tmpRepo]['status'],FILTER_VALIDATE_BOOLEAN) ) {
|
||||
$installLine .= "<div><a class='appIconsPopUp ca_fa-update' onclick='updateDocker("$name");'> ".tr("Update")."</a></div>";
|
||||
}
|
||||
$installLine .= $caSettings['defaultReinstall'] == "true" ? "<div><a class='appIconsPopUp ca_fa-install xmlInstall' onclick='xmlInstall("default","".addslashes($template['Path'])."");'> ".tr("Reinstall (default)")."</a></div>" : "";
|
||||
$installLine .= "<div><a class='appIconsPopUp ca_fa-edit' onclick='xmlInstall("edit","".addslashes($info[$name]['template'])."");'> ".tr("Edit")."</a></div>";
|
||||
if ( $info[$name]['url'] && $info[$name]['running'] ) {
|
||||
|
|
Loading…
Reference in New Issue