From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 16 Oct 2009 21:49:44 +0000 (+0200)
Subject: Made S.M.A.R.T. warning looks similar to other warnings.
X-Git-Tag: v2.9-beta1~682
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=62f1526aab63d038e3d2c164ed36a480c1917451

Made S.M.A.R.T. warning looks similar to other warnings.
---

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 2ae0ecf4ce..a1b0369e6e 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -403,7 +403,7 @@ foreach my $line (@df) {
 		if ($1<5) {
 			# available:plain value in MB, and not %used as 10% is too much to waste on small disk
 			# and root size should not vary during time
-			$warnmessage .= "$Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$1M</b> !\n";
+			$warnmessage .= "<li> $Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$1M</b> !</li>\n";
 		}
 		
 	} else {
@@ -412,7 +412,7 @@ foreach my $line (@df) {
 		if ($1>90) {
 			@temp = split(/ /,$line);
 			$temp2=int(100-$1);
-			$warnmessage .= "$Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$temp2%</b> !\n";
+			$warnmessage .= "<li> $Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$temp2%</b> !</li>\n";
 		}
 	}
 }
@@ -424,7 +424,7 @@ foreach my $file (@files) {
 	my $disk=`echo $file | cut -d"-" -f2`;
 	chomp ($disk);
 	if (`/bin/grep "SAVE ALL DATA" $file`) {
-		$warnmessage .= "$Lang::tr{'smartwarn1'} $disk $Lang::tr{'smartwarn2'}<br>\n";
+		$warnmessage .= "<li> $Lang::tr{'smartwarn1'} /dev/$disk $Lang::tr{'smartwarn2'} !</li>\n\n";
 	}
 }
 
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index f62def280a..25a9267da2 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1509,8 +1509,8 @@
 'sitekeyfile' => 'Sitekeyfile',
 'size' => 'Größe',
 'smart information' => 'SMART-Informationen',
-'smartwarn1' => 'Warnung! Gerät:',
-'smartwarn2' => 'meldet S.M.A.R.T. Fehler!!!',
+'smartwarn1' => 'Gerät:',
+'smartwarn2' => 'meldet S.M.A.R.T. Fehler',
 'smbreload' => 'Samba Dienste durchstarten',
 'smbrestart' => 'Samba neustarten',
 'smbstart' => 'Samba Dienste starten',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c0e560fbb3..3ac238857f 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1541,7 +1541,7 @@
 'sitekeyfile' => 'Sitekeyfile',
 'size' => 'Size',
 'smart information' => 'SMART information',
-'smartwarn1' => 'WARNING: Device:',
+'smartwarn1' => 'Device:',
 'smartwarn2' => 'report S.M.A.R.T. error',
 'smbreload' => 'Samba Dienste durchstarten',
 'smbrestart' => 'restart Samba',