diff --git a/share/xml/header.ent b/share/xml/header.ent index fdebbb0ef8..1873f42dbd 100644 --- a/share/xml/header.ent +++ b/share/xml/header.ent @@ -162,9 +162,9 @@ <!ENTITY header2 ' &header2.skipnav; -<div id="headercontainer"> +<div xmlns="http://www.w3.org/1999/xhtml" id="headercontainer"> <div id="header"> - <h2 class="blockhide">Header And Logo</h2> + &header2.logo-red.label;` <div id="headerlogoleft"> &header2.logo-red; @@ -188,6 +188,7 @@ </div> <!-- HEADERLOGORIGHT --> </div> <!-- HEADER --> + &header2.topnav.label; &header2.topnav; </div> <!-- HEADERCONTAINER --> '> diff --git a/share/xml/xhtml.xsl b/share/xml/xhtml.xsl index 03a9e8a923..e4ee275302 100644 --- a/share/xml/xhtml.xsl +++ b/share/xml/xhtml.xsl @@ -51,41 +51,7 @@ <body> <div id="containerwrap"> <div id="container"> - &header2.skipnav; - - <div id="headercontainer"> - <div id="header"> - - &header2.logo-red.label; - - <div id="headerlogoleft"> - &header2.logo-red; - </div> <!-- HEADERLOGOLEFT --> - - <div id="headerlogoright"> - &header2.donatebutton; - - &header2.searchnav.label; - - &header2.searchnav; - - <div id="search"> - <form action="&cgibase;/search.cgi" method="get"> - <div> - <h2 class="blockhide"><label for="words">&header2.word.search;</label></h2> - - &header2.searchinputs; - </div> - </form> - </div> <!-- SEARCH --> - </div> <!-- HEADERLOGORIGHT --> - </div> <!-- HEADER --> - - &header2.topnav.label; - - &header2.topnav; - - </div> <!-- HEADERCONTAINER --> + &header2; <div id="content"> <xsl:call-template name="process.content"/>