aliases.cgi: Use new system methods

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / system.cgi

diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi
index 487ba996c2e4ef38169c27788d324b3902253d4b..67c4797364090ee2a16ba5e20081d35ffa53bc20 100644 (file)
--- a/html/cgi-bin/system.cgi
+++ b/html/cgi-bin/system.cgi
@@ -33,7 +33,7 @@ require "${General::swroot}/graphs.pl";
 my %color = ();
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 my @querry = split(/\?/,$ENV{'QUERY_STRING'});
 $querry[0] = '' unless defined $querry[0];
@@ -61,12 +61,12 @@ if ( $querry[0] =~ "cpufreq"){
        &Header::closebox();
 
        if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){
-               &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}");
+               &Header::openbox('100%', 'center', "$Lang::tr{'cpu frequency'} $Lang::tr{'graph'}");
                &Graphs::makegraphbox("system.cgi","cpufreq","day");
                &Header::closebox();
        }
 
-       &Header::openbox('100%', 'center', "Load $Lang::tr{'graph'}");
+       &Header::openbox('100%', 'center', "$Lang::tr{'uptime load average'} $Lang::tr{'graph'}");
        &Graphs::makegraphbox("system.cgi","load","day");
        &Header::closebox();