forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject cvs commit: xml-forrest/src/core/context/skins/common/images favicon.ico
Date Wed, 28 Jan 2004 21:23:20 GMT
brondsem    2004/01/28 13:23:20

  Modified:    src/core/context/resources/schema/relaxng skinconf.rnc
               src/core/context/skins/avalon-tigris/xslt/html
                        site2xhtml.xsl
               src/core/context/skins/common/xslt/html site2xhtml.xsl
               src/core/context/skins/forrest-css/xslt/html site2xhtml.xsl
               src/core/context/skins/forrest-site/xslt/html site2xhtml.xsl
               src/core/context/skins/krysalis-site/xslt/html
                        site2xhtml.xsl
               src/core/context/skins/tigris-style/xslt/html site2xhtml.xsl
               src/core/fresh-site/src/documentation skinconf.xml
               src/documentation/conf cli.xconf
               src/documentation skinconf.xml
  Added:       src/documentation/content favicon.ico
  Removed:     src/core/context/skins/common/images favicon.ico
  Log:
  favicon-url in skinconf; no default favicon; apache favicon for forrest project
  
  Revision  Changes    Path
  1.7       +1 -0      xml-forrest/src/core/context/resources/schema/relaxng/skinconf.rnc
  
  Index: skinconf.rnc
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources/schema/relaxng/skinconf.rnc,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- skinconf.rnc	23 Jan 2004 12:11:42 -0000	1.6
  +++ skinconf.rnc	28 Jan 2004 21:23:20 -0000	1.7
  @@ -26,6 +26,7 @@
               element group-logo {text}?,              # Eg images/group-logo.gif
               element host-url {xsd:anyURI}?,          # Eg Sourceforge URL
               element host-logo {text}?,
  +            element favicon-url {text}?,
               element year {text}?,                    # Used in Copyright
               element vendor {text}?,                  # Used in Copyright
               trail?,                                  # 'Breadcrumbs' trail in skins that
support it
  
  
  
  1.2       +8 -1      xml-forrest/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- site2xhtml.xsl	20 Oct 2003 15:38:48 -0000	1.1
  +++ site2xhtml.xsl	28 Jan 2004 21:23:20 -0000	1.2
  @@ -31,6 +31,13 @@
               <link type="text/css" href="{$root}skin/mysite.css" rel="stylesheet" />
               <link type="text/css" href="{$root}skin/site.css"   rel="stylesheet" />
               <link type="text/css" href="{$root}skin/print.css"  rel="stylesheet" media="print"
/>
  +            <xsl:if test="$config/favicon-url">
  +              <link rel="shortcut icon">
  +                <xsl:attribute name="href">
  +                  <xsl:value-of select="concat($root,$config/favicon-url)"/>
  +                </xsl:attribute>
  +              </link>
  +            </xsl:if>
   
               <title>
                 <xsl:value-of select="/site/document/title" />
  
  
  
  1.5       +8 -1      xml-forrest/src/core/context/skins/common/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- site2xhtml.xsl	17 Dec 2003 23:18:01 -0000	1.4
  +++ site2xhtml.xsl	28 Jan 2004 21:23:20 -0000	1.5
  @@ -58,6 +58,13 @@
       <html>
         <head>
           <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
  +        <xsl:if test="$config/favicon-url">
  +          <link rel="shortcut icon">
  +            <xsl:attribute name="href">
  +              <xsl:value-of select="concat($root,$config/favicon-url)"/>
  +            </xsl:attribute>
  +          </link>
  +        </xsl:if>
         </head>
         <body>
           <xsl:if test="$config/group-url">
  
  
  
  1.4       +8 -3      xml-forrest/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- site2xhtml.xsl	26 Nov 2003 09:15:32 -0000	1.3
  +++ site2xhtml.xsl	28 Jan 2004 21:23:20 -0000	1.4
  @@ -35,7 +35,13 @@
           <title><xsl:value-of select="div[@class='content']/h1"/></title>
           <link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
           <link rel="alternate stylesheet" title="Krysalis" href="{$root}skin/krysalis.css"
