Merge branch 'master' of /home/vorner/pciids

[pciids.git] / PciIds / Html / Help.pm

diff --git a/PciIds/Html/Help.pm b/PciIds/Html/Help.pm
index b16e5622fd9c3bdbe0a2bc2699453d6398649792..add3f01c79b573c424f4827b9c3aba6c5f62c7cc 100644 (file)
--- a/PciIds/Html/Help.pm
+++ b/PciIds/Html/Help.pm
@@ -37,19 +37,21 @@ sub getHelp( $$ ) {
        genHtmlHead( $req, $head, undef );
        my $addr = PciIds::Address::new( $req->uri() );
        print "<div class='top'>\n";
-       genMenu( $req, $addr, $args, $auth, [ [ 'Help index', 'help', 'index' ] ] );
-       print "<h1>$head</h1>\n";
+       genMenu( $req, $addr, $args, $auth, [ ( $helpname eq 'index' ) ? () : [ 'Help index', 'help', 'index' ] ] );
+       print "<div class='bluesquare'><h1>$head</h1><p class='home'>The PCI ID Repository</div>\n";
        print "<div class='clear'></div></div>\n";
        genPath( $req, $addr, 1 );
-       my $url = setAddrPrefix( $req->uri(), 'read' ).buildExcept( 'help', $args ).'?help=';
+       my $url = setAddrPrefix( $req->uri(), 'mods' ).buildExcept( 'help', $args ).'?help=';
        delete $args->{'help'};
        my %repls = ( 'HELP_URL' => $url, 'AC_URL' => setAddrPrefix( $req->uri(), 'mods' ).buildExcept( 'action', $args ).'?action=' );
+       $repls{'AC_URL'} =~ s#mods/\?#mods/PC/?#;
+       $repls{'HELP_URL'} =~ s#(mods|read)/\?#$1/PC/?#;
        while( defined( my $line = <HELP> ) ) {
                $line =~ s/\$(\w+_URL)\$/$repls{$1}/g;
                print $line;
        }
        close HELP;
-       genHtmlTail();
+       genHtmlFooter( 1, $req, $args );
        return OK;
 }