ipfire-new: Fix positioning of the page headline.

[people/teissler/ipfire-2.x.git] / html / html / themes / ipfire-new / include / functions.pl

diff --git a/html/html/themes/ipfire-new/include/functions.pl b/html/html/themes/ipfire-new/include/functions.pl
index b644c073d5b5246aaf01ad206df6cf8942489275..346b1fd21e4f8bd1be360a8a20d62626b7dc5918 100644 (file)
--- a/html/html/themes/ipfire-new/include/functions.pl
+++ b/html/html/themes/ipfire-new/include/functions.pl
@@ -73,13 +73,19 @@ sub showmenu() {
                &showsubmenu($submenus) if ($submenus);
                print "</li>";
        }
+       print "</ul>";
+
        if ($settings{'SPEED'} ne 'off') {
-               print"<div id='traffic'>";
-               print"<table><tr><td style='font-weight: bold;'>Traffic: &nbsp;</td>";
-               print"<td id='bandwidthCalculationContainer'>In <span id='rx_kbs'></span> &nbsp; Out <span id='tx_kbs'></span></td>";
-               print"</tr></table>";
-               print '</ul></div></div>';
+               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>
+                       </div>
+EOF
        }
+
+       print "</div>";
 }
 
 ###############################################################################
@@ -154,7 +160,6 @@ END
        }
 
 print <<END
-                               <h2>$h2</h2>
                        </div>
                </div>
 END
@@ -165,6 +170,8 @@ END
 print <<END
 <div id="main">
        <div id="main_inner" class="fixed">
+               <h1>$h2</h1>
+
                <div id="columnA_2columns">
 END
 ;