forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject svn commit: rev 10645 - in xml/forrest/trunk/src/core: context/resources/schema context/resources/schema/dtd context/skins/avalon-tigris/xslt/html context/skins/common/xslt/html context/skins/forrest-css/xslt/html context/skins/forrest-site/xslt/html context/skins/krysalis-site/xslt/html context/skins/tigris-style/xslt/html fresh-site/src/documentation
Date Fri, 14 May 2004 15:46:22 GMT
Author: brondsem
Date: Fri May 14 08:46:21 2004
New Revision: 10645

Added:
   xml/forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-1.dtd
Modified:
   xml/forrest/trunk/src/core/context/resources/schema/catalog.xcat
   xml/forrest/trunk/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl
   xml/forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl
   xml/forrest/trunk/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl
   xml/forrest/trunk/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
   xml/forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
   xml/forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl
   xml/forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml
Log:
copyright link ability on skins; fixes FOR-120

Modified: xml/forrest/trunk/src/core/context/resources/schema/catalog.xcat
==============================================================================
--- xml/forrest/trunk/src/core/context/resources/schema/catalog.xcat	(original)
+++ xml/forrest/trunk/src/core/context/resources/schema/catalog.xcat	Fri May 14 08:46:21 2004
@@ -43,6 +43,8 @@
         uri="dtd/v20a/document-v20.dtd"/>
 <public publicId="-//APACHE//DTD Skin Configuration V0.6//EN"
         uri="dtd/skinconfig-v06.dtd"/>
+<public publicId="-//APACHE//DTD Skin Configuration V0.6-1//EN"
+        uri="dtd/skinconfig-v06-1.dtd"/>
 <public publicId="-//APACHE//ENTITIES Documentation V2.0a//EN"
         uri="dtd/v20a/document-v20.mod"/>
 <public publicId="-//APACHE//DTD FAQ V2.0a//EN"