type="text/css"/>
  -		 <link rel="shortcut icon" href="{$root}favicon.ico" />		 
  +        <xsl:if test="$config/favicon-url">
  +          <link rel="shortcut icon">
  +            <xsl:attribute name="href">
  +              <xsl:value-of select="concat($root,$config/favicon-url)"/>
  +            </xsl:attribute>
  +          </link>
  +        </xsl:if>
         </head>
         <body>
         	<div id="toplinks">
  @@ -121,7 +127,6 @@
   			<a href="{$skin-img-dir}/chapter.gif"/>
   			<a href="{$skin-img-dir}/chapter_open.gif"/>
   			<a href="{$skin-img-dir}/current.gif"/>
  -			<a href="/favicon.ico"/>
   	
   			<span id="copyright">Copyright &#169;
   				<xsl:value-of select="$config/year"/>&#160;<xsl:value-of
  
  
  
  1.5       +8 -2      xml-forrest/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- site2xhtml.xsl	29 Dec 2003 10:04:41 -0000	1.4
  +++ site2xhtml.xsl	28 Jan 2004 21:23:20 -0000	1.5
  @@ -32,6 +32,13 @@
         <head>
           <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
           <link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
  +        <xsl:if test="$config/favicon-url">
  +          <link rel="shortcut icon">
  +            <xsl:attribute name="href">
  +              <xsl:value-of select="concat($root,$config/favicon-url)"/>
  +            </xsl:attribute>
  +          </link>
  +        </xsl:if>
         </head>
         <body bgcolor="#FFFFFF" text="#000000">
       <xsl:comment>================= start Navigation Path ==================</xsl:comment>
  @@ -201,7 +208,6 @@
             <a href="{$skin-img-dir}/chapter.gif"/>
             <a href="{$skin-img-dir}/chapter_open.gif"/>
             <a href="{$skin-img-dir}/current.gif"/>
  -          <a href="/favicon.ico"/>
           </td>
         </tr>
         <tr>
  
  
  
  1.13      +8 -2      xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
  
  Index: site2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- site2xhtml.xsl	11 Jan 2004 23:20:50 -0000	1.12
  +++ site2xhtml.xsl	28 Jan 2004 21:23:20 -0000	1.13
  @@ -29,7 +29,13 @@
           <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
           <link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
           <link rel="stylesheet" href="{$root}skin/forrest.css" type="text/css"/>
  -		<link rel="shortcut icon" href="{$root}favicon.ico" />		
  +        <xsl:if test="$config/favicon-url">
  +          <link rel="shortcut icon">
  +            <xsl:attribute name="href">
  +              <xsl:value-of select="concat($root,$config/favicon-url)"/>
  +            </xsl:attribute>
  +          </link>
  +        </xsl:if>
           <script type="text/javascript" language="javascript" src="{$root}skin/fontsize.js"></script>
           <script type="text/javascript" language="javascript" src="{$root}skin/menu.js"></script>
         </head>
  
  
  
  1.6       +8 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- site2xhtml.xsl	11 Jan 2004 23:24:00 -0000	1.5
  +++ site2xhtml.xsl	28 Jan 2004 21:23:20 -0000	1.6
  @@ -36,6 +36,13 @@
           </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" />
  +        <xsl:if test="$config/favicon-url">
  +          <link rel="shortcut icon">
  +            <xsl:attribute name="href">
  +              <xsl:value-of select="concat($root,$config/favicon-url)"/>
  +            </xsl:attribute>
  +          </link>
  +        </xsl:if>
           <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>
  
  
  
  1.12      +5 -1      xml-forrest/src/core/fresh-site/src/documentation/skinconf.xml
  
  Index: skinconf.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/fresh-site/src/documentation/skinconf.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- skinconf.xml	23 Jan 2004 09:52:45 -0000	1.11
  +++ skinconf.xml	28 Jan 2004 21:23:20 -0000	1.12
  @@ -12,7 +12,7 @@
     <!ELEMENT skinconfig (disable-lucene?, disable-search?, disable-print-link?, disable-pdf-link?,
     disable-xml-link?, disable-external-link-image?, 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?, headings?, colors?, extra-css?,
credits?)*>
  +  host-url?, host-logo?, favicon-url?, year?, vendor?, trail?, toc?, headings?, colors?,
extra-css?, credits?)*>
     <!ELEMENT credits (credit*)>
     <!ELEMENT credit (name, url, image?, width?, height?)>
     <!-- id uniquely identifies the tool, and role indicates its function -->
  @@ -44,6 +44,7 @@
     <!ELEMENT host-logo (#PCDATA)>
     <!ATTLIST host-logo width CDATA #IMPLIED 
                         height CDATA #IMPLIED>
  +  <!ELEMENT favicon-url (#PCDATA)>
     <!ELEMENT year (#PCDATA)>
     <!ELEMENT vendor (#PCDATA)>
     <!ELEMENT trail (link1, link2, link3)>
  @@ -123,6 +124,9 @@
          skin: forrest-site renders it at the bottom-left corner -->
     <host-url></host-url>
     <host-logo></host-logo>
  +  
  +  <!-- relative url of a favicon file, normally favicon.ico -->
  +  <favicon-url></favicon-url>
   
     <!-- The following are used to construct a copyright statement -->
     <year>2004</year>
  
  
  
  1.3       +1 -4      xml-forrest/src/documentation/conf/cli.xconf
  
  Index: cli.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/conf/cli.xconf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- cli.xconf	9 Nov 2003 10:34:16 -0000	1.2
  +++ cli.xconf	28 Jan 2004 21:23:20 -0000	1.3
  @@ -144,9 +144,6 @@
          <exclude pattern="site:**"/>
          <exclude pattern="ext:**"/>
   
  -       <uri src="favicon.ico"/>
  -
  -
      <!--+
          |  File containing URIs (plain text, one per
          |  line).
  
  
  
  1.15      +5 -1      xml-forrest/src/documentation/skinconf.xml
  
  Index: skinconf.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/documentation/skinconf.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- skinconf.xml	8 Jan 2004 22:33:11 -0000	1.14
  +++ skinconf.xml	28 Jan 2004 21:23:20 -0000	1.15
  @@ -12,7 +12,7 @@
     <!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?)*>
  +  host-url?, host-logo?, favicon-url?, 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 -->
  @@ -37,6 +37,7 @@
     <!ELEMENT group-logo (#PCDATA)>
     <!ELEMENT host-url (#PCDATA)>
     <!ELEMENT host-logo (#PCDATA)>
  +  <!ELEMENT favicon-url (#PCDATA)>
     <!ELEMENT year (#PCDATA)>
     <!ELEMENT vendor (#PCDATA)>
     <!ELEMENT trail (link1, link2, link3)>
  @@ -91,6 +92,9 @@
          skin: forrest-site renders it at the bottom-left corner -->
     <host-url></host-url>
     <host-logo></host-logo>
  +  
  +  <!-- relative url of a favicon file, normally favicon.ico -->
  +  <favicon-url>favicon.ico</favicon-url>
   
     <!-- The following are used to construct a copyright statement -->
     <year>2002-2004</year>
  
  
  
  1.1                  xml-forrest/src/documentation/content/favicon.ico
  
  	<<Binary file>>
  
  

Mime
View raw message