diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page index 46ea790ef..c2e681caa 100644 --- a/plugins/dynamix.docker.manager/DockerContainers.page +++ b/plugins/dynamix.docker.manager/DockerContainers.page @@ -71,10 +71,10 @@ function resetSorting() { $.post('/plugins/dynamix.docker.manager/include/UserPrefs.php',{reset:true},function(){loadlist();}); } function listview() { - if ($.cookie('docker_listview_mode')=='basic') { - $('.docker_readmore').readmore({maxHeight:32,moreLink:"",lessLink:""}); - } else { + if ($.cookie('docker_listview_mode')=='advanced') { $('.docker_readmore').readmore('destroy'); + } else { + $('.docker_readmore').readmore({maxHeight:32,moreLink:"",lessLink:""}); } } function loadlist(update) { diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js index b959c47aa..49fe9e596 100644 --- a/plugins/dynamix.docker.manager/javascript/docker.js +++ b/plugins/dynamix.docker.manager/javascript/docker.js @@ -110,7 +110,7 @@ function rmContainer(container, image, id) { confirmButtonText:"Yes, delete it!", showLoaderOnConfirm:true },function(){ - $('#'+id).find('i').removeClass().addClass('iconstatus fa fa-trash orange-text'); + $('#'+id).find('i').removeClass('fa-play fa-square').addClass('fa-refresh fa-spin'); if ($("#removeimagechk").prop('checked')) { eventControl({action:"remove_all", container:id, image:image},'loadlist'); } else { @@ -130,12 +130,12 @@ function rmImage(image, imageName) { confirmButtonText:"Yes, delete it!", showLoaderOnConfirm:true },function(){ - $('#'+image).find('i').removeClass().addClass('iconstatus fa fa-trash orange-text'); + $('#'+image).find('i').removeClass('fa-play fa-square').addClass('fa-refresh fa-spin'); eventControl({action:"remove_image", image:image},'loadlist'); }); } function eventControl(params, spin) { - if (spin) $('#'+params['container']).find('i').addClass('fa-spin'); + if (spin) $('#'+params['container']).find('i').removeClass('fa-play fa-square').addClass('fa-refresh fa-spin'); $.post(eventURL, params, function(data) { if (data.success === true) { if (spin) setTimeout(spin+'()',500); else location=window.location.href; @@ -151,17 +151,17 @@ function eventControl(params, spin) { } function startAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,ct; ct=docker[i]; i++) if (ct.state=='false') $('#'+ct.id).find('i').addClass('fa-spin'); + for (var i=0,ct; ct=docker[i]; i++) if (ct.state=='false') $('#'+ct.id).find('i').removeClass('fa-square').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'start'},function(){loadlist();}); } function stopAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,ct; ct=docker[i]; i++) if (ct.state=='true') $('#'+ct.id).find('i').addClass('fa-spin'); + for (var i=0,ct; ct=docker[i]; i++) if (ct.state=='true') $('#'+ct.id).find('i').removeClass('fa-play').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.docker.manager/include/ContainerManager.php',{action:'stop'},function(){loadlist();}); } function checkAll() { $('input[type=button]').prop('disabled',true); - $(".updatecolumn").html(" checking..."); + $(".updatecolumn").html(" checking..."); $.post('/plugins/dynamix.docker.manager/include/DockerUpdate.php',{check:true},function(u){loadlist(u);}); } function updateAll() { diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js index aa1afb0e3..0908886ad 100644 --- a/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -1,5 +1,5 @@ function ajaxVMDispatch(params, spin){ - if (spin) $('#vm-'+params['uuid']).find('i').addClass('fa-spin'); + if (spin) $('#vm-'+params['uuid']).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin'); $.post("/plugins/dynamix.vm.manager/include/VMajax.php", params, function(data) { if (data.error) { swal({ @@ -85,7 +85,7 @@ function addVMContext(name, uuid, template, state, vncurl, log){ type:"warning", showCancelButton:true },function(){ - $('#vm-'+uuid).find('i').removeClass().addClass('iconstatus fa fa-trash orange-text'); + $('#vm-'+uuid).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin'); ajaxVMDispatch({action:"domain-undefine",uuid:uuid}, "loadlist"); }); }}); @@ -98,7 +98,7 @@ function addVMContext(name, uuid, template, state, vncurl, log){ type:"warning", showCancelButton:true },function(){ - $('#vm-'+uuid).find('i').removeClass().addClass('iconstatus fa fa-trash orange-text'); + $('#vm-'+uuid).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin'); ajaxVMDispatch({action:"domain-delete",uuid:uuid}, "loadlist"); }); }}); @@ -108,12 +108,12 @@ function addVMContext(name, uuid, template, state, vncurl, log){ } function startAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,vm; vm=kvm[i]; i++) if (vm.state!='running') $('#vm-'+vm.id).find('i').addClass('fa-spin'); + for (var i=0,vm; vm=kvm[i]; i++) if (vm.state!='running') $('#vm-'+vm.id).find('i').removeClass('fa-square').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.vm.manager/include/VMManager.php',{action:'start'}, function(){loadlist();}); } function stopAll() { $('input[type=button]').prop('disabled',true); - for (var i=0,vm; vm=kvm[i]; i++) if (vm.state=='running') $('#vm-'+vm.id).find('i').addClass('fa-spin'); + for (var i=0,vm; vm=kvm[i]; i++) if (vm.state=='running') $('#vm-'+vm.id).find('i').removeClass('fa-play').addClass('fa-refresh fa-spin'); $.post('/plugins/dynamix.vm.manager/include/VMManager.php',{action:'stop'}, function(){loadlist();}); } function vncOpen() { diff --git a/plugins/dynamix/ArrayDevices.page b/plugins/dynamix/ArrayDevices.page index 947c9918c..0c23299a6 100644 --- a/plugins/dynamix/ArrayDevices.page +++ b/plugins/dynamix/ArrayDevices.page @@ -15,8 +15,22 @@ Tag="database" */ ?> -