X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fhtml%2Fthemes%2Fipfire%2Finclude%2Ffunctions.pl;h=63740d42d8385cf008b86d30d6fd2d376bca5329;hp=0ead967ae1ef57c2b184842e015ac145ba8e704a;hb=6e8089a94f5cb8b9baafa1afd8dc01d3baa9fd6d;hpb=9063a04e94587fc38f410ec2234275417de201ad diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 0ead967ae..63740d42d 100644 --- 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 '
  • '.$menu->{$k1}->{'caption'}.''; + print '
  • '.$menu->{$k1}->{'caption'}.''; my $submenus = $menu->{$k1}->{'subMenu'}; &showsubmenu($submenus) if ($submenus); print "
    • "; @@ -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'}"; } @@ -120,7 +120,7 @@ sub openpage { } print < + $headline - $title @@ -128,6 +128,12 @@ print < + + END foreach my $stylesheet (@stylesheets) { @@ -188,7 +194,7 @@ sub openpagewithoutmenu { sub closepage () { open(FILE, "; - $system_release =~ s/core/Core Update/; + $system_release =~ s/core/Core Update /; close(FILE); print <\n"; + if($align eq 'center') { + print "
    \n" + } + else { + print "
    \n"; + } if ($caption) { print "

    $caption

    \n";