diff --git a/emhttp/plugins/dynamix.docker.manager/Docker.page b/emhttp/plugins/dynamix.docker.manager/Docker.page index 1d20e958a..687baea8e 100644 --- a/emhttp/plugins/dynamix.docker.manager/Docker.page +++ b/emhttp/plugins/dynamix.docker.manager/Docker.page @@ -18,9 +18,14 @@ Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\ */ ?> _(Array must be **Started** to view Docker containers)_."; -} elseif (!is_file('/var/run/dockerd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/dockerd.pid')))) { - echo "
_(Docker Service failed to start)_.
"; -} + $noticeMessage = null; + if ($var['fsState'] != 'Started') { + $noticeMessage = _('Array must be **Started** to view Docker containers'); + } elseif (!is_file('/var/run/dockerd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/dockerd.pid')))) { + $noticeMessage = _('Docker Service failed to start'); + } ?> + + +

+ diff --git a/emhttp/plugins/dynamix.vm.manager/VMs.page b/emhttp/plugins/dynamix.vm.manager/VMs.page index e7c76fc61..51528d0d0 100644 --- a/emhttp/plugins/dynamix.vm.manager/VMs.page +++ b/emhttp/plugins/dynamix.vm.manager/VMs.page @@ -18,10 +18,19 @@ Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")" */ ?> "._('Array must be **started** to view Virtual Machines')."."; -} elseif (!is_file('/var/run/libvirt/libvirtd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/libvirt/libvirtd.pid')))) { - echo "
"._('Libvirt Service failed to start').".
"; + $noticeMessage = null; + if ($var['fsState'] != "Started") { + $noticeMessage = _('Array must be **started** to view Virtual Machines'); + } elseif (!is_file('/var/run/libvirt/libvirtd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/libvirt/libvirtd.pid')))) { + $noticeMessage = _('Libvirt Service failed to start'); + } +?> + +

+ + + \ No newline at end of file diff --git a/emhttp/plugins/dynamix/Shares.page b/emhttp/plugins/dynamix/Shares.page index a8f148b2d..80c67d706 100644 --- a/emhttp/plugins/dynamix/Shares.page +++ b/emhttp/plugins/dynamix/Shares.page @@ -2,10 +2,20 @@ Menu="Tasks:2" Type="xmenu" Code="e92a" --- -"._('Array must be **Started** to view Shares').".

"; - return; -} -if (count($pages)==2) $tabbed = false; + + + +

+ + + +