Added: xml/forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-1.dtd
==============================================================================
--- (empty file)
+++ xml/forrest/trunk/src/core/context/resources/schema/dtd/skinconfig-v06-1.dtd	Fri May 14
08:46:21 2004
@@ -0,0 +1,114 @@
+<!--
+  Copyright 2002-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- ===================================================================
+
+     Forrest Skinconf DTD (Version 0.6)
+
+PURPOSE:
+  This DTD was developed to create a simple Skin configuration 
+  for the Forrest skins.
+
+TYPICAL INVOCATION:
+
+  <!DOCTYPE skinconfig PUBLIC
+       "-//APACHE//DTD Skin Configuration Vx.y//EN"
+       "skinconf-vxy.dtd">
+  where
+    x := major version
+    y := minor version
+
+NOTES:
+ 
+==================================================================== -->
+
+  <!ENTITY % links.att 'name CDATA #REQUIRED 
+                        href CDATA #REQUIRED' >  
+
+  <!ELEMENT skinconfig (search?, disable-print-link?, disable-pdf-link?, 
+   disable-xml-link?, disable-external-link-image?, 
+   disable-compliance-links?, obfuscate-mail-links?, 
+   project-name?, project-description?, project-url?, project-logo,
+   group-name?, group-description?, group-url?, group-logo?,
+   host-url?, host-logo?, favicon-url?, year?, vendor?, copyright-link?, trail?, 
+   toc?, headings?, extra-css?, colors?, pdf?, credits?)>
+
+  <!ELEMENT search EMPTY>
+  <!ATTLIST search name     CDATA #IMPLIED
+                   domain   CDATA #IMPLIED
+                   provider CDATA #IMPLIED>
+  <!ELEMENT disable-print-link (#PCDATA)>
+  <!ELEMENT disable-pdf-link (#PCDATA)>
+  <!ELEMENT disable-xml-link (#PCDATA)>
+  <!ELEMENT disable-external-link-image (#PCDATA)>
+  <!ELEMENT disable-compliance-links (#PCDATA)>
+  <!ELEMENT obfuscate-mail-links (#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)>
+  <!ELEMENT host-logo (#PCDATA)>
+  <!ELEMENT favicon-url (#PCDATA)>
+  <!ELEMENT year (#PCDATA)>
+  <!ELEMENT vendor (#PCDATA)>
+  <!ELEMENT copyright-link (#PCDATA)>
+  <!ELEMENT trail (link1, link2, link3)>
+  <!ELEMENT link1 EMPTY>
+  <!ATTLIST link1 %links.att;>
+  <!ELEMENT link2 EMPTY>
+  <!ATTLIST link2 %links.att;>
+  <!ELEMENT link3 EMPTY>
+  <!ATTLIST link3 %links.att;>
+ 
+  <!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 name (#PCDATA)>
+  <!ELEMENT url (#PCDATA)>
+  <!ELEMENT image (#PCDATA)>
+  <!ELEMENT width (#PCDATA)>
+  <!ELEMENT height (#PCDATA)>
+  <!ELEMENT toc EMPTY>
+  <!ATTLIST toc max-depth CDATA #IMPLIED>
+  <!ATTLIST toc min-sections CDATA #IMPLIED>
+  <!ATTLIST toc location CDATA #IMPLIED>
+  <!ELEMENT headings EMPTY>
+  <!ATTLIST headings type CDATA #REQUIRED>
+  <!ELEMENT colors (color*)>
+  <!ELEMENT color EMPTY>
+  <!ATTLIST color name   CDATA #IMPLIED
+                  value  CDATA #IMPLIED
+                  link   CDATA #IMPLIED
+                  vlink  CDATA #IMPLIED
+                  hlink  CDATA #IMPLIED>
+  <!ELEMENT extra-css (#PCDATA)>
+  <!ELEMENT pdf (page, margins?)>
+  <!ELEMENT page EMPTY>
+  <!ATTLIST page size (a0|a1|a2|a3|a4|a5|executive|folio|legal|ledger|letter|quarto|tabloid)
"letter"
+            orientation (portrait|landscape) "portrait">
+
+  <!ELEMENT margins (top?, bottom?, inner?, outer?)>
+  <!ATTLIST margins double-sided (true | false) "false">
+  <!ELEMENT top (#PCDATA)>
+  <!ELEMENT bottom (#PCDATA)>
+  <!ELEMENT inner (#PCDATA)>
+  <!ELEMENT outer (#PCDATA)>

Modified: xml/forrest/trunk/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/trunk/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl	Fri May
14 08:46:21 2004
@@ -171,8 +171,22 @@
         <td colspan="2">
           <div align="center">
             <div class="copyright">
-              Copyright &#169; <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-              select="$config/vendor"/>. All rights reserved.
+              <xsl:choose>
+                <xsl:when test="$config/copyright-link">
+                  <a>
+                    <xsl:attribute name="href">
+                      <xsl:value-of select="$config/copyright-link"/>
+                    </xsl:attribute>
+                  Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+                  <xsl:value-of select="$config/vendor"/>
+                  </a>
+                </xsl:when>
+                <xsl:otherwise>
+                  Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+                  <xsl:value-of select="$config/vendor"/>
+                </xsl:otherwise>
+              </xsl:choose>
+              All rights reserved.
             </div>
           </div>
         </td>

Modified: xml/forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl	Fri May 14 08:46:21
2004
@@ -112,8 +112,22 @@
         <xsl:comment>================= end Content==================</xsl:comment>
 
         <xsl:comment>================= start Footer ==================</xsl:comment>
-        Copyright &#169; <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-          select="$config/vendor"/> All rights reserved.
+        <xsl:choose>
+          <xsl:when test="$config/copyright-link">
+            <a>
+              <xsl:attribute name="href">
+                <xsl:value-of select="$config/copyright-link"/>
+              </xsl:attribute>
+            Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+            <xsl:value-of select="$config/vendor"/>
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+            <xsl:value-of select="$config/vendor"/>
+          </xsl:otherwise>
+        </xsl:choose>
+        All rights reserved.
         <script language="JavaScript" type="text/javascript"><![CDATA[<!--
           document.write(" - "+"Last Published: " + document.lastModified);
           //  -->]]></script>

Modified: xml/forrest/trunk/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/trunk/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl	Fri May
14 08:46:21 2004
@@ -158,10 +158,21 @@
 			<a href="{$skin-img-dir}/chapter.gif"/>
 			<a href="{$skin-img-dir}/chapter_open.gif"/>
 			<a href="{$skin-img-dir}/current.gif"/>
-	
-			<span id="copyright">Copyright &#169;
-				<xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-			  select="$config/vendor"/> All rights reserved.
+			<span id="copyright">
+				<xsl:choose>
+					<xsl:when test="$config/copyright-link">
+						<a>
+							<xsl:attribute name="href">
+								<xsl:value-of select="$config/copyright-link"/>
+							</xsl:attribute>
+							Copyright &#169; <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
select="$config/vendor"/>
+						</a>
+					</xsl:when>
+					<xsl:otherwise>
+						Copyright &#169; <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
select="$config/vendor"/>
+					</xsl:otherwise>
+				</xsl:choose>
+				All rights reserved.
 			</span>
 			<br class="textonly"/>
 			<span id="revision"><script language="JavaScript" type="text/javascript"><![CDATA[<!--

Modified: xml/forrest/trunk/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/trunk/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl	Fri May
14 08:46:21 2004
@@ -259,11 +259,27 @@
       </tr>
       <tr>
         <td align="center" class="copyright" bgcolor="{$background-bars}" colspan="2">
-          <font face="Arial, Helvetica, Sans-Serif" size="2">Copyright &#169;
-          <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-          select="$config/vendor"/> All rights reserved.<script language="JavaScript"
type="text/javascript"><![CDATA[<!--
+          <font face="Arial, Helvetica, Sans-Serif" size="2">
+          <xsl:choose>
+            <xsl:when test="$config/copyright-link">
+              <a>
+                <xsl:attribute name="href">
+                  <xsl:value-of select="$config/copyright-link"/>
+                </xsl:attribute>
+              Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+              <xsl:value-of select="$config/vendor"/>
+              </a>
+            </xsl:when>
+            <xsl:otherwise>
+              Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+              <xsl:value-of select="$config/vendor"/>
+            </xsl:otherwise>
+          </xsl:choose>
+          All rights reserved.
+          <script language="JavaScript" type="text/javascript"><![CDATA[<!--
               document.write(" - "+"Last Published: " + document.lastModified);
-            //  -->]]></script></font>
+            //  -->]]></script>
+        </font>
         </td>
       </tr>
       <tr>

Modified: xml/forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/trunk/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl	Fri May
14 08:46:21 2004
@@ -521,9 +521,23 @@
           </div>
         </xsl:if>
         <td width="90%" align="center" colspan="2">
-          <span class="footnote">Copyright &#169;
-            <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-              select="$config/vendor"/> All rights reserved.
+          <span class="footnote">
+            <xsl:choose>
+              <xsl:when test="$config/copyright-link">
+                <a>
+                  <xsl:attribute name="href">
+                    <xsl:value-of select="$config/copyright-link"/>
+                  </xsl:attribute>
+                Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+                <xsl:value-of select="$config/vendor"/>
+                </a>
+              </xsl:when>
+              <xsl:otherwise>
+                Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+                <xsl:value-of select="$config/vendor"/>
+              </xsl:otherwise>
+            </xsl:choose>
+            All rights reserved.
             <br/><script language="JavaScript" type="text/javascript"><![CDATA[<!--
               document.write(" - "+"Last Published: " + document.lastModified);
               //  -->]]></script></span>

Modified: xml/forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/trunk/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl	Fri May
14 08:46:21 2004
@@ -368,9 +368,22 @@
             </xsl:call-template>
         </xsl:if></td>
      <td>
-         Copyright &#169;
-            <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-              select="$config/vendor"/> All rights reserved.
+      <xsl:choose>
+        <xsl:when test="$config/copyright-link">
+          <a>
+            <xsl:attribute name="href">
+              <xsl:value-of select="$config/copyright-link"/>
+            </xsl:attribute>
+          Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+          <xsl:value-of select="$config/vendor"/>
+          </a>
+        </xsl:when>
+        <xsl:otherwise>
+          Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
+          <xsl:value-of select="$config/vendor"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      All rights reserved.
             <br/><script language="JavaScript" type="text/javascript"><![CDATA[<!--
               document.write(" - "+"Last Published: " + document.lastModified);
               //  -->]]></script>

Modified: xml/forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml
==============================================================================
--- xml/forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml	(original)
+++ xml/forrest/trunk/src/core/fresh-site/src/documentation/skinconf.xml	Fri May 14 08:46:21
2004
@@ -21,8 +21,8 @@
 -->
 
  <!DOCTYPE skinconfig PUBLIC
-        "-//APACHE//DTD Skin Configuration V0.6//EN"
-        "skinconfig-v06.dtd">
+        "-//APACHE//DTD Skin Configuration V0.6-1//EN"
+        "skinconfig-v06-1.dtd">
 
 <skinconfig>
   <!-- To enable lucene search add provider="lucene" -->
@@ -77,6 +77,9 @@
   <!-- The following are used to construct a copyright statement -->
   <year>2004</year>
   <vendor>The Acme Software Foundation.</vendor>
+  <!-- if present, the copyright-link URL will used as a link in the copyright statement
+  <copyright-link>http://www.apache.org/licenses/LICENSE-2.0</copyright-link>
+  -->
 
   <!-- Some skins use this to form a 'breadcrumb trail' of links. If you don't
   want these, set the attributes to blank. The DTD purposefully requires them.

Mime
View raw message