ipfire theme: Fix default setting for hostname in title.

[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 0ead967ae1ef57c2b184842e015ac145ba8e704a..0c47cd456bbee33e732d848e2601304e22f133a8 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'}";
         }
  
@@ -120,7 +120,7 @@ sub openpage {
         }
  
  print <<END;
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
  <html>
         <head>
         <title>$headline - $title</title>
@@ -128,6 +128,12 @@ print <<END;
         <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 type="text/javascript">
+               function swapVisibility(id) {
+                       \$('#' + id).toggle();
+               }
+       </script>
  END
  
         foreach my $stylesheet (@stylesheets) {
@@ -232,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";