]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/html/themes/ipfire/include/functions.pl
projects / people / teissler / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix spacing in new uptime bar.
[people/teissler/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 b97c32613bd8399d571518d8cd84b1e1672db355..086ff183e4ca2b6a76650aff23995e0ac8d2e9e8 100644 (file)
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -143,14 +143,12 @@ 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') {
@@ -163,6 +161,7 @@ END
     print <<END
     <link rel="shortcut icon" href="/favicon.ico" />
     <link rel="stylesheet" type="text/css" href="/themes/ipfire/include/style.css" />
+    $extrahead
     <script language="javascript" type="text/javascript">
       
         function swapVisibility(id) {
@@ -225,38 +224,36 @@ END
 ;
 }
 else {
-print "</head><body>";}
+       print "</head><body>";}
 print <<END
 <!-- IPFIRE HEADER -->
 
 <div id="header">
-
-        <div id="header_inner" class="fixed">
-
-                <div id="logo">
+       <div id="header_inner" class="fixed">
+               <div id="logo">
 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 <<END
-                        <h2>$h2</h2>
-                </div>
-
+if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
+    print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
+} 
+else {
+    print "<h1><span>IPFire</span></h1><br />";
+}
+print <<END
+                       <h2>$h2</h2>
+               </div>
 END
 ;
-        &showmenu();
+&showmenu();
 
 print <<END     
-        </div>
+       </div>
 </div>
 
 <div id="main">
-        <div id="main_inner" class="fixed">
-                <div id="primaryContent_2columns">
-                        <div id="columnA_2columns">
+       <div id="main_inner" class="fixed">
+               <div id="primaryContent_2columns">
+                       <div id="columnA_2columns">
 END
 ;
 }
@@ -278,14 +275,11 @@ 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>
 END
 ;
     if ($settings{'FX'} ne 'off') {
@@ -298,6 +292,7 @@ END
     print <<END
     <link rel="shortcut icon" href="/favicon.ico" />
     <link rel="stylesheet" type="text/css" href="/include/style.css" />
+    $extrahead
     <script language="javascript" type="text/javascript">
       
         function swapVisibility(id) {
@@ -310,68 +305,64 @@ END
             }
         }
     </script>
-
   </head>
   <body>
 <!-- IPFIRE HEADER -->
-
-<div id="header">
-
-        <div id="header_inner" class="fixed">
-
-                <div id="logo">
-                        <h1><span>IPFire</span></h1>
-                        <h2>$h2</h2>
-                </div>  
-        </div>
-</div>
-
-<div id="main">
-        <div id="main_inner" class="fixed">
-                <div id="primaryContent_2columns">
-                        <div id="columnA_2columns">
+       <div id="header">
+               <div id="header_inner" class="fixed">
+                       <div id="logo">
+                               <h1><span>IPFire</span></h1>
+                               <h2>$h2</h2>
+                       </div>  
+               </div>
+       </div>
+       <div id="main">
+               <div id="main_inner" class="fixed">
+                       <div id="primaryContent_2columns">
+                               <div id="columnA_2columns">
 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>
-
-                <div id="secondaryContent_2columns">
-                
-                        <div id="columnC_2columns">
+                               </div>
+                       </div>
+                       <div id="secondaryContent_2columns">
+                               <div id="columnC_2columns">
 END
 ;
     &showsubsection($menu);
     &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') {
 print <<END                        
-                        <br />
-                                <b>$Lang::tr{'bandwidth usage'}:</b>
+                               <br />
+                               <b>$Lang::tr{'bandwidth usage'}:</b>
                                $Lang::tr{'incoming'}: <span id="rx_kbs"></span>&nbsp;$Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
-
 END
 ;
 }
 print <<END
-                </div>
-        </div>
-</div>
+                       </div>
+               </div>
+       </div>
 </body>
 </html>
 END
@@ -388,25 +379,25 @@ sub closebigbox
 
 sub openbox
 {
-        $width = $_[0];
-        $align = $_[1];
-        $caption = $_[2];
+       $width = $_[0];
+       $align = $_[1];
+       $caption = $_[2];
 
-        print <<END
+    print <<END
 <!-- openbox -->
-        <div class="post" align="$align">
+    <div class="post" style="text-align:$align">
 END
 ;
 
-        if ($caption) { print "<h3>$caption</h3>\n"; } else { print "&nbsp;"; }
+    if ($caption) { print "<h3>$caption</h3>\n"; } else { print "&nbsp;"; }
 }
 
 sub closebox
 {
-        print <<END
-        </div>
-        <br class="clear" />
-        <!-- closebox -->
+    print <<END
+    </div>
+    <br class="clear" />
+    <!-- closebox -->
 END
 ;
 }
Timo's tree of IPFire 2.x