Remove reference to #nav-item

This commit is contained in:
Squidly271 2021-07-10 09:22:32 -04:00
parent ebaeb81ee5
commit 09283e616f
4 changed files with 41 additions and 5 deletions

Binary file not shown.

View File

@ -188,7 +188,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?>')");
$(".LanguageButton").find("a").attr("onclick","CAswitchLanguage('<?=$previousLocale?>')");
$("#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')?>'><button class='searchSubmit' style='margin-right:10px' onclick='doSearch(true)'><i id='searchButton' class='fa fa-search fa-lg'></i></button></div>");
@ -271,9 +271,42 @@ $(function(){
if ( popupVisible(this) ) return;
var container = $(this).attr("data-name");
var docker = [container];
openBox('/plugins/<?=$plugin?>/scripts/installMulti.php?upgrade=true&docker='+docker,"<?tr('Update Container')?>",600,900,true,"refreshDisplay");
execUpContainer(container);
});
function execUpContainer(container) {
var title = _('Updating the container')+': '+container;
var cmd = '/plugins/dynamix.docker.manager/include/CreateDocker.php?updateContainer=true&ct[]='+encodeURIComponent(container);
popupWithIframe(title, cmd, true, 'refreshDisplay');
}
function popupWithIframe(title, cmd, reload, func) {
pauseEvents();
$('#iframe-popup').html('<iframe id="myIframe" frameborder="0" scrolling="yes" width="100%" height="99%"></iframe>');
$('#iframe-popup').dialog({
autoOpen:true,
title:title,
draggable:true,
width:800,
height:((screen.height / 5) * 4) || 0,
resizable:true,
modal:true,
show:{effect:'fade', duration:250},
hide:{effect:'fade', duration:250},
open:function(ev, ui) {
$('#myIframe').attr('src', cmd);
},
close:function(event, ui) {
if (reload && !$('#myIframe').contents().find('#canvas').length) {
if (func) setTimeout(func+'()',0); else location = window.location.href;
} else {
resumeEvents();
}
}
});
$('.ui-dialog .ui-dialog-titlebar').addClass('menu');
$('.ui-dialog .ui-dialog-title').css('text-align', 'center').css('width', '100%');
$('.ui-dialog .ui-dialog-content').css('padding', '12');
}
$('.mainArea').on("click",".ca_href",function() {
if ( popupVisible() ) return;
var href = $(this).attr("data-href");

View File

@ -1,6 +1,6 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
1a90c8b77cb75f79d57b1a9b2285add4 ./CommunityApps.page
e4ba7ca68bc2b1e384fb73851ae7c3cb ./CommunityApps.page
6db73582f22dab13d329e862067ee84e ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md
a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page
@ -19,7 +19,7 @@ e29c13353bc1277fc2c3597782d7c954 ./skins/Narrow/css.php
adc2d62d429accb264cedad58e6ef7a5 ./skins/Narrow/skin.html
01a2b427ddd0eb019d7166d1356037fe ./skins/Narrow/skin.php
430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php
cef8c79608f95fff58473bc65af2525f ./scripts/installMulti.php
11eecc7264a3057ee70cc00a24c8299b ./scripts/installMulti.php
ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh

View File

@ -124,9 +124,12 @@ function addCloseButton() {
} else {
foreach ( $dockers as $container ) {
if ( $running[$container]['running'] ) {
echo "Starting $container";
passthru("docker start $container");
}
}
echo "<br>".tr("Docker Application Installation finished")."<br><script>addCloseButton();</script>";
echo "<script>top.Shadowbox.close();</script>";
}
}