From df7555a6db5a44ecf1857a0ee1c79e0707e14c3a Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Thu, 14 Jul 2011 19:50:11 +0000
Subject: All new dynamic transformations and processing and tidyup and stuff

---
 gentoobrowse/present/search.xml |  4 ++--
 gentoobrowse/xslt/search.xslt   | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gentoobrowse/present/search.xml b/gentoobrowse/present/search.xml
index f2378ab..cbac4d0 100644
--- a/gentoobrowse/present/search.xml
+++ b/gentoobrowse/present/search.xml
@@ -9,7 +9,7 @@
 			<apply-to source="param" name="bcriteria" default="" />
 		</project2:regexcheck>
 		<project2:rawview name="a-packages">
-			<form caption="Package Search" submit="Search" action="/search" method="get" autofocus="criteria">
+			<form caption="Package Search" submit="Search" action="/search" method="get" autofocus="criteria" order="1">
 				<input type="text" caption="Criteria" name="criteria"
 						xslvalue="/gentoo/project2:params/project2:param[@name='criteria']/@value" />
 			</form>
@@ -31,7 +31,7 @@
 			<apply-to source="param" name="criteria" default="" />
 		</project2:regexcheck>
 		<project2:rawview name="b-bugs">
-			<form caption="Bug Search" submit="Search" action="/search" method="get">
+			<form caption="Bug Search" submit="Search" action="/search" method="get" order="2">
 				<input type="text" caption="Criteria" name="bcriteria"
 						xslvalue="/gentoo/project2:params/project2:param[@name='bcriteria']/@value" />
 			</form>
diff --git a/gentoobrowse/xslt/search.xslt b/gentoobrowse/xslt/search.xslt
index 06bd5b7..cd5cb6a 100644
--- a/gentoobrowse/xslt/search.xslt
+++ b/gentoobrowse/xslt/search.xslt
@@ -3,13 +3,15 @@
 	xmlns:project2="http://project2.randomdan.homeip.net" exclude-result-prefixes="project2" >
   <xsl:import href="base.xslt" />
   <xsl:import href="form.xslt" />
-  <xsl:output  encoding="utf-8"  method="xml" media-type="text/html" indent="yes"
+  <xsl:output encoding="utf-8"  method="xml" media-type="text/html" indent="yes"
     doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
     doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" />
   <xsl:template name="content">
-  	<xsl:apply-templates select="form|para" />
-	<xsl:apply-templates select="/gentoo/searchResults" />
-	<xsl:apply-templates select="/gentoo/bugSearchResults" />
+  	<xsl:apply-templates select="/gentoo/form">
+			<xsl:sort select="@order" />
+  	</xsl:apply-templates>
+		<xsl:apply-templates select="/gentoo/searchResults" />
+		<xsl:apply-templates select="/gentoo/bugSearchResults" />
   </xsl:template>
   <xsl:template match="/gentoo/searchResults">
 		<xsl:if test="/gentoo/project2:params/project2:param[@name='criteria']/@value != ''">
-- 
cgit v1.2.3