diff --git a/emhttp/plugins/dynamix/include/Boot.php b/emhttp/plugins/dynamix/include/Boot.php index 9757a467c..a88181476 100644 --- a/emhttp/plugins/dynamix/include/Boot.php +++ b/emhttp/plugins/dynamix/include/Boot.php @@ -100,17 +100,18 @@ function timer() { return Math.round((now.getTime()-start.getTime())/1000); } function reboot_now() { + $('.notice').html(""); boot.start(); reboot_online(); } function shutdown_now() { + $('.notice').html(""); boot.start(); shutdown_online(); } function reboot_online() { $.ajax({url:'/webGui/include/ProcessStatus.php',type:'POST',data:{name:'emhttpd',update:true},timeout:5000}) .done(function(){ - $('.notice').html(""); $('#system').html("... "+timer()); setTimeout(reboot_online,5000); }) @@ -120,7 +121,6 @@ function reboot_offline() { $.ajax({url:'/webGui/include/ProcessStatus.php',type:'POST',data:{name:'emhttpd',update:true},timeout:5000}) .done(function(){location = '/Main';}) .fail(function(){ - $('.notice').html(""); $('#system').html("... "+timer()); setTimeout(reboot_offline,1000); }); @@ -128,7 +128,6 @@ function reboot_offline() { function shutdown_online() { $.ajax({url:'/webGui/include/ProcessStatus.php',type:'POST',data:{name:'emhttpd',update:true},timeout:5000}) .done(function(){ - $('.notice').html(""); $('#system').html("... "+timer()); setTimeout(shutdown_online,5000); }) @@ -137,11 +136,9 @@ function shutdown_online() { function shutdown_offline() { var time = timer(); if (time < 30) { - $('.notice').html(""); $('#system').html("... "+time); setTimeout(shutdown_offline,5000); } else { - $('.notice').html(""); $('#system').html("... "+time); setTimeout(power_on,1000); } @@ -179,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 '
';