From 0595daf8034cd6ac7d4dfd237a2acff2e161cee3 Mon Sep 17 00:00:00 2001 From: bergware Date: Tue, 28 Feb 2023 16:20:18 +0100 Subject: [PATCH] Fix indicator position in context menu --- plugins/dynamix.docker.manager/javascript/docker.js | 2 +- plugins/dynamix.vm.manager/javascript/vmmanager.js | 2 +- plugins/dynamix/include/DefaultPageLayout.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix.docker.manager/javascript/docker.js b/plugins/dynamix.docker.manager/javascript/docker.js index af05c4e6f..39f5fd31f 100644 --- a/plugins/dynamix.docker.manager/javascript/docker.js +++ b/plugins/dynamix.docker.manager/javascript/docker.js @@ -2,7 +2,7 @@ var eventURL = '/plugins/dynamix.docker.manager/include/Events.php'; function addDockerContainerContext(container, image, template, started, paused, update, autostart, webui, shell, id, Support, Project, Registry, donateLink, ReadMe) { var opts = []; - context.settings({right:false}); + context.settings({right:false,above:false}); if (started && !paused) { if (webui !== '' && webui != '#') opts.push({text:_('WebUI'), icon:'fa-globe', href:webui, target:'_blank'}); opts.push({text:_('Console'), icon:'fa-terminal', action:function(e){e.preventDefault(); openTerminal('docker',container,shell);}}); diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js index 31b33d354..e5cc5e047 100644 --- a/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -48,7 +48,7 @@ function addVMContext(name, uuid, template, state, vmrcurl,vmrcprotocol , log){ }}); opts.push({divider:true}); } - context.settings({right:false}); + context.settings({right:false,above:false}); if (state == "running") { opts.push({text:_("Stop"), icon:"fa-stop", action:function(e) { e.preventDefault(); diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index 8015b1c5a..6e51fbf5f 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -104,7 +104,7 @@ String.prototype.actionName = function(){return this.split(/[\\/]/g).pop();} String.prototype.channel = function(){return this.split(':')[1].split(',').findIndex((e)=>/\[\d\]/.test(e));} Shadowbox.init({skipSetup:true}); -context.init({above:false}); +context.init(); // server uptime var uptime = ; @@ -989,7 +989,7 @@ $(function() { var opts = []; - context.settings({right:true}); + context.settings({right:true,above:false}); opts.push({header:""}); opts.push({text:"",icon:'fa-bell-o',subMenu:[{text:"",icon:'fa-folder-open-o',action:function(e){e.preventDefault();openNotifier('alert');}},{text:"",icon:'fa-file-text-o',action:function(e){e.preventDefault();viewHistory('alert');}},{text:"",icon:'fa-check-square-o',action:function(e){e.preventDefault();closeNotifier('alert');}}]}); opts.push({text:"",icon:'fa-star-o',subMenu:[{text:"",icon:'fa-folder-open-o',action:function(e){e.preventDefault();openNotifier('warning');}},{text:"",icon:'fa-file-text-o',action:function(e){e.preventDefault();viewHistory('warning');}},{text:"",icon:'fa-check-square-o',action:function(e){e.preventDefault();closeNotifier('warning');}}]});