Merge remote-tracking branch 'origin/next' into fifteen

[people/pmueller/ipfire-2.x.git] / html / html / themes / ipfire / include / functions.pl

diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index 4d17594a47bfeb3f7d5913435b02fa9d65591b92..2707593dbcd8e4a80c4dcf2e1f1881d1f45458da 100644 (file)
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -177,7 +177,7 @@ END
 ;
 if ($settings{'SPEED'} ne 'off') {
 print <<END
-    <script type="text/javascript" src="/include/jquery-1.2.6.min.js"></script>
+    <script type="text/javascript" src="/include/jquery.js"></script>
     <script type="text/javascript">
         var t_current;
         var t_last;
@@ -331,9 +331,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>
@@ -347,12 +352,11 @@ END
     &showsubsubsection($menu);
 
         print <<END                     
-                        </div>
-                </div>
-
-                <br class="clear" />    
-                <div id="footer" class="fixed">
-                        <b>Status:</b> $status <b>Uptime:</b>$uptime
+                               </div>
+            </div>
+            <br class="clear" />    
+                       <div id="footer" class="fixed">
+                               <b>Status:</b> $status <b>Uptime:</b> $uptime
 END
 ;
 if ($settings{'SPEED'} ne 'off') {