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\ */ ?> -if ($var['fsState'] != 'Started') { - echo "
= $noticeMessage ?>
+ endif; ?> diff --git a/emhttp/plugins/dynamix.my.servers/include/myservers1.php b/emhttp/plugins/dynamix.my.servers/include/myservers1.php index b9cfc44ff..d8de6b2eb 100644 --- a/emhttp/plugins/dynamix.my.servers/include/myservers1.php +++ b/emhttp/plugins/dynamix.my.servers/include/myservers1.php @@ -9,40 +9,6 @@ * all copies or substantial portions of the Software. */ ?> - /dev/null\")" */ ?> -if ($var['fsState'] != "Started") { - echo "= $noticeMessage ?>
+ endif; ?> + + +if (count($pages) == 2) { + $tabbed = false; } -if (count($pages)==2) $tabbed = false; ?> \ No newline at end of file diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page index 5738ba549..e017faeb8 100644 --- a/emhttp/plugins/dynamix/DisplaySettings.page +++ b/emhttp/plugins/dynamix/DisplaySettings.page @@ -51,7 +51,11 @@ function upload(lang) { } } function presetBanner(form) { - if (form.banner.selectedIndex == 0) $('.js-bannerSettings').hide(); else $('.js-bannerSettings').show(); + if (form.banner && form.banner.selectedIndex == 0) { + $('.js-bannerSettings').hide(); + } else { + $('.js-bannerSettings').show() + } } function presetRefresh(form) { for (var i=0,item; item=form.refresh.options[i]; i++) item.value *= -1; 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; + + $noticeMessage = null; + if ($var['fsState'] == "Stopped") { + $noticeMessage = _('Array must be **Started** to view Shares'); + } +?> + + if ($noticeMessage): ?> += $noticeMessage ?>
+ return; ?> + endif; ?> + + +if (count($pages) == 2) { + $tabbed = false; +} ?> diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php index 3c5c350ad..0bdf4ec2c 100644 --- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php +++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php @@ -94,7 +94,6 @@ if (count($pages)) { "> "> "> -"> ">