forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/core/context/skins/tigris-style/css forrest.css.xslt
Date Tue, 13 Jan 2004 08:19:53 GMT
nicolaken    2004/01/13 00:19:53

  Modified:    src/core/context/skins/common/xslt/html document2html.xsl
               src/core/context/skins/common/css forrest.css.xslt
               src/core/context/skins/krysalis-site/css forrest.css.xslt
               src/core/context/skins/tigris-style/css forrest.css.xslt
  Log:
  Change the external link image to be defined in CSS, as it should be.
  Make the generated css files of the skins import a generic template in
  the common skin.
  
  Revision  Changes    Path
  1.4       +3 -3      xml-forrest/src/core/context/skins/common/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/xslt/html/document2html.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- document2html.xsl	30 Dec 2003 00:00:06 -0000	1.3
  +++ document2html.xsl	13 Jan 2004 08:19:53 -0000	1.4
  @@ -244,8 +244,8 @@
             </a>
          </xsl:when>
          <xsl:when test="not($disable-external-link-image='true') and contains(@href,
':') and not(contains(@href, $config/group-url)) and not(contains(@href, $config/project-url))">
  -          <a href="{@href}">
  -            <xsl:apply-templates/>&#160;<img src="{$skin-img-dir}/external-link.gif"
border="0" alt=" -> "/>&#160;
  +          <a href="{@href}" class="external">
  +            <xsl:apply-templates/>
             </a>
          </xsl:when>       
          <xsl:otherwise>
  
  
  
  1.2       +26 -8     xml-forrest/src/core/context/skins/common/css/forrest.css.xslt
  
  Index: forrest.css.xslt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/css/forrest.css.xslt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrest.css.xslt	3 Jan 2004 15:35:37 -0000	1.1
  +++ forrest.css.xslt	13 Jan 2004 08:19:53 -0000	1.2
  @@ -4,13 +4,23 @@
          stylesheet in standalone editors -->
     <xsl:output method = "text"  omit-xml-declaration="yes"  />
   
  +<!--
  +  If the skin doesn't override this, at least aural styles 
  +  and extra-css are present 
  +-->
     <xsl:template match="skinconfig">
   /* $Id$ */
   
  -/*
  -  If the skin doesn't override this, at least aural styles 
  -  and extra-css are present 
  -*/
  +   <xsl:call-template name="aural"/>
  +   <xsl:call-template name="a-external"/>
  +   <xsl:apply-templates/>
  +  </xsl:template>
  +
  +  <xsl:template match="colors">
  +   <xsl:apply-templates/>
  +  </xsl:template>
  +  
  +  <xsl:template name="aural">
   
   /* ==================== aural ============================ */
   
  @@ -37,10 +47,18 @@
     :visited { voice-family: betty, female }
     :active { voice-family: betty, female; pitch-range: 80; pitch: x-high }
   }
  -
  -   <xsl:apply-templates/>
     </xsl:template>
  -
  +  
  +  <xsl:template name="a-external">
  +a.external  {
  +        padding: 0 20px 0px 0px;
  +	display:inline; display:inline-block;
  +        background-repeat: no-repeat;
  +	background-position: center right;
  +	background-image: url(/skin/images/external-link.gif);
  +}
  +  </xsl:template>
  +  
     <xsl:template match="extra-css">
       <xsl:value-of select="."/>
     </xsl:template>
  
  
  
  1.6       +3 -16     xml-forrest/src/core/context/skins/krysalis-site/css/forrest.css.xslt
  
  Index: forrest.css.xslt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/css/forrest.css.xslt,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- forrest.css.xslt	9 Jan 2004 15:28:36 -0000	1.5
  +++ forrest.css.xslt	13 Jan 2004 08:19:53 -0000	1.6
  @@ -1,13 +1,12 @@
   <?xml version="1.0"?>
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +
  +  <xsl:import href="../../common/css/forrest.css.xslt"/>
  +
     <!-- This is not used by Forrest but makes it possible to debug the 
          stylesheet in standalone editors -->
     <xsl:output method = "text"  omit-xml-declaration="yes"  />
     
  -  <xsl:template match="colors">
  -   <xsl:apply-templates/>
  -  </xsl:template>
  -
   <!-- ==================== main block colors ============================ -->
   <xsl:template match="color[@name='header']">
   .header         { background-color: <xsl:value-of select="@value"/>;} 
  @@ -67,17 +66,5 @@
   <xsl:template match="color[@name='table-cell']"> 
   .content .ForrestTable td   { background-color: <xsl:value-of select="@value"/>;}
</xsl:template> 
   
  -
  -  <xsl:template match="skinconfig">
  -/* $Id$ */
  -   <xsl:apply-templates/>
  -  </xsl:template>
  -
  -  <xsl:template match="extra-css">
  -    <xsl:value-of select="."/>
  -  </xsl:template>
  -  
  -  <xsl:template match="*"></xsl:template>
  -  <xsl:template match="text()"></xsl:template>
   
   </xsl:stylesheet>
  
  
  
  1.3       +3 -18     xml-forrest/src/core/context/skins/tigris-style/css/forrest.css.xslt
  
  Index: forrest.css.xslt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/tigris-style/css/forrest.css.xslt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forrest.css.xslt	3 Jan 2004 15:36:29 -0000	1.2
  +++ forrest.css.xslt	13 Jan 2004 08:19:53 -0000	1.3
  @@ -1,13 +1,12 @@
   <?xml version="1.0"?>
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  +
  +  <xsl:import href="../../common/css/forrest.css.xslt"/>
  +
     <!-- This is not used by Forrest but makes it possible to debug the 
          stylesheet in standalone editors -->
     <xsl:output method = "text"  omit-xml-declaration="yes"  />
   
  -  <xsl:template match="colors">
  -   <xsl:apply-templates/>
  -  </xsl:template>
  -
   <xsl:template match="group-logo">
     <xsl:if test="'@width' and '@height'">
   #cn {
  @@ -103,19 +102,5 @@
   body .grid td {
   	background-color: <xsl:value-of select="@value"/>;
   } </xsl:template> 
  -
  -
  -
  -  <xsl:template match="skinconfig">
  -/* $Id$ */
  -   <xsl:apply-templates/>
  -  </xsl:template>
  -
  -  <xsl:template match="extra-css">
  -    <xsl:value-of select="."/>
  -  </xsl:template>
  -  
  -  <xsl:template match="*"></xsl:template>
  -  <xsl:template match="text()"></xsl:template>
   
   </xsl:stylesheet>
  
  
  

Mime
View raw message