Return-Path: 
 <forrest-cvs-return-1875-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@www.apache.org
Received: (qmail 13336 invoked from network); 11 Jan 2004 23:24:01 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 11 Jan 2004 23:24:01 -0000
Received: (qmail 93111 invoked by uid 500); 11 Jan 2004 23:23:47 -0000
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 93078 invoked by uid 500); 11 Jan 2004 23:23:47 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 93056 invoked from network); 11 Jan 2004 23:23:47 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 11 Jan 2004 23:23:47 -0000
Received: (qmail 13328 invoked by uid 1464); 11 Jan 2004 23:24:00 -0000
Date: 11 Jan 2004 23:24:00 -0000
Message-ID: <20040111232400.13327.qmail@minotaur.apache.org>
From: nicolaken@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/core/context/skins/tigris-style/xslt/html
 site2xhtml.xsl
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

nicolaken    2004/01/11 15:24:00

  Modified:    src/core/context/skins/tigris-style/xslt/html site2xhtml.xsl
  Log:
  Make the top search appear when disable-search=alt
  
  Maybe it sucks, maybe we should make a skinconf V2, but for now
  this will fix the search box.
  
  Revision  Changes    Path
  1.5       +7 -11     xml-forrest/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- site2xhtml.xsl	30 Dec 2003 00:04:35 -0000	1.4
  +++ site2xhtml.xsl	11 Jan 2004 23:24:00 -0000	1.5
  @@ -32,10 +32,10 @@
             @import "]]><xsl:value-of select="$root"/><![CDATA[skin/tigris.css";  
             @import "]]><xsl:value-of select="$root"/><![CDATA[skin/quirks.css"; 
             @import "]]><xsl:value-of select="$root"/><![CDATA[skin/inst.css"; 
  -          @import "]]><xsl:value-of select="$root"/><![CDATA[skin/forrest.css"; 
            /*  ]]> */
           </style>
           <link rel="stylesheet" type="text/css" href="{$root}skin/print.css" media="print" />
  +        <link rel="stylesheet" type="text/css" href="{$root}skin/forrest.css" />
           <script src="{$root}skin/tigris.js" type="text/javascript"></script>
           <script type="text/javascript" language="javascript" src="{$root}skin/menu.js"></script>
           <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
  @@ -113,11 +113,9 @@
           
           <!-- ( =================  Search ================== ) -->        
           <td align="right" valign="top">
  -          <!--
  -            per default only navigation search is present
  -            
             <xsl:if test="not($config/disable-search) or
  -            $config/disable-search='false' and $config/searchsite-domain and
  +            $config/disable-search='false' and not($config/disable-search='alt')
  +            and $config/searchsite-domain and
               $config/searchsite-name">
               <div id="login" align="right" class="right">
                <form method="get" action="http://www.google.com/search" target="_blank">
  @@ -133,7 +131,6 @@
                </form>
             </div>
            </xsl:if>
  -         -->
           </td>       
          </tr>   
         </table>  
  @@ -236,10 +233,9 @@
   
       <!-- ( =================  Search ================== ) -->       
           
  -   <xsl:if test="not($config/disable-search) 
  -                 or $config/disable-search='false' 
  -                 and $config/searchsite-domain 
  -                 and $config/searchsite-name">
  +   <xsl:if test="not($config/disable-search) or
  +                 $config/disable-search='alt' and $config/searchsite-domain and
  +                 $config/searchsite-name">
       <form action="http://www.google.com/search" method="get">
         <div id="searchbox" class="toolgroup">
          <div class="label"><strong>Search</strong></div>