diff --git a/raid/index.cgi b/raid/index.cgi index b12f27caa..6adbb625c 100755 --- a/raid/index.cgi +++ b/raid/index.cgi @@ -31,7 +31,7 @@ else { $conf = &get_raidtab(); if (@$conf) { print &ui_columns_start([ $text{'index_name'}, - $text{'index_active'}, + $raid_mode eq "raidtools" ? $text{'index_active'} : $text{'index_status'}, $text{'index_level'}, $text{'index_size'}, $text{'index_members'} ]); @@ -44,14 +44,9 @@ if (@$conf) { push(@mems, $d->{'value'}); } } - my @errors = grep { $_ ne "U" } @{$c->{'errors'}}; print &ui_columns_row([ &ui_link("view_raid.cgi?idx=$c->{'index'}",&html_escape($c->{'value'})), - !$c->{'active'} ? - "$text{'no'}" : - @errors ? - "$text{'index_errors'}" : - "$text{'yes'}", + $raid_mode eq "raidtools" ? $c->{'active'} ? "$text{'yes'}" : "$text{'no'}" : $c->{'state'} =~ /resyncing/ || $c->{'state'} =~ /recovering/ || $c->{'state'} =~ /reshaping/ || $c->{'state'} =~ /degraded/ || $c->{'state'} =~ /FAILED/ ? $c->{'rebuild'} ne '' ? "".$c->{'state'}."(".$c->{'rebuild'}."%, ".int($c->{'remain'})."min)" : "".$c->{'state'}."" : "".$c->{'state'}."", $lvl eq 'linear' ? $text{'linear'} : $text{'raid'.$lvl}, $c->{'size'} ? &nice_size($c->{'size'}*1024) : "", &ui_links_row(\@mems), diff --git a/raid/lang/en b/raid/lang/en index 400345b78..ac5ab91b7 100644 --- a/raid/lang/en +++ b/raid/lang/en @@ -8,7 +8,7 @@ index_mdadm=Using MDADM version $1 index_raidtools=Using RaidTools index_name=Device name index_active=Active? -index_errors=Errors +index_status=Status index_level=RAID level index_size=Usable size index_members=Member disk devices