forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/skins/forrest-site/xslt/html site2xhtml.xsl
Date Mon, 27 Jan 2003 12:50:27 GMT
jefft       2003/01/27 04:50:27

  Modified:    .        status.xml
               src/documentation skinconf.xml
               src/resources/fresh-site/src/documentation skinconf.xml
               src/resources/schema/relaxng skinconf.rnc
               src/resources/skins/common/xslt/html site2xhtml.xsl
               src/resources/skins/forrest-site/xslt/html site2xhtml.xsl
  Log:
  Add a HTML 4 compliancy validator link with the other logos.  On by default;
  may be switched off in skinconf.xml
  
  Revision  Changes    Path
  1.104     +3 -1      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- status.xml	27 Jan 2003 12:27:02 -0000	1.103
  +++ status.xml	27 Jan 2003 12:50:25 -0000	1.104
  @@ -25,7 +25,9 @@
     <changes>
       <release version="0.3-dev" date="unreleased">
         <action dev="JT" type="fix" context="skins">
  -        <code>forrest-site</code> skin is now HTML 4.0.1 compliant.
  +        <code>forrest-site</code> skin is now HTML 4.0.1 compliant.  The
  +        compliancy validator logo can be switched off with a
  +        <code>skinconf.xml</code> element.
         </action>
         <action dev="JT" type="fix" context="skins">
           Indirectly referenced files in skins (eg images in
  
  
  
  1.4       +4 -1      xml-forrest/src/documentation/skinconf.xml
  
  Index: skinconf.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/skinconf.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- skinconf.xml	12 Jan 2003 12:06:57 -0000	1.3
  +++ skinconf.xml	27 Jan 2003 12:50:26 -0000	1.4
  @@ -9,7 +9,7 @@
   
     <!ENTITY % links.att 'name CDATA #REQUIRED'>
     <!ENTITY % link.att 'name CDATA #REQUIRED href CDATA #REQUIRED'>
  -  <!ELEMENT skinconfig (disable-search?, searchsite-domain?, searchsite-name?,
  +  <!ELEMENT skinconfig (disable-search?, disable-compliance-links?, searchsite-domain?,
searchsite-name?,
     project-name, project-url, project-logo, group-name?, group-url?, group-logo?,
     host-url?, host-logo?, year?, vendor?, trail?, credits?)*>
     <!ELEMENT credits (credit*)>
  @@ -18,6 +18,7 @@
     <!ATTLIST credit id   CDATA #IMPLIED
                      role CDATA #IMPLIED>
     <!ELEMENT disable-search (#PCDATA)>
  +  <!ELEMENT disable-compliance-links (#PCDATA)>
     <!ELEMENT searchsite-domain (#PCDATA)>
     <!ELEMENT searchsite-name (#PCDATA)>  
     <!ELEMENT project-name (#PCDATA)>
  @@ -48,6 +49,8 @@
   <skinconfig>
     <!-- Do we want to disable the Google search box? -->
     <disable-search>false</disable-search>
  +  <disable-compliance-links>false</disable-compliance-links>
  +
     <searchsite-domain>xml.apache.org</searchsite-domain>
     <searchsite-name>Apache XML</searchsite-name>  
   
  
  
  
  1.7       +3 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- skinconf.xml	10 Jan 2003 13:51:56 -0000	1.6
  +++ skinconf.xml	27 Jan 2003 12:50:26 -0000	1.7
  @@ -9,7 +9,7 @@
   
     <!ENTITY % links.att 'name CDATA #REQUIRED'>
     <!ENTITY % link.att 'name CDATA #REQUIRED href CDATA #REQUIRED'>
  -  <!ELEMENT skinconfig (disable-search?, searchsite-domain?, searchsite-name?,
  +  <!ELEMENT skinconfig (disable-search?, disable-compliance-links?, searchsite-domain?,
searchsite-name?,
     project-name, project-url, project-logo, group-name?, group-url?, group-logo?,
     host-url?, host-logo?, year?, vendor?, trail?, credits?)*>
     <!ELEMENT credits (credit*)>
  @@ -18,6 +18,7 @@
     <!ATTLIST credit id   CDATA #IMPLIED
                      role CDATA #IMPLIED>
     <!ELEMENT disable-search (#PCDATA)>
  +  <!ELEMENT disable-compliance-links (#PCDATA)>
     <!ELEMENT searchsite-domain (#PCDATA)>
     <!ELEMENT searchsite-name (#PCDATA)>  
     <!ELEMENT project-name (#PCDATA)>
  @@ -48,6 +49,7 @@
   <skinconfig>
     <!-- Do we want to disable the Google search box? -->
     <disable-search>false</disable-search>
  +  <disable-compliance-links>false</disable-compliance-links>
     <searchsite-domain>myproj.mygroup.org</searchsite-domain>
     <searchsite-name>MyProject</searchsite-name>  
   
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- skinconf.rnc	10 Jan 2003 14:02:46 -0000	1.2
  +++ skinconf.rnc	27 Jan 2003 12:50:26 -0000	1.3
  @@ -7,6 +7,7 @@
   skinconfig = element skinconfig {
               (
               element disable-search {xsd:boolean}?,   # Disable search feature. 'true' or
'false'
  +            element disable-compliance-links {xsd:boolean}?,   # Disable standards-compliance
logos
               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.3       +14 -1     xml-forrest/src/resources/skins/common/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- site2xhtml.xsl	10 Jan 2003 13:51:56 -0000	1.2
  +++ site2xhtml.xsl	27 Jan 2003 12:50:26 -0000	1.3
  @@ -105,9 +105,22 @@
               </xsl:call-template>
             </xsl:for-each>
           </xsl:if>
  +        <a href="http://validator.w3.org/check/referer"><img border="0"
  +            src="http://www.w3.org/Icons/valid-html401"
  +            alt="Valid HTML 4.01!" height="31" width="88"/></a>
         </body>
       </html>
     </xsl:template>
  +
  +  <!-- Add links to any standards-compliance logos -->
  +  <xsl:template name="compliancy-logos">
  +    <xsl:if test="$config/disable-compliance-links = 'false'">
  +      <a href="http://validator.w3.org/check/referer"><img border="0" class="logoImage"

  +          src="http://www.w3.org/Icons/valid-html401"
  +          alt="Valid HTML 4.01!" height="31" width="88"/></a>
  +    </xsl:if>
  +  </xsl:template>
  +
   
     <xsl:template match="node()|@*" priority="-1">
       <xsl:copy>
  
  
  
  1.19      +31 -26    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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- site2xhtml.xsl	27 Jan 2003 08:18:16 -0000	1.18
  +++ site2xhtml.xsl	27 Jan 2003 12:50:26 -0000	1.19
  @@ -22,7 +22,7 @@
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:import href="../../../common/xslt/html/site2xhtml.xsl"/>
  -
  + 
     <xsl:variable name="header-color" select="'#294563'"/>
     <xsl:variable name="menu-border" select="'#4C6C8F'"/>
     <xsl:variable name="background-bars" select="'#CFDCED'"/>
  @@ -249,30 +249,35 @@
           </td>
         </tr>
         <tr>
  -      <td class="logos" bgcolor="{$background-bars}" align="left" colspan="2">
  -        <xsl:if test="$filename = 'index.html' and $config/credits">
  -          <div>
  -            <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
  -          <xsl:for-each select="$config/credits/credit">
  -            <xsl:variable name="name" select="name"/>
  -            <xsl:variable name="url" select="url"/>
  -            <xsl:variable name="image" select="image"/>
  -            <xsl:variable name="width" select="width"/>
  -            <xsl:variable name="height" select="height"/>
  -            <a href="{$url}">
  -            <img alt="{$name} logo" border="0">
  -              <xsl:attribute name="src">
  -                <xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of
select="$root"/></xsl:if>
  -                <xsl:value-of select="$image"/>
  -              </xsl:attribute>
  -              <xsl:if test="$width"><xsl:attribute name="width"><xsl:value-of
select="$width"/></xsl:attribute></xsl:if>
  -              <xsl:if test="$height"><xsl:attribute name="height"><xsl:value-of
select="$height"/></xsl:attribute></xsl:if>
  -            </img>
  -            <img src="{$spacer}" border="0" alt="" width="5" height="1" />
  -            </a>
  -          </xsl:for-each>
  -          </div>
  -        </xsl:if>
  +        <td class="logos" bgcolor="{$background-bars}" align="left" colspan="2">
  +          <xsl:if test="$filename = 'index.html'">
  +            <div>
  +              <!-- W3C logos -->
  +              <xsl:call-template name="compliancy-logos"/>
  +
  +              <xsl:if test="$config/credits">
  +                <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
  +                <xsl:for-each select="$config/credits/credit">
  +                  <xsl:variable name="name" select="name"/>
  +                  <xsl:variable name="url" select="url"/>
  +                  <xsl:variable name="image" select="image"/>
  +                  <xsl:variable name="width" select="width"/>
  +                  <xsl:variable name="height" select="height"/>
  +                  <a href="{$url}">
  +                    <img alt="{$name} logo" border="0">
  +                      <xsl:attribute name="src">
  +                        <xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of
select="$root"/></xsl:if>
  +                        <xsl:value-of select="$image"/>
  +                      </xsl:attribute>
  +                      <xsl:if test="$width"><xsl:attribute name="width"><xsl:value-of
select="$width"/></xsl:attribute></xsl:if>
  +                      <xsl:if test="$height"><xsl:attribute name="height"><xsl:value-of
select="$height"/></xsl:attribute></xsl:if>
  +                    </img>
  +                    <img src="{$spacer}" border="0" alt="" width="5" height="1" />
  +                  </a>
  +                </xsl:for-each>
  +              </xsl:if>
  +            </div>
  +          </xsl:if>
           <xsl:if test="$config/host-logo and not($config/host-logo = '')">
             <div class="host">
               <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
  
  
  

Mime
View raw message