From owner-svn-doc-head@FreeBSD.ORG  Tue Nov  4 02:53:10 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 782F0CBE;
 Tue,  4 Nov 2014 02:53:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 647CEEF;
 Tue,  4 Nov 2014 02:53:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA42rATp088804;
 Tue, 4 Nov 2014 02:53:10 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA42rA9m088803;
 Tue, 4 Nov 2014 02:53:10 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201411040253.sA42rA9m088803@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Tue, 4 Nov 2014 02:53:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45917 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Nov 2014 02:53:10 -0000

Author: gavin
Date: Tue Nov  4 02:53:09 2014
New Revision: 45917
URL: https://svnweb.freebsd.org/changeset/doc/45917

Log:
  Move the <form> surrounding the website searchbox to the same entity as
  the <input> fields.

Modified:
  head/share/xml/header.ent

Modified: head/share/xml/header.ent
==============================================================================
--- head/share/xml/header.ent	Mon Nov  3 13:52:10 2014	(r45916)
+++ head/share/xml/header.ent	Tue Nov  4 02:53:09 2014	(r45917)
@@ -48,8 +48,13 @@
   </div>
 '>
 
-<!ENTITY header2.searchinputs '
-	<div xmlns="http://www.w3.org/1999/xhtml">
+<!ENTITY header2.searchbox '
+  <div id="search" xmlns="http://www.w3.org/1999/xhtml">
+    <form action="&cgibase;/search.cgi" method="get">
+      <div>
+        <h2 class="blockhide"><label for="words">&header2.word.search;</label></h2>
+
+	<div>
             <input type="hidden" name="max" value="25" />
             <input type="hidden" name="source" value="www" />
             <input id="words" name="words" type="text" size="20"
@@ -59,6 +64,9 @@
 	    <span>&nbsp;</span>
             <input id="submit" name="submit" type="submit" value="&header2.word.search;" />
 	</div>
+      </div>
+    </form>
+  </div> <!-- SEARCH -->
 '>
 
 <!ENTITY header2.topnav.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Site Navigation</h2>'>
@@ -173,18 +181,8 @@
     <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 -->
+      &header2.searchbox;
     </div> <!-- HEADERLOGORIGHT -->
   </div> <!-- HEADER -->