forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject svn commit: rev 21092 - in forrest/trunk/src: core/context/resources/schema core/context/resources/schema/dtd core/context/skins/krysalis-site/xslt/html core/fresh-site/src/documentation documentation
Date Fri, 11 Jun 2004 13:42:01 GMT
Author: brondsem
Date: Fri Jun 11 06:42:00 2004
New Revision: 21092

Added:
   forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-2.dtd
      - copied, changed from rev 21064, forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-1.dtd
Modified:
   forrest/trunk/src/core/context/resources/schema/catalog.xcat
   forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
   forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml
   forrest/trunk/src/documentation/skinconf.xml
Log:
skinconfig/search/@box-location = 'alt'

Modified: forrest/trunk/src/core/context/resources/schema/catalog.xcat
==============================================================================
--- forrest/trunk/src/core/context/resources/schema/catalog.xcat	(original)
+++ forrest/trunk/src/core/context/resources/schema/catalog.xcat	Fri Jun 11 06:42:00 2004
@@ -45,6 +45,8 @@
         uri="dtd/skinconfig-v06.dtd"/>
 <public publicId="-//APACHE//DTD Skin Configuration V0.6-1//EN"
         uri="dtd/skinconfig-v06-1.dtd"/>
+<public publicId="-//APACHE//DTD Skin Configuration V0.6-2//EN"
+        uri="dtd/skinconfig-v06-2.dtd"/>
 <public publicId="-//APACHE//ENTITIES Documentation V2.0a//EN"
         uri="dtd/v20a/document-v20.mod"/>
 <public publicId="-//APACHE//DTD FAQ V2.0a//EN"

Copied: forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-2.dtd (from rev
21064, forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-1.dtd)
==============================================================================
--- forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-1.dtd	(original)
+++ forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-2.dtd	Fri Jun 11 06:42:00
2004
@@ -48,7 +48,8 @@
   <!ELEMENT search EMPTY>
   <!ATTLIST search name     CDATA #IMPLIED
                    domain   CDATA #IMPLIED
-                   provider CDATA #IMPLIED>
+                   provider CDATA #IMPLIED
+                   box-location CDATA #IMPLIED>
   <!ELEMENT disable-print-link (#PCDATA)>
   <!ELEMENT disable-pdf-link (#PCDATA)>
   <!ELEMENT disable-xml-link (#PCDATA)>

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:42:00 2004
@@ -117,7 +117,7 @@
         </td>
         <!-- ( =================  Search ================== ) -->
         <td class="search" align="right" rowspan="2" valign="top">
-          <xsl:if test="$config/search">
+          <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">
+      <xsl:if test="$config/search and $config/search/@box-location = 'alt'">
       <tr>
         <td></td>
         <td class="search">

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:42:00 2004
@@ -21,11 +21,12 @@
 -->
 
  <!DOCTYPE skinconfig PUBLIC
-        "-//APACHE//DTD Skin Configuration V0.6-1//EN"
-        "skinconfig-v06-1.dtd">
+        "-//APACHE//DTD Skin Configuration V0.6-2//EN"
+        "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) -->
   <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:42:00 2004
@@ -22,11 +22,12 @@
 
  <!DOCTYPE skinconfig PUBLIC
         "-//APACHE//DTD Skin Configuration V0.6-1//EN"
-        "skinconfig-v06-1.dtd">
+        "skinconfig-v06-2.dtd">
 
 <skinconfig>
   <!-- To enable lucene search add provider="lucene" -->
-  <search name="Apache Forrest" domain="forrest.apache.org"/>
+  <!-- add box-location="alt" to move the search box to an alternate location (if the
skin supports it) -->
+  <search name="Apache Forrest" domain="forrest.apache.org" box-location="alt"/>
   <!-- Do we want to disable the print link? If enabled, invalid HTML 4.0.1 -->
   <disable-print-link>true</disable-print-link>  
   <!-- Do we want to disable the PDF link? -->

Mime
View raw message