You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2005/06/06 04:39:28 UTC
svn commit: r180195 - /forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl

Author: crossley
Date: Sun Jun  5 19:39:27 2005
New Revision: 180195

URL: http://svn.apache.org/viewcvs?rev=180195&view=rev
Log:
The search input was too wide to fit on the page.
Amend some of the changes for r179697.

Modified:
    forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl?rev=180195&r1=180194&r2=180195&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl Sun Jun  5 19:39:27 2005
@@ -186,23 +186,26 @@
     |start Search
     +</xsl:comment> 
             <div class="searchbox">
+             <xsl:variable name="search-prompt">
+               <i18n:text>Search the site with</i18n:text>
+               <xsl:text> </xsl:text>
+               <xsl:value-of select="$config/search/@provider"/>
+             </xsl:variable>
              <xsl:choose>
               <xsl:when test="$config/search/@provider = 'lucene'">
                 <!-- Lucene search -->
-                <form method="get" action="{$root}{$lucene-search}"><i18n:text >Search the site with </i18n:text>&#160;
-                  <input type="text" id="query" name="queryString" size="25" onFocus="getBlank (this, '{$config/search/@provider}');">
-                    <xsl:attribute name="value"><xsl:value-of select="$config/search/@provider"/></xsl:attribute>
+                <form method="get" action="{$root}{$lucene-search}">
+                  <input type="text" id="query" name="queryString" size="25" onFocus="getBlank (this, '{$search-prompt}');">
+                    <xsl:attribute name="value"><xsl:value-of select="$search-prompt"/></xsl:attribute>
                   </input>&#160;
 		  <input type="submit" value="Search" name="Search" i18n:attr="value"/>
 		 </form>
 	      </xsl:when>
 	      <xsl:otherwise>
                 <form class="roundtopsmall" method="get" action="http://www.google.com/search"> 
-                    <input type="hidden" 
-                    name="sitesearch" value="{$config/search/@domain}"/> 
-                    <i18n:text >Search the site with </i18n:text>&#160;
-                    <input type="text" id="query" name="q" size="25" onFocus="getBlank (this, '{$config/search/@provider}');">
-                      <xsl:attribute name="value"><xsl:value-of select="$config/search/@provider"/></xsl:attribute>
+                    <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/> 
+                    <input type="text" id="query" name="q" size="25" onFocus="getBlank (this, '{$search-prompt}');">
+                      <xsl:attribute name="value"><xsl:value-of select="$search-prompt"/></xsl:attribute>
                     </input>&#160; 
                     <input type="submit" value="Search" name="Search" i18n:attr="value"/> </form>
         </xsl:otherwise>
@@ -427,22 +430,26 @@
     +</xsl:comment> 
             <div class="searchbox">
              <hr />
+             <xsl:variable name="search-prompt">
+               <i18n:text>Search the site with</i18n:text>
+               <xsl:text> </xsl:text>
+               <xsl:value-of select="$config/search/@provider"/>
+             </xsl:variable>
              <xsl:choose>
               <xsl:when test="$config/search/@provider = 'lucene'">
                 <!-- Lucene search -->
-                <form method="get" action="{$root}{$lucene-search}"><i18n:text >Search the site with </i18n:text>&#160;
-                  <input type="text" id="query" name="queryString" size="18" onFocus="getBlank (this, '{$config/search/@provider}');">
-                    <xsl:attribute name="value"><xsl:value-of select="$config/search/@provider"/></xsl:attribute>
+                <form method="get" action="{$root}{$lucene-search}">
+                  <input type="text" id="query" name="queryString" size="18" onFocus="getBlank (this, '{$search-prompt}');">
+                    <xsl:attribute name="value"><xsl:value-of select="$search-prompt"/></xsl:attribute>
                   </input>&#160;
 		  <input type="submit" value="Search" name="Search" i18n:attr="value"/>
 		 </form>
 	      </xsl:when>
 	      <xsl:otherwise>
-                <form method="get" action="http://www.google.com/search"> <i18n:text >Search the site with </i18n:text>&#160;
+                <form method="get" action="http://www.google.com/search">
                   <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/> 
-                  <input type="text" id="query" name="q" size="18"
-                    onFocus="getBlank (this, '{$config/search/@provider}');">
-                    <xsl:attribute name="value"><xsl:value-of select="$config/search/@provider"/></xsl:attribute>
+                  <input type="text" id="query" name="q" size="18" onFocus="getBlank (this, '{$search-prompt}');">
+                    <xsl:attribute name="value"><xsl:value-of select="$search-prompt"/></xsl:attribute>
                   </input>&#160; 
                   <input type="submit" value="Search" name="Search" i18n:attr="value"/>
                 </form>