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 3bc762ced550fb4ec0042497f904591d757fa737..63740d42d8385cf008b86d30d6fd2d376bca5329 100644 (file)
--- 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 '<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>";
@@ -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 <<END
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+       my @stylesheets = ("style.css");
+       if ($THEME_NAME eq "ipfire-rounded") {
+               push(@stylesheets, "style-rounded.css");
+       }
+
+print <<END;
+<!DOCTYPE html>
  <html>
         <head>
         <title>$headline - $title</title>
         $extrahead
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <link rel="shortcut icon" href="/favicon.ico" />
-       <link href="/themes/ipfire/include/css/style.css" rel="stylesheet" type="text/css"  />
         <script type="text/javascript" src="/include/jquery.js"></script>
+
+       <script type="text/javascript">
+               function swapVisibility(id) {
+                       \$('#' + id).toggle();
+               }
+       </script>
  END
-;
+
+       foreach my $stylesheet (@stylesheets) {
+               print "<link href=\"/themes/ipfire/include/css/$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n";
+       }
+
  if ($settings{'SPEED'} ne 'off') {
  print <<END
         <script type="text/javascript" src="/themes/ipfire/include/js/refreshInetInfo.js"></script>
@@ -139,7 +154,7 @@ print <<END
                         <div id="logo">
  END
  ;
-       if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
+       if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
                 print "<h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
         } else {
                 print "<h1>IPFire</h1>";
@@ -179,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;
@@ -223,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";