Merge remote-tracking branch 'origin/next'

[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 f71181e6323f27b25fd2bdc98552fd79dea7d17f..9aec77497b886941de0a8213d8408f5c1a38e360 100644 (file)
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -70,8 +70,8 @@ sub showmenu() {
                 print <<EOF;
                         <div id='traffic'>
                                 <strong>Traffic:</strong>
-                               In  <span id='rx_kbs'>--.-- Bit/s</span> &nbsp;
-                               Out <span id='tx_kbs'>--.-- Bit/s</span>
+                               In  <span id='rx_kbs'>--.-- bit/s</span> &nbsp;
+                               Out <span id='tx_kbs'>--.-- bit/s</span>
                         </div>
  EOF
         }
@@ -110,7 +110,7 @@ sub openpage {
         &genmenu();
  
         my $headline = "IPFire";
-       if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
+       if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
                 $headline =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
         }
  
@@ -152,12 +152,14 @@ print <<END
         <body>
                 <div id="header" class="fixed">
                         <div id="logo">
+                               <a href="https://www.ipfire.org" style="text-decoration: none;">
+                                       <img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
  END
  ;
         if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
-               print "<h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
+               print "</a><h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
         } else {
-               print "<h1>IPFire</h1>";
+               print "<h1>IPFire</h1></a>";
         }
  
  print <<END
@@ -194,7 +196,7 @@ sub openpagewithoutmenu {
  sub closepage () {
         open(FILE, "</etc/system-release");
         my $system_release = <FILE>;
-       $system_release =~ s/core/Core Update/;
+       $system_release =~ s/core/Core Update /;
         close(FILE);
  
  print <<END;
@@ -203,8 +205,8 @@ print <<END;
  
         <div id="footer" class='bigbox fixed'>
                 <span class="pull-right">
-                       <a href="http://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> &bull;
-                       <a href="http://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a>
+                       <a href="https://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> &bull;
+                       <a href="https://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a>
                 </span>
  
                 <strong>$system_release</strong>