From 71e5a31bc83974756e1a2b24f573202b72828a66 Mon Sep 17 00:00:00 2001
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Fri, 22 Aug 2014 07:58:07 +0000
Subject: [PATCH] Remove a duplicate copy of the header, instead switch to
 using the header2 entity.  Slightly update header2 to match the copy being
 removed.

---
 share/xml/header.ent |  5 +++--
 share/xml/xhtml.xsl  | 36 +-----------------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

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"/>