Return-Path: 
 <forrest-cvs-return-1382-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@www.apache.org
Received: (qmail 92449 invoked from network); 22 Sep 2003 13:07:50 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 22 Sep 2003 13:07:50 -0000
Received: (qmail 89915 invoked by uid 500); 22 Sep 2003 13:07:46 -0000
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 89874 invoked by uid 500); 22 Sep 2003 13:07:46 -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 89861 invoked from network); 22 Sep 2003 13:07:46 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 22 Sep 2003 13:07:46 -0000
Received: (qmail 92428 invoked by uid 1352); 22 Sep 2003 13:07:48 -0000
Date: 22 Sep 2003 13:07:48 -0000
Message-ID: <20030922130748.92427.qmail@minotaur.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/skins/common/xslt/html
 document2html.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

jefft       2003/09/22 06:07:48

  Modified:    .        status.xml
               src/documentation skinconf.xml
               src/resources/conf sitemap.xmap
               src/resources/fresh-site/src/documentation skinconf.xml
               src/resources/schema/relaxng skinconf.rnc
               src/resources/skins/common/xslt/html document2html.xsl
  Log:
  Add obfuscate-mail-links to skinconf.xml.  Fixes FOR-67
  
  Revision  Changes    Path
  1.226     +5 -2      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.225
  retrieving revision 1.226
  diff -u -r1.225 -r1.226
  --- status.xml	22 Sep 2003 08:28:46 -0000	1.225
  +++ status.xml	22 Sep 2003 13:07:48 -0000	1.226
  @@ -25,7 +25,10 @@
   
     <changes>
       <release version="0.6-dev" date="unreleased">
  -      <action dev="JT" type="fix" context="skins" fixes-bug="FOR-65">
  +      <action dev="JT" type="add" context="skins" fixes-bug="FOR-67">
  +        Added obfuscate-mail-links skinconf.xml option, on by default.
  +      </action>
  +       <action dev="JT" type="fix" context="skins" fixes-bug="FOR-65">
           Fix forrest-site tables bug that broke Opera
         </action>
         <action dev="JT" type="fix" context="build">
  
  
  
  1.10      +14 -4     xml-forrest/src/documentation/skinconf.xml
  
  Index: skinconf.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/skinconf.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- skinconf.xml	15 Sep 2003 07:59:16 -0000	1.9
  +++ skinconf.xml	22 Sep 2003 13:07:48 -0000	1.10
  @@ -9,26 +9,30 @@
   
     <!ENTITY % links.att 'name CDATA #REQUIRED'>
     <!ENTITY % link.att 'name CDATA #REQUIRED href CDATA #REQUIRED'>
  -  <!ELEMENT skinconfig (disable-search?, disable-print-link?, disable-pdf-link?,
  -  disable-xml-link?, disable-compliance-links?, searchsite-domain?, searchsite-name?,
  -  project-name, project-url, project-logo, group-name?, group-url?, group-logo?,
  +  <!ELEMENT skinconfig (disable-lucene?, disable-search?, disable-print-link?, disable-pdf-link?,
  +  disable-xml-link?, disable-compliance-links?, obfuscate-mail-links?, searchsite-domain?, searchsite-name?,
  +  project-name, project-description, project-url, project-logo, group-name?, group-description?, group-url?, group-logo?,
     host-url?, host-logo?, year?, vendor?, trail?, toc?, credits?)*>
     <!ELEMENT credits (credit*)>
     <!ELEMENT credit (name, url, image?, width?, height?)>
     <!-- id uniquely identifies the tool, and role indicates its function -->
     <!ATTLIST credit id   CDATA #IMPLIED
                      role CDATA #IMPLIED>
  +  <!ELEMENT disable-lucene (#PCDATA)>
     <!ELEMENT disable-search (#PCDATA)>
     <!ELEMENT disable-print-link (#PCDATA)>
     <!ELEMENT disable-pdf-link (#PCDATA)>
     <!ELEMENT disable-xml-link (#PCDATA)>    
     <!ELEMENT disable-compliance-links (#PCDATA)>   
  +  <!ELEMENT obfuscate-mail-links (#PCDATA)>   
     <!ELEMENT searchsite-domain (#PCDATA)>
     <!ELEMENT searchsite-name (#PCDATA)>  
     <!ELEMENT project-name (#PCDATA)>
  +  <!ELEMENT project-description (#PCDATA)>
     <!ELEMENT project-url (#PCDATA)>
     <!ELEMENT project-logo (#PCDATA)>
     <!ELEMENT group-name (#PCDATA)>
  +  <!ELEMENT group-description (#PCDATA)>
     <!ELEMENT group-url (#PCDATA)>
     <!ELEMENT group-logo (#PCDATA)>
     <!ELEMENT host-url (#PCDATA)>
  @@ -53,9 +57,11 @@
     ]>
   
   <skinconfig>
  +  <!-- Do we want to disable the Lucene search box? -->
  +  <disable-lucene>false</disable-lucene>
     <!-- Do we want to disable the Google search box? -->
     <disable-search>false</disable-search>
  -  <!-- Do we want to disable the print link? -->
  +  <!-- 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? -->
     <disable-pdf-link>false</disable-pdf-link>
  @@ -63,6 +69,8 @@
     <disable-xml-link>true</disable-xml-link>
     <!-- Do we want to disable w3c compliance links? -->
     <disable-compliance-links>false</disable-compliance-links>
  +  <!-- Whether to render mailto: links unrecognisable by spam harvesters -->
  +  <obfuscate-mail-links>true</obfuscate-mail-links>
   
     <searchsite-domain>xml.apache.org</searchsite-domain>
     <searchsite-name>Apache XML</searchsite-name>  
  @@ -113,5 +121,7 @@
         <width>88</width>
         <height>31</height>
       </credit>
  +    <!-- A credit with @role='pdf' will have its name and url displayed in the
  +    PDF page's footer. -->
     </credits>
   </skinconfig>
  
  
  
  1.122     +1 -2      xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- sitemap.xmap	20 Sep 2003 11:48:40 -0000	1.121
  +++ sitemap.xmap	22 Sep 2003 13:07:48 -0000	1.122
  @@ -131,7 +131,6 @@
           <map:parameter name="isfaq" value="{notoc}"/>
           <map:parameter name="nopdf" value="{nopdf}"/>
           <map:parameter name="path" value="{path}"/>
  -        <map:parameter name="obfuscate-mail-links" value="false"/>
           <!-- Can set an alternative project skinconfig here 
           <map:parameter name="config-file" value="../../../../skinconf.xml"/>
           -->
  
  
  
  1.17      +4 -1      xml-forrest/src/resources/fresh-site/src/documentation/skinconf.xml
  
  Index: skinconf.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/src/documentation/skinconf.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- skinconf.xml	12 Sep 2003 19:07:30 -0000	1.16
  +++ skinconf.xml	22 Sep 2003 13:07:48 -0000	1.17
  @@ -10,7 +10,7 @@
     <!ENTITY % links.att 'name CDATA #REQUIRED'>
     <!ENTITY % link.att 'name CDATA #REQUIRED href CDATA #REQUIRED'>
     <!ELEMENT skinconfig (disable-lucene?, disable-search?, disable-print-link?, disable-pdf-link?,
  -  disable-xml-link?, disable-compliance-links?, searchsite-domain?, searchsite-name?,
  +  disable-xml-link?, disable-compliance-links?, obfuscate-mail-links?, searchsite-domain?, searchsite-name?,
     project-name, project-description, project-url, project-logo, group-name?, group-description?, group-url?, group-logo?,
     host-url?, host-logo?, year?, vendor?, trail?, toc?, credits?)*>
     <!ELEMENT credits (credit*)>
  @@ -24,6 +24,7 @@
     <!ELEMENT disable-pdf-link (#PCDATA)>
     <!ELEMENT disable-xml-link (#PCDATA)>    
     <!ELEMENT disable-compliance-links (#PCDATA)>   
  +  <!ELEMENT obfuscate-mail-links (#PCDATA)>   
     <!ELEMENT searchsite-domain (#PCDATA)>
     <!ELEMENT searchsite-name (#PCDATA)>  
     <!ELEMENT project-name (#PCDATA)>
  @@ -68,6 +69,8 @@
     <disable-xml-link>true</disable-xml-link>
     <!-- Do we want to disable w3c compliance links? -->
     <disable-compliance-links>false</disable-compliance-links>
  +  <!-- Whether to render mailto: links unrecognisable by spam harvesters -->
  +  <obfuscate-mail-links>true</obfuscate-mail-links>
   
     <searchsite-domain>mydomain</searchsite-domain>  
     <searchsite-name>MyProject</searchsite-name>  
  
  
  
  1.8       +1 -0      xml-forrest/src/resources/schema/relaxng/skinconf.rnc
  
  Index: skinconf.rnc
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/relaxng/skinconf.rnc,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- skinconf.rnc	12 Sep 2003 19:07:30 -0000	1.7
  +++ skinconf.rnc	22 Sep 2003 13:07:48 -0000	1.8
  @@ -12,6 +12,7 @@
               element disable-pdf-link{xsd:boolean}?,   # Disable print link feature. 'true' or 'false'
               element disable-xml-link{xsd:boolean}?,   # Disable print link feature. 'true' or 'false'
               element disable-compliance-links {xsd:boolean}?,   # Disable standards-compliance logos
  +            element obfuscate-mail-links {xsd:boolean}?,   # Render mailto: links unrecognisable by spam harvesters
               element searchsite-domain {text}?,       # DNS domain to search. Eg 'xml.apache.org'
               element searchsite-name {text}?,         # "Search the ... site"
               element project-name {text},             # Eg 'Forrest'
  
  
  
  1.34      +4 -2      xml-forrest/src/resources/skins/common/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/document2html.xsl,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- document2html.xsl	12 Sep 2003 19:07:31 -0000	1.33
  +++ document2html.xsl	22 Sep 2003 13:07:48 -0000	1.34
  @@ -31,6 +31,9 @@
     <xsl:variable name="disable-xml-link" select="$config/disable-xml-link"/>  
     <!-- Get the section depth to use when generating the minitoc (default is 2) -->
     <xsl:variable name="config-max-depth" select="$config/toc/@level"/>
  +  <!-- Whether to obfuscate email links -->
  +  <xsl:variable name="obfuscate-mail-links" select="$config/obfuscate-mail-links"/>
  +
     <xsl:variable name="max-depth">
       <xsl:choose>
         <xsl:when test="string-length($config-max-depth)&gt;0">
  @@ -43,7 +46,6 @@
     <xsl:param name="dynamic-page" select="'false'"/>  
     <xsl:param name="notoc"/>
     <xsl:param name="path"/>
  -  <xsl:param name="obfuscate-mail-links" select="'false'"/>
     <!-- <xsl:include href="split.xsl"/> -->
     <xsl:include href="dotdots.xsl"/>
     <xsl:include href="pathutils.xsl"/>