theme: Fix spacing of version string in footer.

[people/teissler/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 b3b26b96a84ddb014446f50ce5b9253c57fc95c6..63740d42d8385cf008b86d30d6fd2d376bca5329 100644 (file)
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -80,7 +80,7 @@ EOF
        foreach my $k1 ( sort keys %$menu ) {
                $link = getlink($menu->{$k1});
                next if (!is_menu_visible($link) or $link eq '');
-               print '<li class="has-sub "><a><span>'.$menu->{$k1}->{'caption'}.'</span></a>';
+               print '<li class="has-sub "><a href="#"><span>'.$menu->{$k1}->{'caption'}.'</span></a>';
                my $submenus = $menu->{$k1}->{'subMenu'};
                &showsubmenu($submenus) if ($submenus);
                print "</li>";
@@ -110,7 +110,7 @@ sub openpage {
        &genmenu();
 
        my $headline = "IPFire";
-       if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
+       if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
                $headline =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
        }
 
@@ -129,7 +129,7 @@ print <<END;
        <link rel="shortcut icon" href="/favicon.ico" />
        <script type="text/javascript" src="/include/jquery.js"></script>
 
-       <script language="javascript" type="text/javascript">
+       <script type="text/javascript">
                function swapVisibility(id) {
                        \$('#' + id).toggle();
                }
@@ -194,7 +194,7 @@ sub openpagewithoutmenu {
 sub closepage () {
        open(FILE, "</etc/system-release");
        my $system_release = <FILE>;
-       $system_release =~ s/core/Core Update/;
+       $system_release =~ s/core/Core Update /;
        close(FILE);
 
 print <<END;
@@ -238,7 +238,12 @@ sub openbox {
        $align = $_[1];
        $caption = $_[2];
 
-       print "<div class='post' align='$align'>\n";
+       if($align eq 'center') {
+               print "<div class='post' align='center'>\n"
+       }
+       else {
+               print "<div class='post'>\n";
+       }
 
        if ($caption) {
                print "<h2>$caption</h2>\n";