Hardcode theme to ipfire

[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 eedf069dda153450192f952197413fa7aad85fe1..9f12bbe5907a6861f9e2c685fb3184e153e01176 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
         }
@@ -114,10 +114,6 @@ sub openpage {
                 $headline =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
         }
  
-       my @stylesheets = ("style.css");
-       if ($THEME_NAME eq "ipfire-rounded") {
-               push(@stylesheets, "style-rounded.css");
-       }
  
  print <<END;
  <!DOCTYPE html>
@@ -128,6 +124,7 @@ print <<END;
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="shortcut icon" href="/favicon.ico" />
         <script type="text/javascript" src="/include/jquery.js"></script>
+       <script src="/include/rrdimage.js"></script>
  
         <script type="text/javascript">
                 function swapVisibility(id) {
@@ -136,9 +133,9 @@ print <<END;
         </script>
  END
  
-       foreach my $stylesheet (@stylesheets) {
-               print "<link href=\"/themes/ipfire/include/css/$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n";
-       }
+
+print "<link href=\"/themes/ipfire/include/css/style.css\" rel=\"stylesheet\" type=\"text/css\" />\n";
+
  
  if ($settings{'SPEED'} ne 'off') {
  print <<END
@@ -152,7 +149,7 @@ print <<END
         <body>
                 <div id="header" class="fixed">
                         <div id="logo">
-                               <a href="http://www.ipfire.org" style="text-decoration: none;">
+                               <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
  ;
@@ -205,8 +202,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>