From ce87e71c482ece0291cec7e4038f8d2f0389bc04 Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 26 Nov 2023 11:05:21 +0100 Subject: [PATCH] Revert "Enhanced boot page" This reverts commit 884887fe3cd982703ae707bc0f668f73105d007c. --- emhttp/plugins/dynamix/include/Boot.php | 20 ++++++++--------- .../dynamix/include/DefaultPageLayout.php | 22 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/emhttp/plugins/dynamix/include/Boot.php b/emhttp/plugins/dynamix/include/Boot.php index 15f436cbd..682fbb14d 100644 --- a/emhttp/plugins/dynamix/include/Boot.php +++ b/emhttp/plugins/dynamix/include/Boot.php @@ -57,12 +57,12 @@ var boot = new NchanSubscriber('/sub/var',{subscriber:'websocket'}); boot.on('message', function(msg) { var ini = parseINI(msg); switch (ini['fsState']) { - case 'Stopped' : var status = ''; break; - case 'Started' : var status = ''; break; - case 'Formatting': var status = '•'; break; - default : var status = ''+_('Array '+ini['fsState'])+''; + case 'Stopped' : var status = ""; break; + case 'Started' : var status = ""; break; + case 'Formatting': var status = "•"; break; + default : var status = ""+_('Array '+ini['fsState'])+""; } - if (ini['fsProgress']) status += '•'+_(ini['fsProgress'])+''; + if (ini['fsProgress']) status += "•"+_(ini['fsProgress'])+""; $('.sub1').html(status); }); @@ -158,7 +158,7 @@ $(document).ajaxSend(function(elm, xhr, s){ '.$var['fsProgress'].'' : ''; +$progress = (_var($var,'fsProgress')!='') ? "•{$var['fsProgress']}" : ""; switch (_var($_POST,'cmd','shutdown')) { case 'reboot': @@ -176,13 +176,13 @@ echo '
'; echo '
'; switch (_var($var,'fsState')) { case 'Stopped': - echo '',_('Array Stopped'),"$progress"; break; + echo "",_('Array Stopped'),"$progress"; break; case 'Starting': - echo '',_('Array Starting'),"$progress"; break; + echo "",_('Array Starting'),"$progress"; break; case 'Stopping': - echo '',_('Array Stopping'),"$progress"; break; + echo "",_('Array Stopping'),"$progress"; break; default: - echo '',_('Array Started'),"$progress"; break; + echo "",_('Array Started'),"$progress"; break; } echo '
'; echo '
'; diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php index 73d5e24a5..4081600cc 100644 --- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php +++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php @@ -784,16 +784,16 @@ unset($pages,$page,$pgs,$pg,$icon,$nchan,$running,$start,$stop,$row,$script,$opt // Build footer annotate('Footer'); echo '