diff --git a/plugins/dynamix.docker.manager/Docker.page b/plugins/dynamix.docker.manager/Docker.page index d3a43ecb7..9bd7c897d 100644 --- a/plugins/dynamix.docker.manager/Docker.page +++ b/plugins/dynamix.docker.manager/Docker.page @@ -1,6 +1,7 @@ Menu="Tasks:60" Type="xmenu" Code="e90b" +Lock="true" Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\")" --- @@ -66,13 +67,10 @@ $('.tabs').append("
_(Application)__(Version)__(Network)__(Port Mappings)_ (_(App to Host)_)_(Volume Mappings)_ (_(App to Host)_)_(CPU & Memory load)__(Autostart)__(Uptime)_
"; + echo "
"; if ($template) { $appname = "".htmlspecialchars($name).""; } else { diff --git a/plugins/dynamix.docker.manager/log.htm b/plugins/dynamix.docker.manager/log.htm index f233e7d8a..797aa39a9 100644 --- a/plugins/dynamix.docker.manager/log.htm +++ b/plugins/dynamix.docker.manager/log.htm @@ -5,7 +5,7 @@ - + @@ -154,8 +152,7 @@ function resize(bind) { var s = Math.max(window.innerHeight-340,330); if (h>s || bind) { $('#kvm_list').height(s); - $('#kvm_table tbody tr:first-child td').each(function(){width.push($(this).width());}); - $('#kvm_table thead tr th').each(function(i){$(this).width(width[i]);}); + $('#kvm_table thead tr th').each(function(){$(this).width($(this).width());}); if (!bind) $('#kvm_table thead,#kvm_table tbody').addClass('fixed'); } } @@ -214,31 +211,41 @@ function dialogStyle() { $('.ui-button-text').css({'padding':'0px 5px'}); } var sortableHelper = function(e,ui){ + ui.next().hide(); ui.children().each(function(){$(this).width($(this).width());}); return ui; }; function LockButton() { if ($.cookie('lockbutton') == null) { $.cookie('lockbutton','lockbutton'); + $('i.mover').show(); + $('#kvm_list .sortable').css({'cursor':'move'}); - $('div.nav-item.LockButton').find('a').prop('title',"_(Lock sortable items)_"); - $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text'); + $('div.nav-item.LockButton a').prop('title',"_(Lock sortable items)_"); + $('div.nav-item.LockButton b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text'); - $('div.nav-item.LockButton').find('span').text("_(Lock sortable items)_"); - $('#kvm_list').sortable({helper:sortableHelper,items:'tr.sortable',cursor:'move',axis:'y',containment:'parent',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true, + $('div.nav-item.LockButton span').text("_(Lock sortable items)_"); + $('#kvm_list').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',axis:'y',containment:'parent',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true, update:function(e,ui){ - var row = $('#kvm_list').find('tr:first'); - var names = ''; var index = ''; + $('#kvm_list .sortable').each(function(){ + var parent = $(this).attr('parent-id'); + var child = $('tr[child-id="'+parent+'"]'); + child.detach().insertAfter($(this)); + }); + var row = $('#kvm_list tr:first'); + var names = '', index = ''; row.parent().children().find('td.vm-name').each(function(){names+=$(this).find('a').text()+';';index+=$(this).parent().parent().children().index($(this).parent())+';';}); $.post('/plugins/dynamix.vm.manager/include/UserPrefs.php',{names:names,index:index}); }}); } else { $.removeCookie('lockbutton'); + $('i.mover').hide(); + $('#kvm_list .sortable').css({'cursor':'default'}); - $('div.nav-item.LockButton').find('a').prop('title',"_(Unlock sortable items)_"); - $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text'); + $('div.nav-item.LockButton a').prop('title',"_(Unlock sortable items)_"); + $('div.nav-item.LockButton b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text'); - $('div.nav-item.LockButton').find('span').text("_(Unlock sortable items)_"); + $('div.nav-item.LockButton span').text("_(Unlock sortable items)_"); $('#kvm_list').sortable('destroy'); } } @@ -292,20 +299,7 @@ $(function() {
-lang=""> - - - - - - - -"> - - _(ISO Image)_: : - -
\ No newline at end of file diff --git a/plugins/dynamix.vm.manager/VMs.page b/plugins/dynamix.vm.manager/VMs.page index 2f5e8f9ea..f9e5d4218 100644 --- a/plugins/dynamix.vm.manager/VMs.page +++ b/plugins/dynamix.vm.manager/VMs.page @@ -1,6 +1,7 @@ Menu="Tasks:70" Type="xmenu" Code="e918" +Lock="true" Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")" --- "; echo ""; echo ""; @@ -134,9 +135,9 @@ foreach ($vms as $vm) { /* Disk device information */ echo "" : "' style='display:none'>"); echo "
_(Name)__(Description)__(CPUs)__(Memory)__(vDisks)__(Graphics)__(Autostart)_
"; + echo "
"; echo "$image$vm
"._($status)."		$desc$vcpu
"; - echo ""; + echo "
"; echo ""; - echo ""; + echo ""; /* Display VM disks */ foreach ($lv->get_disk_stats($res) as $arrDisk) { diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index e24d77c65..0a010ec21 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -173,7 +173,7 @@ switch ($display['theme']) { @@ -676,10 +666,7 @@ function hideShow() { } } -
- - !--> @@ -1065,7 +1052,7 @@ function addProperties() { $('tbody.system').addClass('sortable').attr('sort',n++); $('tbody').not('.system').each(function(){ $(this).addClass('sortable').attr('sort',n++); - $(this).find('td:first').prepend(""); + $(this).find('td:first').prepend(""); }); } function showContent() { @@ -1154,6 +1141,7 @@ function LockButton() { $('div.nav-item.LockButton a').prop('title',"_(Lock sortable items)_"); $('div.nav-item.LockButton b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text'); + $('i.tile').show(); $('div.nav-item.LockButton span').text("_(Lock sortable items)_"); $('#db-box1,#db-box2,#db-box3').sortable({connectWith:'#db-box1,#db-box2,#db-box3'}); $('table.dashboard').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true, @@ -1175,6 +1163,7 @@ function LockButton() { $('div.nav-item.LockButton a').prop('title',"_(Unlock sortable items)_"); $('div.nav-item.LockButton b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text'); + $('i.tile').hide(); $('div.nav-item.LockButton span').text("_(Unlock sortable items)_"); $('table.dashboard').sortable('destroy'); } diff --git a/plugins/dynamix/Dashboard.page b/plugins/dynamix/Dashboard.page index 2b324f980..3c5d1a68a 100644 --- a/plugins/dynamix/Dashboard.page +++ b/plugins/dynamix/Dashboard.page @@ -2,4 +2,5 @@ Menu="Tasks:1" Type="xmenu" Tabs="false" Code="e943" +Lock="true" Load="30" \ No newline at end of file diff --git a/plugins/dynamix/DisplaySettings.page b/plugins/dynamix/DisplaySettings.page index 3844607bb..c2595fc3c 100644 --- a/plugins/dynamix/DisplaySettings.page +++ b/plugins/dynamix/DisplaySettings.page @@ -32,6 +32,7 @@ select.fixed{max-width:166px}
"._('Disk devices').""._('Serial').""._('Bus').""._('Capacity').""._('Allocation')."Boot Order