]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'jiweigert/XHTML_1.0' into core68
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Mar 2013 15:47:43 +0000 (16:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Mar 2013 15:47:43 +0000 (16:47 +0100)
1  2 
config/cfgroot/header.pl
html/html/themes/ipfire/include/functions.pl
html/html/themes/maniac/include/functions.pl

diff --combined config/cfgroot/header.pl
index 91b54fc3879191e2df587231ae3080ad6c482fc4,7c3682021a24cc7bfc7f3443f69078727e2be177..0f10bf9f863b843cd70128a0a275cde218cb0101
@@@ -161,9 -161,10 +161,9 @@@ sub genmenu 
  
  sub showhttpheaders
  {
 -      print "Pragma: no-cache\n";
 -      print "Cache-control: no-cache\n";
 +      print "Cache-control: private\n";
        print "Connection: close\n";
-       print "Content-type: text/html\n\n";
+       print "Content-type: text/html; charset=UTF-8\n\n";
  }
  
  sub is_menu_visible($) {
index b28547a891b06480b80abd3d8f669827a0a8a14a,4d17594a47bfeb3f7d5913435b02fa9d65591b92..7bf2189a8be1f94ed0b46b1c258ad72ecba4e8c3
@@@ -143,14 -143,12 +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') {
@@@ -179,7 -177,7 +177,7 @@@ EN
  ;
  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-1.9.1.min.js"></script>
      <script type="text/javascript">
          var t_current;
          var t_last;
@@@ -278,14 -276,12 +276,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') {
@@@ -335,14 -331,9 +331,14 @@@ EN
  }
  
  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>
index ae644306c9060c1007f916621b4e48f59a1890ca,3759bbb252bb78bc9cb94034f2a45f8e20681e2c..05c3b948bf1cfb797a8320be9bf9cad0cb9dd444
@@@ -143,14 -143,12 +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') {
@@@ -179,53 -177,66 +177,53 @@@ EN
  ;
  if ($settings{'SPEED'} ne 'off') {
  print <<END
 -                <script type="text/javascript" language="javascript">
 -                 
 -                    var http_request = false;
 -                 
 -                    function LoadInetInfo(url) {
 -                 
 -                        http_request = false;
 -                 
 -                        if (window.XMLHttpRequest) { // Mozilla, Safari,...
 -                            http_request = new XMLHttpRequest();
 -                            if (http_request.overrideMimeType) {
 -                                http_request.overrideMimeType('text/xml');
 -                                // zu dieser Zeile siehe weiter unten
 -                            }
 -                        } else if (window.ActiveXObject) { // IE
 -                            try {
 -                                http_request = new ActiveXObject("Msxml2.XMLHTTP");
 -                            } catch (e) {
 -                                try {
 -                                    http_request = new ActiveXObject("Microsoft.XMLHTTP");
 -                                } catch (e) {}
 -                            }
 -                        }
 -                 
 -                        if (!http_request) {
 -                            alert('Ende :( Kann keine XMLHTTP-Instanz erzeugen');
 -                            return false;
 -                        }
 -                        http_request.onreadystatechange = DisplayInetInfo;
 -                        http_request.open('GET', url, true);
 -                        http_request.send(null);
 -                 
 -                    }
 -                 
 -                    function DisplayInetInfo() {
 -                        if (http_request.readyState == 4) {
 -                             var xmldoc = http_request.responseXML;
 -                             var root1_node = xmldoc.getElementsByTagName('rx_kbs').item(0);
 -                             var root2_node = xmldoc.getElementsByTagName('tx_kbs').item(0);
 -                             var root3_node = xmldoc.getElementsByTagName('rxb').item(0);
 -                             var root4_node = xmldoc.getElementsByTagName('txb').item(0);
 -                
 -                             document.forms['speed'].txkb.value  = root1_node.firstChild.data;
 -                             document.forms['speed'].rxkb.value  = root2_node.firstChild.data;
 -                
 -                                        // document.getElementsByTagName("input")[0].style.color = "#00FF00";
 -                                        url    = "/cgi-bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data;
 -                
 -                              window.setTimeout("LoadInetInfo(url)", 3000);
 -                        }
 -                 
 -                    }
 -                </script>
 +    <script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script>
 +    <script type="text/javascript">
 +        var t_current;
 +        var t_last;
 +        var rxb_current;
 +        var rxb_last;
 +        var txb_current;
 +        var txb_last;
 +                              function refreshInetInfo() {
 +                                              \$.ajax({
 +                                                              url: '/cgi-bin/speed.cgi',
 +                                                                                      success: function(xml){
 +                                                                                      t_current = new Date();
 +                                                                                      var t_diff = t_current - t_last;
 +                                                                                      t_last = t_current;
 +                              
 +                                                                                      rxb_current = \$("rxb",xml).text();
 +                                                                                      var rxb_diff = rxb_current - rxb_last;
 +                                                                                      rxb_last = rxb_current;
 +                              
 +                                                                                      var rx_kbs = rxb_diff/t_diff;
 +                                                                                      rx_kbs = Math.round(rx_kbs*10)/10;
 +                              
 +                                                                                      txb_current = \$("txb",xml).text();
 +                                                                                      var txb_diff = txb_current - txb_last;
 +                                                                                      txb_last = txb_current;
 +                              
 +                                                                                      var tx_kbs = txb_diff/t_diff;
 +                                                                                      tx_kbs = Math.round(tx_kbs*10)/10;
 +                              
 +                                                                                      \$("#rx_kbs").text(rx_kbs + ' kb/s');
 +                                                                                      \$("#tx_kbs").text(tx_kbs + ' kb/s');
 +                                                                                      }
 +                                                              });
 +                                                              window.setTimeout("refreshInetInfo()", 3000);
 +                                              }
 +                                              \$(document).ready(function(){
 +                                              refreshInetInfo();
 +                              });
 +    </script>
    </head>
 -  <body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')">
 +  <body>
  END
  ;
  }
  else {
 -print "</head><body>";}
 +print "</head>\n<body>";}
  print <<END
  <!-- IPFIRE HEADER -->
  
@@@ -278,14 -289,12 +276,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') {
@@@ -335,14 -344,9 +331,14 @@@ EN
  }
  
  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>
@@@ -367,9 -371,10 +363,9 @@@ EN
  if ($settings{'SPEED'} ne 'off') {
  print <<END                        
                          <br />
 -                        <form name='speed'>
 -                                <b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: none; padding: 0; background-color: #000000; vertical-align: middle" />
 -                                $Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: none; padding: 0; background-color: #000000; vertical-align: middle"/>
 -                        </form>
 +                                <b>$Lang::tr{'bandwidth usage'}:</b>
 +                              $Lang::tr{'incoming'}: <span id="rx_kbs"></span>&nbsp;$Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
 +
  END
  ;
  }