forrest-dev mailing list archives

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

Modified:
   forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl
   forrest/trunk/status.xml
Log:
search/@box-location for tigris-style

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:48:55 2004
@@ -132,11 +132,8 @@
           </xsl:if>        </td>
         
         <!-- ( =================  Search ================== ) -->        
-	  <!-- FIXME (Florian Haas): I think either this or the
-	  lateral search bar should go away. Keeping both is confusing
-	  to users, and tedious to maintain. -->
 	  <td align="right" valign="top">
-	    <xsl:if test="$config/search">
+	    <xsl:if test="$config/search and not($config/search/@box-location = 'alt')">
 	      <div id="login" align="right" class="right">
 		<xsl:choose>
 		  <xsl:when test="$config/search/@provider = 'lucene'">
@@ -309,7 +306,7 @@
     <!-- ( ================= end Menu items ================== ) -->
 
     <!-- ( =================  Search ================== ) -->       
-      <xsl:if test="$config/search">
+      <xsl:if test="$config/search and $config/search/@box-location = 'alt'">
 	<xsl:choose>
 	  <!-- Lucene search -->
 	  <xsl:when test="$config/search/@provider = 'lucene'">

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Fri Jun 11 06:48:55 2004
@@ -49,6 +49,9 @@
         Added new document to facilitate
         <link href="upgrading_06.html">upgrading to v0.6</link>
       </action>
+      <action dev="DB" type="add" context="skins" fixes-bug="FOR-142">
+        In skinconfig, add box-location attribute to search element.
+      </action>
       <action dev="DB" type="remove" context="skins">
         Remove 'template' skin; better to base a new skin on an existing one.
       </action>

Mime
View raw message