X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fhtml%2Fthemes%2Fmaniac%2Finclude%2Ffunctions.pl;h=1c0aea1c4d8f8dcf796931137e40ffba4e671d2c;hb=725396af2c8d180a687044ff9896d4eab3357998;hp=c3bf1c9e38c56534701e1708128ce0135a253e01;hpb=8999627f8abfc83172728c2e3d0f3cfbe1f1f1c4;p=ipfire-2.x.git

diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index c3bf1c9e38..1c0aea1c4d 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -143,27 +143,15 @@ sub openpage {
     }
 
     print <<END
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-  <head>
-  <title>$title</title>
-
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+		<title>$title</title>
     $extrahead
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-END
-;
-    if ($settings{'FX'} ne 'off') {
-    print <<END
-    <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" />
-    <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" />
-END
-;
-    }
-    print <<END
     <link rel="shortcut icon" href="/favicon.ico" />
     <link rel="stylesheet" type="text/css" href="/themes/maniac/include/style.css" />
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
       
         function swapVisibility(id) {
             el = document.getElementById(id);
@@ -179,7 +167,7 @@ END
 ;
 if ($settings{'SPEED'} ne 'off') {
 print <<END
-    <script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script>
+    <script type="text/javascript" src="/include/jquery.js"></script>
     <script type="text/javascript">
         var t_current;
         var t_last;
@@ -239,7 +227,7 @@ END
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
     } else {
-				print "<h1><span>-= IPFire =-</span></h1><br />";
+				print "<h1><span><a href='https://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
 		}
 		print <<END
 			<h2>+ $h2 +</h2>
@@ -278,14 +266,12 @@ sub openpagewithoutmenu {
     }
 
     print <<END
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-  <head>
-  <title>$title</title>
-
-    $extrahead
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+		<title>$title</title>
+		$extrahead
 END
 ;
     if ($settings{'FX'} ne 'off') {
@@ -298,7 +284,7 @@ END
     print <<END
     <link rel="shortcut icon" href="/favicon.ico" />
     <link rel="stylesheet" type="text/css" href="/include/style.css" />
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
       
         function swapVisibility(id) {
             el = document.getElementById(id);
@@ -335,9 +321,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>
@@ -350,13 +341,12 @@ END
     &showsubsection($menu);
     &showsubsubsection($menu);
 
-	print <<END			
+	print <<END
+				</div>
 			</div>
-		</div>
-
-		<br class="clear" />	
-		<div id="footer" class="fixed">
-			<b>Status:</b> $status <b>Uptime:</b>$uptime
+			<br class="clear" />	
+			<div id="footer" class="fixed">
+				<b>Status:</b> $status <b>Uptime:</b> $uptime
 END
 ;
 if ($settings{'SPEED'} ne 'off') {
