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=3bc762ced550fb4ec0042497f904591d757fa737;hb=6e8089a94f5cb8b9baafa1afd8dc01d3baa9fd6d;hpb=dd2ef3b2370e89a79dc01ada8aa1f00d8f0615ee diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 3bc762ced..63740d42d 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -32,6 +32,7 @@ ############################################################################### require "${General::swroot}/lang.pl"; + ############################################################################### # # print menu html elements for submenu entries @@ -79,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 "
    • "; @@ -109,22 +110,36 @@ sub openpage { &genmenu(); my $headline = "IPFire"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { + if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) { $headline = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}"; } -print < + my @stylesheets = ("style.css"); + if ($THEME_NAME eq "ipfire-rounded") { + push(@stylesheets, "style-rounded.css"); + } + +print < $headline - $title $extrahead - + + END -; + + foreach my $stylesheet (@stylesheets) { + print "\n"; + } + if ($settings{'SPEED'} ne 'off') { print < @@ -139,7 +154,7 @@ print <