You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2002/10/26 00:33:10 UTC

cvs commit: xml-forrest/src/resources/conf skinconf.xml

nicolaken    2002/10/25 15:33:10

  Modified:    src/resources/skins/forrest-site/xslt/html site2xhtml.xsl
               src/resources/conf skinconf.xml
  Log:
  Fixed bug on the search bar: Google wants domain names in site:
  Added tags in skinconf to specify them.
  Need to document it still.
  
  Revision  Changes    Path
  1.8       +3 -3      xml-forrest/src/resources/skins/forrest-site/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- site2xhtml.xsl	23 Sep 2002 13:36:42 -0000	1.7
  +++ site2xhtml.xsl	25 Oct 2002 22:33:10 -0000	1.8
  @@ -45,8 +45,8 @@
           <xsl:if test="$config/group-url"><a href="{$config/group-url}"><img src="{$root}{$config/group-logo}" alt="{$config/group-name} logo" border="0"/></a></xsl:if></td>
           <td bgcolor="#294563" align="center" width="100%"><a href="{$config/project-url}"><img src="{$root}{$config/project-logo}" border="0" alt="{$config/project-name} site" /></a></td>
           <td bgcolor="#294563" rowspan="2" valign="top">
  -          <xsl:if test="not($config/disable-search) or $config/disable-search='false' and $config/project-url and $config/project-name">
  -          <form method="get" action="http://www.google.com/search" onsubmit="q.value = query.value + ' site:{$config/project-url}'" target="_blank">
  +          <xsl:if test="not($config/disable-search) or $config/disable-search='false' and $config/searchsite-domain and $config/searchsite-name">
  +          <form method="get" action="http://www.google.com/search" onsubmit="q.value = query.value + ' site:{$config/searchsite-domain}'" target="_blank">
               <table bgcolor="#4C6C8F" cellpadding="0" cellspacing="0" border="0" summary="search">
                 <tr>
                   <td colspan="3"><img src="{$spacer}" alt="" width="1" height="10" /></td>
  @@ -58,7 +58,7 @@
                     <input type="text" id="query" size="15"/><img src="{$spacer}" alt="" width="5" height="1" /><input type="submit" value="Search" name="Search"/>
                     <br />
                     <font color="white" size="2" face="Arial, Helvetica, Sans-serif">
  -                  the <xsl:value-of select="$config/project-name"/> site
  +                  the <xsl:value-of select="$config/searchsite-name"/> site
   <!-- setting search options off for the moment -->
   <!--
                       <input type="radio" name="web" value="web"/>web site&#160;&#160;<input type="radio" name="mail" value="mail"/>mail lists
  
  
  
  1.2       +6 -1      xml-forrest/src/resources/conf/skinconf.xml
  
  Index: skinconf.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/skinconf.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- skinconf.xml	23 Sep 2002 07:37:37 -0000	1.1
  +++ skinconf.xml	25 Oct 2002 22:33:10 -0000	1.2
  @@ -11,10 +11,12 @@
   
     <!ENTITY % links.att 'name CDATA #REQUIRED'>
     <!ENTITY % link.att 'name CDATA #REQUIRED href CDATA #REQUIRED'>
  -  <!ELEMENT skinconfig (disable-search?, project-name, project-url, project-logo, group-name?, group-url?, group-logo?, host-logo?, year?, vendor?, trail?, credits?)*>
  +  <!ELEMENT skinconfig (disable-search?, searchsite-domain?, searchsite-name?, project-name, project-url, project-logo, group-name?, group-url?, group-logo?, host-logo?, year?, vendor?, trail?, credits?)*>
     <!ELEMENT credits (credit*)>
     <!ELEMENT credit (name, url, image, width?, height?)>
     <!ELEMENT disable-search (#PCDATA)>
  +  <!ELEMENT searchsite-domain (#PCDATA)>
  +  <!ELEMENT searchsite-name (#PCDATA)>  
     <!ELEMENT project-name (#PCDATA)>
     <!ELEMENT project-url (#PCDATA)>
     <!ELEMENT project-logo (#PCDATA)>
  @@ -42,6 +44,9 @@
   <skinconfig>
     <!-- Do we want the Google search box? -->
     <disable-search>false</disable-search>
  +  <searchsite-domain>xml.apache.org</searchsite-domain>
  +  <searchsite-name>Apache XML</searchsite-name>  
  +
   
     <project-name>Forrest</project-name>
     <project-url>http://xml.apache.org/forrest/</project-url>