You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ch...@apache.org on 2004/06/04 09:42:32 UTC
svn commit: rev 20815 - in forrest/trunk: . src/core/context/skins/krysalis-site/xslt/html src/documentation/content/xdocs
Author: cheche
Date: Fri Jun 4 00:42:32 2004
New Revision: 20815
Modified:
forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
forrest/trunk/src/documentation/content/xdocs/site.xml
forrest/trunk/status.xml
Log:
Added documentation about the search funcionality. Fix issue with krysalis
Modified: forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl Fri Jun 4 00:42:32 2004
@@ -292,12 +292,50 @@
<td height="10" colspan="2"></td>
</tr>
- <xsl:if test="not(//skinconfig/disable-search) or
- //skinconfig/disable-search='alt' and //skinconfig/searchsite-domain and
- //skinconfig/searchsite-name">
+ <xsl:if test="$config/search">
<tr>
- <td ></td>
+ <td></td>
<td class="search">
+ <xsl:choose>
+ <xsl:when test="$config/search/@provider = 'lucene'">
+ <form method="get" action="{$root}{$lucene-search}">
+ <table class="dialog" cellspacing="0" cellpadding="0" border="0" width="100%">
+ <tr>
+ <td class="border top-left"></td>
+ <td class="border"></td>
+ <td class="border top-right"></td>
+ </tr>
+ <tr>
+ <td class="border" ></td>
+ <td colspan="2" class="border" height="10"><b>Search</b></td>
+ </tr>
+ <tr>
+ <td colspan="3" height="8"></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/>
+ the <xsl:value-of select="$config/search/@name"/> site
+ <br />
+ <input type="text" id="query" name="queryString" size="13"/><input type="submit" value="Go" name="Search"/>
+ </td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td colspan="3" height="7"></td>
+ </tr>
+
+ <tr>
+ <td class="border bottom-left"></td>
+ <td class="border bottomborder"></td>
+ <td class="border bottom-right"></td>
+ </tr>
+ </table>
+ </form>
+ </xsl:when>
+ <xsl:otherwise>
<form method="get" action="http://www.google.com/search" target="_blank">
<table class="dialog" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
@@ -315,10 +353,10 @@
<tr>
<td></td>
<td>
- <input type="hidden" name="sitesearch" value="{//skinconfig/searchsite-domain}"/>
- the <xsl:value-of select="//skinconfig/searchsite-name"/> site
+ <input type="hidden" name="as_sitesearch" value="{$config/search/@domain}"/>
+ the <xsl:value-of select="$config/search/@name"/> site
<br />
- <input type="text" id="query" name="q" size="13"/><input type="submit" value="Go" name="Search"/>
+ <input type="text" id="query" name="as_q" size="13"/><input type="submit" value="Go" name="Search"/>
</td>
<td></td>
</tr>
@@ -333,10 +371,12 @@
<td class="border bottom-right"></td>
</tr>
</table>
- </form>
- </td>
- </tr>
- </xsl:if>
+ </form>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ </tr>
+ </xsl:if>
<xsl:if test="$filename = 'index.html' and //skinconfig/credits">
<tr>
Modified: forrest/trunk/src/documentation/content/xdocs/site.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/src/documentation/content/xdocs/site.xml Fri Jun 4 00:42:32 2004
@@ -50,6 +50,7 @@
<source_pipelines href="#source_pipelines"/>
<forrest_xmap href="#forrest_xmap"/>
</sitemap-ref>
+ <searching label="Searching" href="searching.html"/>
<skin-package label="Skin Packages" href="skin-package.html"/>
<!--
<quick-xml label="XML Guide" href="quick-xml.html"/>
Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml (original)
+++ forrest/trunk/status.xml Fri Jun 4 00:42:32 2004
@@ -49,6 +49,9 @@
Added new document to facilitate
<link href="upgrading_06.html">upgrading to v0.6</link>
</action>
+ <action dev="JJP" type="update" context="code" due-to="Florian G. Haas" fixes-bug="FOR-9">
+ Fix Issue with krysalis-site skin. Added documentation
+ </action>
<action dev="JJP" type="update" context="code" >
Upgrade to cocoon 2.1.5
</action>
Re: svn commit: rev 20815
Posted by Juan Jose Pablos <ch...@che-che.com>.
David Crossley escribió:
> cheche wrote:
>
>>Author: cheche
>>Date: Fri Jun 4 00:42:32 2004
>>New Revision: 20815
>>
>>Modified:
>> forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
>> forrest/trunk/src/documentation/content/xdocs/site.xml
>> forrest/trunk/status.xml
>>Log:
>>Added documentation about the search funcionality. Fix issue with krysalis
>
>
> Did you forget to 'svn add' searching.xml ?
>
> --David
>
Damn it!!!!
I have just commited.. Thanks David
Re: svn commit: rev 20815
Posted by David Crossley <cr...@apache.org>.
cheche wrote:
> Author: cheche
> Date: Fri Jun 4 00:42:32 2004
> New Revision: 20815
>
> Modified:
> forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
> forrest/trunk/src/documentation/content/xdocs/site.xml
> forrest/trunk/status.xml
> Log:
> Added documentation about the search funcionality. Fix issue with krysalis
Did you forget to 'svn add' searching.xml ?
--David