HTML: Add language attribute

[people/pmueller/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 7f6000a46d3c5d1641e7cdb8b5113b706d7dee80..f90cd5feaf83787d0297ce526cd9d24fb20f0722 100644 (file)
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -31,15 +31,13 @@
  # IPFire default theme.                                                       #
  ###############################################################################
  
-require "${General::swroot}/lang.pl";
-
  ###############################################################################
  #
  # print menu html elements for submenu entries
  # @param submenu entries
  sub showsubmenu() {
         my $submenus = shift;
-       
+
         print "<ul>";
         foreach my $item (sort keys %$submenus) {
                 $link = getlink($submenus->{$item});
@@ -101,34 +99,26 @@ sub openpage {
         my $title = shift;
         my $boh = shift;
         my $extrahead = shift;
-       my $suppressMenu = shift;
+       my $suppressMenu = shift // 0;
         my @tmp = split(/\./, basename($0));
         my $scriptName = @tmp[0];
  
-       @URI=split ('\?',  $ENV{'REQUEST_URI'} );
-       &General::readhash("${swroot}/main/settings", \%settings);
-       &genmenu();
-
         my $headline = "IPFire";
         if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
                 $headline =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
         }
  
-       my @stylesheets = ("style.css");
-       if ($THEME_NAME eq "ipfire-rounded") {
-               push(@stylesheets, "style-rounded.css");
-       }
-
  print <<END;
  <!DOCTYPE html>
-<html>
+<html lang="$language">
         <head>
         <title>$headline - $title</title>
-       $extrahead
         <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>
  
+       $extrahead
         <script type="text/javascript">
                 function swapVisibility(id) {
                         \$('#' + id).toggle();
@@ -136,9 +126,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 +142,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
  ;
@@ -168,12 +158,30 @@ print <<END
  END
  ;
  
-&showmenu() if ($suppressMenu != 1);
+unless($suppressMenu) {
+       &genmenu();
+       &showmenu();
+}
  
  print <<END
         <div class="bigbox fixed">
                 <div id="main_inner" class="fixed">
-                       <h1>$title</h1>
+                       <div id="main_header">
+                               <h1>$title</h1>
+END
+;
+
+# Print user manual link
+my $manual_url = &Header::get_manualpage_url($scriptName);
+if($manual_url) {
+       print <<END
+                               <span><a href="$manual_url" title="$Lang::tr{'online help en'}" target="_blank"><img src="/images/help-browser.png" alt="$Lang::tr{'online help en'}"></a></span>
+END
+;
+}
+
+print <<END
+                       </div>
  END
  ;
  }
@@ -205,8 +213,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>
@@ -258,5 +266,3 @@ sub openbox {
  sub closebox {
         print "</div>";
  }
-
-1;