Miscellaneous updates

This commit is contained in:
bergware
2020-02-10 13:12:58 +01:00
parent 647a5cabe3
commit 7064ca30b4
4 changed files with 7 additions and 5 deletions
@@ -101,7 +101,6 @@ var sortableHelper = function(e,i){
function loadlist(init) { function loadlist(init) {
$.get('/plugins/dynamix.docker.manager/include/DockerContainers.php',function(d) { $.get('/plugins/dynamix.docker.manager/include/DockerContainers.php',function(d) {
if (init) clearTimeout(timers.docker); if (init) clearTimeout(timers.docker);
$('div.spinner.fixed').hide('slow');
var data = d.split(/\0/); var data = d.split(/\0/);
$('#docker_list').html(data[0]).sortable({helper:sortableHelper,items:'tr.sortable',cursor:'move',axis:'y',containment:'parent',cancel:'span.docker_readmore,input',delay:100,opacity:0.5,zIndex:9999, $('#docker_list').html(data[0]).sortable({helper:sortableHelper,items:'tr.sortable',cursor:'move',axis:'y',containment:'parent',cancel:'span.docker_readmore,input',delay:100,opacity:0.5,zIndex:9999,
update:function(e,ui){ update:function(e,ui){
@@ -138,6 +137,7 @@ function loadlist(init) {
if (ct.update==2) rebuild = true; if (ct.update==2) rebuild = true;
} }
listview(); listview();
$('div.spinner.fixed').hide('slow');
if (data[2]==1) {$('#busy').show(); setTimeout(loadlist,5000);} else if ($('#busy').is(':visible')) {$('#busy').hide(); setTimeout(loadlist,3000);} if (data[2]==1) {$('#busy').show(); setTimeout(loadlist,5000);} else if ($('#busy').is(':visible')) {$('#busy').hide(); setTimeout(loadlist,3000);}
if (!update) $('input#updateAll').prop('disabled',true); if (!update) $('input#updateAll').prop('disabled',true);
if (rebuild) rebuildAll(); if (rebuild) rebuildAll();
+4 -2
View File
@@ -51,13 +51,14 @@ function loadlist(id) {
var cmd = id.split(':'); var cmd = id.split(':');
var tr = 'tr#'+cmd[0].replace(/[\. _]/g,''); var tr = 'tr#'+cmd[0].replace(/[\. _]/g,'');
switch (cmd[1]) { switch (cmd[1]) {
case 'return' : $('div.spinner').hide('slow').remove();list.html(data[0]); $('#plugin_table').trigger('destroy'); break; case 'return' : $('div.spinner').hide('slow');list.html(data[0]); $('#plugin_table').trigger('destroy'); break;
case 'remove' : list.find(tr).remove(); break; case 'remove' : list.find(tr).remove(); break;
case 'update' : list.find(tr).remove(); case 'update' : list.find(tr).remove();
case 'install': if (!list.find(tr).length) list.append(data[0]).trigger('update'); break; case 'install': if (!list.find(tr).length) list.append(data[0]).trigger('update'); break;
} }
} else { } else {
list.html(data[0]); list.html(data[0]);
$('div.spinner').hide('slow');
} }
<?if ($display['resize']):?> <?if ($display['resize']):?>
resize(); resize();
@@ -75,6 +76,7 @@ function spinner() {
$('div.spinner.fixed').show('slow'); $('div.spinner.fixed').show('slow');
} }
$(function() { $(function() {
spinner();
loadlist(); loadlist();
$('#plugin_tree').fileTree({root:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);}); $('#plugin_tree').fileTree({root:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);});
$('.tabs').append("<span id='updateall' class='status vhshift' style='display:none;margin-left:12px'><input type='button' value='Update All Plugins' onclick='spinner();openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=updateall\",\"Update All Plugins\",600,600,true,\"loadlist\",\":return\")'></span>"); $('.tabs').append("<span id='updateall' class='status vhshift' style='display:none;margin-left:12px'><input type='button' value='Update All Plugins' onclick='spinner();openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=updateall\",\"Update All Plugins\",600,600,true,\"loadlist\",\":return\")'></span>");
@@ -85,5 +87,5 @@ $(function() {
</script> </script>
<table class='tablesorter plugins shift' id='plugin_table'> <table class='tablesorter plugins shift' id='plugin_table'>
<thead><tr><th></th><th>Plugin</th><th>Author</th><th>Version</th><th>Status</th><th>Uninstall</th></tr></thead> <thead><tr><th></th><th>Plugin</th><th>Author</th><th>Version</th><th>Status</th><th>Uninstall</th></tr></thead>
<tbody id="plugin_list"><tr><td colspan="6"><div class="spinner"></div></td><tr></tbody> <tbody id="plugin_list"><tr><td colspan="6"></td><tr></tbody>
</table> </table>
+1 -1
View File
@@ -148,7 +148,6 @@ var sortableHelper = function(e,i){
function loadlist(init) { function loadlist(init) {
$.get('/plugins/dynamix.vm.manager/include/VMMachines.php',{show:$.cookie('vmshow')},function(d) { $.get('/plugins/dynamix.vm.manager/include/VMMachines.php',{show:$.cookie('vmshow')},function(d) {
if (init) clearTimeout(timers.vm); if (init) clearTimeout(timers.vm);
$('div.spinner.fixed').hide('slow');
var data = d.split(/\0/); var data = d.split(/\0/);
$('#kvm_list').html(data[0]).sortable({helper:sortableHelper,items:'tr.sortable',cursor:'move',axis:'y',containment:'parent',delay:100,opacity:0.5,zIndex:9999, $('#kvm_list').html(data[0]).sortable({helper:sortableHelper,items:'tr.sortable',cursor:'move',axis:'y',containment:'parent',delay:100,opacity:0.5,zIndex:9999,
update:function(e,ui){ update:function(e,ui){
@@ -188,6 +187,7 @@ function loadlist(init) {
},'json'); },'json');
}); });
context.init({preventDoubleContext:false,left:true,above:false}); context.init({preventDoubleContext:false,left:true,above:false});
$('div.spinner.fixed').hide('slow');
$('input[type=button]').prop('disabled',false).show('slow'); $('input[type=button]').prop('disabled',false).show('slow');
$('.text').click(showInput); $('.text').click(showInput);
$('.input').blur(hideInput); $('.input').blur(hideInput);
+1 -1
View File
@@ -45,7 +45,6 @@ function resize(bind) {
function archiveList(init) { function archiveList(init) {
$.get('/webGui/include/NotificationsArchive.php',{filter:'<?=addslashes(htmlspecialchars($_GET['filter']))?>'},function(data) { $.get('/webGui/include/NotificationsArchive.php',{filter:'<?=addslashes(htmlspecialchars($_GET['filter']))?>'},function(data) {
if (init) clearTimeout(timers.archive); if (init) clearTimeout(timers.archive);
$('div.spinner.fixed').hide('slow');
if (data) $('#archive_list').html(data); if (data) $('#archive_list').html(data);
if (init) { if (init) {
<?if ($display['resize']):?> <?if ($display['resize']):?>
@@ -57,6 +56,7 @@ function archiveList(init) {
} }
$('#archive_list .tablesorter-childRow td').hide(); $('#archive_list .tablesorter-childRow td').hide();
for (var i = 0; i < rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show(); for (var i = 0; i < rows.length; i++) $('#archive_list .tablesorter-childRow.row'+rows[i]+' td').show();
$('div.spinner.fixed').hide('slow');
setTimeout(archiveList,30000); setTimeout(archiveList,30000);
}); });
} }