From: Joern-Ingo Weigert <jiweigert@gmail.com>
Date: Fri, 8 Mar 2013 15:39:32 +0000 (+0100)
Subject: WUI: Make the shown uptime in the footer more beautiful.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=70b1b5d22fb433154fc1143ff2bf7677dcaaf33a

WUI: Make the shown uptime in the footer more beautiful.
---

diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index b97c32613..b28547a89 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -335,9 +335,14 @@ END
 }
 
 sub closepage () {
-    my $status = &connectionstatus();
-    $uptime = `/usr/bin/uptime`;
-        
+	my $status = &connectionstatus();
+	my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`;
+	$uptime =~ s/year(s|)/$Lang::tr{'year'}/;
+	$uptime =~ s/month(s|)/$Lang::tr{'month'}/;
+	$uptime =~ s/day(s|)/$Lang::tr{'day'}/;
+	$uptime =~ s/user(s|)/$Lang::tr{'user'}/;
+	$uptime =~ s/load average/$Lang::tr{'uptime load average'}/;     
+				
     print <<END
                         </div>
                 </div>
diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index c3bf1c9e3..ae644306c 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -335,9 +335,14 @@ END
 }
 
 sub closepage () {
-    my $status = &connectionstatus();
-    $uptime = `/usr/bin/uptime`;
-	
+	my $status = &connectionstatus();
+	my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`;
+	$uptime =~ s/year(s|)/$Lang::tr{'year'}/;
+	$uptime =~ s/month(s|)/$Lang::tr{'month'}/;
+	$uptime =~ s/day(s|)/$Lang::tr{'day'}/;
+	$uptime =~ s/user(s|)/$Lang::tr{'user'}/;
+	$uptime =~ s/load average/$Lang::tr{'uptime load average'}/;     
+				
     print <<END
 			</div>
 		</div>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2c01256b9..41e044089 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1927,6 +1927,8 @@
 'upstream password' => 'Proxy-Passwort:',
 'upstream proxy host:port' => 'Vorgelagerter Proxy (hostname:port)',
 'upstream username' => 'Proxy-Benutzername:',
+'uptime' => 'Betriebszeit',
+'uptime load average' => 'Ø Systemlast',
 'uptime and users' => 'Uptime und Benutzer:',
 'url filter' => 'URL-Filter',
 'urlfilter access' => 'Zugriff',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 17b117fdd..b1d614e02 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1960,6 +1960,8 @@
 'upstream password' => 'Upstream password:',
 'upstream proxy host:port' => 'Upstream proxy (host:port)',
 'upstream username' => 'Upstream username:',
+'uptime' => 'Uptime',
+'uptime load average' => 'Ø Load average',
 'uptime and users' => 'Uptime and users:',
 'url filter' => 'Content Filter',
 'urlfilter access' => 'Access',