From c317408a4e2c6bb7ee7b42670d57403d4ec6847e Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 1 Oct 2023 11:11:41 +0200 Subject: [PATCH] Improve footer array status display --- emhttp/plugins/dynamix/include/DefaultPageLayout.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php index bd1a152c7..fe0277879 100644 --- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php +++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php @@ -71,6 +71,7 @@ html{font-size:%} .upgrade_notice i{float:right;cursor:pointer} .back_to_top{display:none;position:fixed;bottom:30px;right:12px;color:#e22828;font-size:2.5rem;z-index:999} span.big.blue-text{cursor:pointer} +span.strong.tour{margin-left:5px;padding-left:0} i.abortOps{font-size:2rem;float:right;margin-right:20px;margin-top:8px;cursor:pointer} pre#swalbody p{margin-block-end:1em} '; -$progress = (_var($var,'fsProgress')!='')? "•{$var['fsProgress']}" : ''; +$progress = (_var($var,'fsProgress')!='')? "•{$var['fsProgress']}" : ''; switch (_var($var,'fsState')) { case 'Stopped': echo " "._('Array Stopped')."$progress"; break; @@ -835,7 +836,7 @@ defaultPage.on('message', function(msg,meta) { switch (ini['fsState']) { case 'Stopped' : var status = " "; break; case 'Started' : var status = " "; break; - case 'Formatting': var status = " "; break; + case 'Formatting': var status = " "; break; default : var status = " "+_('Array '+ini['fsState'])+""; } if (ini['mdResyncPos'] > 0) { @@ -847,11 +848,11 @@ defaultPage.on('message', function(msg,meta) { default : var action = ''; } action += " "+(ini['mdResyncPos']/(ini['mdResyncSize']/100+1)).toFixed(1)+" %"; - status += "•"+action.replace('.',''); + status += "•"+action.replace('.',''); if (ini['mdResyncDt']==0) status += " • "; status += ""; } - if (ini['fsProgress']) status += "•"+_(ini['fsProgress'])+""; + if (ini['fsProgress']) status += "•"+_(ini['fsProgress'])+""; $('#statusbar').html(status); break; case 2: