]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/html/themes/ipfire/include/functions.pl
projects / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into 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 0c47cd456bbee33e732d848e2601304e22f133a8..5ea3f9fa777056d37c26f39e82ea6a6c1eb16ed8 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});
@@ -69,9 +67,9 @@ sub showmenu() {
        if ($settings{'SPEED'} ne 'off') {
                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>
+                               <strong>$Lang::tr{'traffic stat title'}:</strong>
+                               $Lang::tr{'traffic stat in'} <span id='rx_kbs'>--.-- bit/s</span> &nbsp;
+                               $Lang::tr{'traffic stat out'} <span id='tx_kbs'>--.-- bit/s</span>
                        </div>
 EOF
        }
@@ -101,34 +99,24 @@ sub openpage {
        my $title = shift;
        my $boh = shift;
        my $extrahead = shift;
-       my $suppressMenu = shift;
-       my @tmp = split(/\./, basename($0));
-       my $scriptName = @tmp[0];
-
-       @URI=split ('\?',  $ENV{'REQUEST_URI'} );
-       &General::readhash("${swroot}/main/settings", \%settings);
-       &genmenu();
+       my $suppressMenu = shift // 0;
 
        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 +124,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?v=20240125\" rel=\"stylesheet\" type=\"text/css\" />\n";
+
 
 if ($settings{'SPEED'} ne 'off') {
 print <<END
@@ -152,26 +140,47 @@ print <<END
        <body>
                <div id="header" class="fixed">
                        <div id="logo">
+                               <h1>
+                                       <a href="https://www.ipfire.org">
+                                               IPFire_
+                                       </a>
 END
 ;
        if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
-               print "<h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
-       } else {
-               print "<h1>IPFire</h1>";
+               print "&dash; $settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
        }
 
 print <<END
+                               </h1>
                        </div>
                </div>
 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();
+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
 ;
 }
@@ -194,7 +203,7 @@ sub openpagewithoutmenu {
 sub closepage () {
        open(FILE, "</etc/system-release");
        my $system_release = <FILE>;
-       $system_release =~ s/core/Core Update/;
+       $system_release =~ s/core/$Lang::tr{'core update'} /;
        close(FILE);
 
 print <<END;
@@ -203,8 +212,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>
@@ -256,5 +265,3 @@ sub openbox {
 sub closebox {
        print "</div>";
 }
-
-1;
IPFire 2.x development tree