forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject svn commit: rev 21095 - in forrest/trunk/src: core/context/skins/krysalis-site/xslt/html core/context/skins/tigris-style/xslt/html core/fresh-site/src/documentation documentation
Date Fri, 11 Jun 2004 13:58:23 GMT
Author: brondsem
Date: Fri Jun 11 06:58:22 2004
New Revision: 21095

Modified:
   forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
   forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl
   forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml
   forrest/trunk/src/documentation/skinconf.xml
Log:
support box-location='all'

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 11
06:58:22 2004
@@ -117,7 +117,7 @@
         </td>
         <!-- ( =================  Search ================== ) -->
         <td class="search" align="right" rowspan="2" valign="top">
-          <xsl:if test="$config/search and not($config/search/@box-location) = 'alt'">
+          <xsl:if test="$config/search and not($config/search/@box-location = 'alt')">
 	    <xsl:choose>
               <xsl:when test="$config/search/@provider = 'lucene'">
                 <!-- Lucene search -->
@@ -292,7 +292,7 @@
         <td height="10" colspan="2"></td>
       </tr>
       
-      <xsl:if test="$config/search and $config/search/@box-location = 'alt'">
+      <xsl:if test="$config/search and ($config/search/@box-location = 'alt' or $config/search/@box-location
= 'all')">
       <tr>
         <td></td>
         <td class="search">

Modified: forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl	(original)
+++ forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl	Fri Jun 11
06:58:22 2004
@@ -306,7 +306,7 @@
     <!-- ( ================= end Menu items ================== ) -->
 
     <!-- ( =================  Search ================== ) -->       
-      <xsl:if test="$config/search and $config/search/@box-location = 'alt'">
+      <xsl:if test="$config/search and ($config/search/@box-location = 'alt' or $config/search/@box-location
= 'all')">
 	<xsl:choose>
 	  <!-- Lucene search -->
 	  <xsl:when test="$config/search/@provider = 'lucene'">

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	Fri Jun 11 06:58:22 2004
@@ -25,8 +25,12 @@
         "skinconfig-v06-2.dtd">
 
 <skinconfig>
-  <!-- To enable lucene search add provider="lucene" -->
-  <!-- add box-location="alt" to move the search box to an alternate location (if the
skin supports it) -->
+  <!-- To enable lucene search add provider="lucene"
+      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.
+      -->
   <search name="MyProject" domain="mydomain"/>
   
   <!-- Do we want to disable the print link? If enabled, invalid HTML 4.0.1 -->

Modified: forrest/trunk/src/documentation/skinconf.xml
==============================================================================
--- forrest/trunk/src/documentation/skinconf.xml	(original)
+++ forrest/trunk/src/documentation/skinconf.xml	Fri Jun 11 06:58:22 2004
@@ -25,8 +25,12 @@
         "skinconfig-v06-2.dtd">
 
 <skinconfig>
-  <!-- To enable lucene search add provider="lucene" -->
-  <!-- add box-location="alt" to move the search box to an alternate location (if the
skin supports it) -->
+  <!-- To enable lucene search add provider="lucene"
+      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.
+      -->
   <search name="Apache Forrest" domain="forrest.apache.org"/>
   <!-- Do we want to disable the print link? If enabled, invalid HTML 4.0.1 -->
   <disable-print-link>true</disable-print-link>  

Mime
View raw message