forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: rev 47486 - in forrest/trunk/src/core: context/skins/leather-dev/xslt/html context/skins/pelt/xslt/html fresh-site/src/documentation
Date Wed, 29 Sep 2004 14:15:46 GMT
Author: thorsten
Date: Wed Sep 29 07:15:45 2004
New Revision: 47486

Modified:
   forrest/trunk/src/core/context/skins/leather-dev/xslt/html/site2xhtml.xsl
   forrest/trunk/src/core/context/skins/pelt/xslt/html/site2xhtml.xsl
   forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml
Log:
added the lucene search form to pelt / leather. Greeting from OSCOM4 where I found the bug
;-)

Modified: forrest/trunk/src/core/context/skins/leather-dev/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/leather-dev/xslt/html/site2xhtml.xsl	(original)
+++ forrest/trunk/src/core/context/skins/leather-dev/xslt/html/site2xhtml.xsl	Wed Sep 29 07:15:45
2004
@@ -179,13 +179,23 @@
     |start Search
     +</xsl:comment> 
              <div class="search-input">
+             <xsl:choose>
+              <xsl:when test="$config/search/@provider = 'lucene'">
+                <!-- Lucene search -->
+                <form method="get" action="{$root}{$lucene-search}">
+                  <input type="text" id="query" name="queryString" size="25" value="Search
the site with {$config/search/@provider}:" onFocus="getBlank (this, 'Search the site with
{$config/search/@provider}:');"/>
+		  &#160;
+		  <input type="submit" value="Search" name="Search"/>
+		 </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}"/> 
-                    <input type="text" id="query" name="q" size="15" 
-                    value="Search the site:" 
-                    onFocus="getBlank (this, 'Search the site:');"/>&#160; 
+                    <input type="text" id="query" name="q" size="25" value="Search the
site with {$config/search/@provider}:" onFocus="getBlank (this, 'Search the site with {$config/search/@provider}:');"/>&#160;

                     <input type="submit" value="Search" name="Search"/> </form>
+        </xsl:otherwise>
+</xsl:choose>
             </div>
 <xsl:comment>+
     |end search

Modified: forrest/trunk/src/core/context/skins/pelt/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/pelt/xslt/html/site2xhtml.xsl	(original)
+++ forrest/trunk/src/core/context/skins/pelt/xslt/html/site2xhtml.xsl	Wed Sep 29 07:15:45
2004
@@ -176,13 +176,23 @@
     |start Search
     +</xsl:comment> 
             <div class="searchbox">
+             <xsl:choose>
+              <xsl:when test="$config/search/@provider = 'lucene'">
+                <!-- Lucene search -->
+                <form method="get" action="{$root}{$lucene-search}">
+                  <input type="text" id="query" name="queryString" size="25" value="Search
the site with {$config/search/@provider}:" onFocus="getBlank (this, 'Search the site with
{$config/search/@provider}:');"/>
+		  &#160;
+		  <input type="submit" value="Search" name="Search"/>
+		 </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}"/> 
-                    <input type="text" id="query" name="q" size="15" 
-                    value="Search the site:" 
-                    onFocus="getBlank (this, 'Search the site:');"/>&#160; 
+                    <input type="text" id="query" name="q" size="25" value="Search the
site with {$config/search/@provider}:" onFocus="getBlank (this, 'Search the site with {$config/search/@provider}:');"/>&#160;

                     <input type="submit" value="Search" name="Search"/> </form>
+        </xsl:otherwise>
+</xsl:choose>
             <!--div id="roundbottomsmall">
             <img 
                 src="{$skin-img-dir}/rc-b-l-5-1body-2menu-3menu.png" 

Modified: forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml	(original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml	Wed Sep 29 07:15:45 2004
@@ -27,14 +27,14 @@
 -->
 <!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.6-3//EN" "http://forrest.apache.org/dtd/skinconfig-v06-3.dtd">
 <skinconfig>
-  <!-- To enable lucene search add provider="lucene"
+  <!-- To enable lucene search add provider="lucene" (default is google).
     Add box-location="alt" to move the search box to an alternate location
     (if the skin supports it) and box-location="all" to show it in all
     available locations on the page.  Remove the <search> element to show
     no search box. @domain will enable sitesearch for the specific domain with google.
     In other words google will search the @domain for the query string.
   -->
-  <search name="MyProject" domain="mydomain"/>
+  <search name="MyProject" domain="mydomain" provider="lucene"/>
 
   <!-- Disable the print link? If enabled, invalid HTML 4.0.1 -->
   <disable-print-link>true</disable-print-link>  

Mime
View raw message