Make the h1 titles little lower

So they are more on level with menu

diff --git a/PciIds/Html/Help.pm b/PciIds/Html/Help.pm
index 0911a421bd0d6c84599c6d7d9351aa142fbb180a..619dcc9b845ae8dfb785c3ab00fd6a6cf9560a11 100644 (file)
--- a/PciIds/Html/Help.pm
+++ b/PciIds/Html/Help.pm
@@ -19,8 +19,8 @@ sub getHelp( $$ ) {
        genHtmlHead( $req, $head, undef );
        my $addr = PciIds::Address::new( $req->uri() );
        print "<div class='top'>\n";
-       print "<h1>$head".( defined $addr ? " (".$addr->pretty().")" : "" )."</h1>\n";
        genMenu( $req, $addr, $args, $auth, [ [ 'Help index', 'help', 'index' ] ] );
+       print "<h1>$head</h1>\n";
        print "<div class='clear'></div></div>\n";
        genPath( $req, $addr, 1 );
        my $url = setAddrPrefix( $req->uri(), 'read' ).buildExcept( 'help', $args ).'?help=';

diff --git a/PciIds/Html/List.pm b/PciIds/Html/List.pm
index 72606a90b1884f2446860ec77802ab6353fb04f9..116a33ff821632293308f559d3957ee1417c174f 100644 (file)
--- a/PciIds/Html/List.pm
+++ b/PciIds/Html/List.pm
@@ -25,8 +25,8 @@ sub list( $$$$ ) {
        my $id = $address->top()->pretty();
        genHtmlHead( $req, $id, "<style type='text/css' media='screen,print'>col.id-col { width: ".$address->subIdSize()*1.25."ex; }</style>\n" );
        print "<div class='top'>\n";
-       print '<h1>'.encode( $id ).'</h1>';
        genMenu( $req, $address, $args, $auth, [ [ 'Help', 'help', 'list' ], $address->helpName() ? [ 'ID syntax', 'help', $address->helpName() ] : (), [ '', 'jump' ] ] );
+       print '<h1>'.encode( $id ).'</h1>';
        print "<div class='clear'></div>\n";
        print "</div\n>";
        genPath( $req, $address, 0 );

diff --git a/PciIds/Html/Util.pm b/PciIds/Html/Util.pm
index 784cd70f9750e14aa347637fea28e5f64c73bc38..56c1802edd50cc60d9db86db44ef0715bdb2afa0 100644 (file)
--- a/PciIds/Html/Util.pm
+++ b/PciIds/Html/Util.pm
@@ -189,8 +189,8 @@ sub genLocMenu( $$$$$ ) {
 sub genCustomHead( $$$$$$ ) {
        my( $req, $args, $addr, $caption, $lactions, $ractions ) = @_;
        print "<div class='top'>\n";
-       print "<h1>$caption</h1>\n";
        genLocMenu( $req, $args, $addr, $lactions, $ractions );
+       print "<h1>$caption</h1>\n";
        print "<div class='clear'></div></div>\n";
        genPath( $req, $addr, 1 );
 }

diff --git a/help/list b/help/list
index b403c85cb408a5b2afe95f5bc138bb37dd4b1d3f..6fd64441183bb24cb8b2333e402da71b38e984d7 100644 (file)
--- a/help/list
+++ b/help/list
@@ -24,7 +24,6 @@ Colors are used both in discussion and list of sub-items to mark status of discu
 <h2>Example</h2>
 <div class='help-example'>
 <div class='top'>
-<h1>ID 0000</h1>
 <div class='lmenu'><ul>
        <li><a href='$HELP_URL$newitem'>Add item</a>
        <li><a href='$HELP_URL$newhistory'>Discuss</a>
@@ -33,6 +32,7 @@ Colors are used both in discussion and list of sub-items to mark status of discu
 <div class='rmenu'><ul>
        <li><a href='$HELP_URL$account'>Log in</a>
 </ul></div>
+<h1>ID 0000</h1>
 <div class='clear'></div></div>
 <div class='path'><p><a href='$HELP_URL$index'>Main page</a>&nbsp;-&gt;&nbsp<a href='$HELP_URL$index'>Parent</a></div>
 <h2>ID 0000</h2>

diff --git a/static/screen.css b/static/screen.css
index b1c0d30971710cfffc565a998827c55d692025f2..69315d8b627dc7043abb556b5c0e6d009c267697 100644 (file)
--- a/static/screen.css
+++ b/static/screen.css
@@ -59,13 +59,11 @@ table.admin .item td
 }
 div.lmenu
 {
-       position: relative;
        float: left;
        width: 20%;
 }
 div.rmenu
 {
-       position: relative;
        float: right;
        text-align: right;
        width: 20%;
@@ -74,8 +72,11 @@ div.rmenu
 div.top h1
 {
        text-align: center;
-       height: 0px; /* Hack. Place menu and navigation besides, not below. */
-       margin: 0px;
+       padding-top: 0.5ex;
+}
+div.top ul
+{
+       margin-top: 0px;
 }
 div.clear
 {