EOF if ( defined($Hosts) && defined($host) && defined($Hosts->{$host}) ) { - print "

"; NavSectionTitle("${EscHTML($host)}"); - print < -

-EOF + NavSectionStart($host); NavLink("?host=${EscURI($host)}", "$host $Lang->{Home}", " class=\"navbar\""); NavLink("?action=browse&host=${EscURI($host)}", @@ -486,23 +484,16 @@ NavLink("?action=view&type=config&host=${EscURI($host)}", $Lang->{Config_file}, " class=\"navbar\""); } - print "

\n"; - } - print("

\n$content\n"); - if ( defined($contentSub) && ref($contentSub) eq "CODE" ) { - while ( (my $s = &$contentSub()) ne "" ) { - print($s); - } + unless ( defined($Hosts) && defined($host) && defined($Hosts->{$host}) ) { + print("

"); + } + print "
"; + NavSectionEnd(); } - print($contentPost) if ( defined($contentPost) ); - print <

-

-EOF my $hostSelectbox = ""; my @hosts = GetUserHosts($Conf{CgiNavBarAdminAllHosts}); NavSectionTitle($Lang->{Hosts}); + NavSectionStart($Lang->{Hosts}); if ( defined($Hosts) && %$Hosts > 0 && @hosts ) { foreach my $host ( @hosts ) { NavLink("?host=${EscURI($host)}", $host) @@ -529,18 +520,33 @@ EOF } + NavSectionEnd(); NavSectionTitle($Lang->{NavSectionTitle_}); + NavSectionStart($Lang->{NavSectionTitle_}); foreach my $l ( @adminLinks ) { if ( $PrivAdmin || !$l->{priv} ) { my $txt = $l->{lname} ne "" ? $Lang->{$l->{lname}} : $l->{name}; NavLink($l->{link}, $txt); } } - print <

+
+EOF + NavSectionEnd(); + print < EOF + print("

\n$content\n"); + if ( defined($contentSub) && ref($contentSub) eq "CODE" ) { + while ( (my $s = &$contentSub()) ne "" ) { + print($s); + } + } + print($contentPost) if ( defined($contentPost) ); + print <

+

+EOF } sub Trailer @@ -550,21 +556,27 @@ EOF } - sub NavSectionTitle { my($head) = @_; print <$head

$head

+/-

EOF } sub NavSectionStart { + my($headdiv) = @_; + print < +EOF } sub NavSectionEnd { + print < +EOF } sub NavLink