svn commit: r45490 - head/share/xml

Fri Aug 22 07:58:08 UTC 2014

Author: gavin
Date: Fri Aug 22 07:58:07 2014
New Revision: 45490
URL: http://svnweb.freebsd.org/changeset/doc/45490

Log:
  Remove a duplicate copy of the header, instead switch to using the header2
  entity.  Slightly update header2 to match the copy being removed.

Modified:
  head/share/xml/header.ent
  head/share/xml/xhtml.xsl

Modified: head/share/xml/header.ent
==============================================================================

--- head/share/xml/header.ent	Fri Aug 22 02:03:25 2014	(r45489)
+++ head/share/xml/header.ent	Fri Aug 22 07:58:07 2014	(r45490)
@@ -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 -->
 '>

Modified: head/share/xml/xhtml.xsl
==============================================================================
--- head/share/xml/xhtml.xsl	Fri Aug 22 02:03:25 2014	(r45489)
+++ head/share/xml/xhtml.xsl	Fri Aug 22 07:58:07 2014	(r45490)
@@ -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"/>
