You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ch...@apache.org on 2003/09/02 15:13:21 UTC
cvs commit: xml-forrest/src/resources/skins/forrest-site/xslt/html site2xhtml.xsl
cheche 2003/09/02 06:13:21
Modified: src/resources/fresh-site/src/documentation skinconf.xml
src/resources/schema/relaxng skinconf.rnc
src/resources/skins/common/xslt/html renderlogo.xsl
site2xhtml.xsl
src/resources/skins/forrest-site/xslt/html site2xhtml.xsl
Log:
Add description to {group, project} logo.
PR: FOR-23
Revision Changes Path
1.13 +5 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- skinconf.xml 30 Aug 2003 05:26:48 -0000 1.12
+++ skinconf.xml 2 Sep 2003 13:13:21 -0000 1.13
@@ -11,7 +11,7 @@
<!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?,
+ 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?)>
@@ -26,9 +26,11 @@
<!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)>
@@ -70,6 +72,7 @@
<!-- mandatory project logo
skin: forrest-site renders it at the top -->
<project-name>MyProject</project-name>
+ <project-description>MyProject Description</project-description>
<project-url>http://myproj.mygroup.org/</project-url>
<project-logo>images/project.png</project-logo>
<!-- Alternative static image:
@@ -78,6 +81,7 @@
<!-- optional group logo
skin: forrest-site renders it at the top-left corner -->
<group-name>MyGroup</group-name>
+ <group-description>MyGroup Description</group-description>
<group-url>http://mygroup.org</group-url>
<group-logo>images/group.png</group-logo>
<!-- Alternative static image:
1.6 +2 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- skinconf.rnc 30 Aug 2003 05:26:48 -0000 1.5
+++ skinconf.rnc 2 Sep 2003 13:13:21 -0000 1.6
@@ -14,9 +14,11 @@
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'
+ element project-description {text}, # Eg 'XML standards-oriented project documentation framework'
element project-url {xsd:anyURI},
element project-logo {text}, # Eg 'images/project-logo.gif'
element group-name {text}?, # Group/Organization owning project, eg 'Apache XML'
+ element group-description {text}?, #
element group-url {xsd:anyURI}?,
element group-logo {text}?, # Eg images/group-logo.gif
element host-url {xsd:anyURI}?, # Eg Sourceforge URL
1.3 +4 -0 xml-forrest/src/resources/skins/common/xslt/html/renderlogo.xsl
Index: renderlogo.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/renderlogo.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- renderlogo.xsl 2 Feb 2003 04:26:06 -0000 1.2
+++ renderlogo.xsl 2 Sep 2003 13:13:21 -0000 1.3
@@ -19,6 +19,7 @@
<xsl:param name="width"/>
<xsl:param name="height"/>
<xsl:param name="root"/>
+ <xsl:param name="description"/>
<a href="{$url}">
<xsl:choose>
<xsl:when test="$logo and not($logo = '')">
@@ -32,6 +33,9 @@
</xsl:if>
<xsl:if test="$height">
<xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
+ </xsl:if>
+ <xsl:if test="$description">
+ <xsl:attribute name="title"><xsl:value-of select="$description"/></xsl:attribute>
</xsl:if>
</img>
</xsl:when>
1.8 +3 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- site2xhtml.xsl 22 May 2003 02:33:32 -0000 1.7
+++ site2xhtml.xsl 2 Sep 2003 13:13:21 -0000 1.8
@@ -59,6 +59,7 @@
<xsl:with-param name="url" select="$config/group-url"/>
<xsl:with-param name="logo" select="$config/group-logo"/>
<xsl:with-param name="root" select="$root"/>
+ <xsl:with-param name="description" select="$config/group-description"/>
</xsl:call-template>
</xsl:if>
<xsl:call-template name="renderlogo">
@@ -66,6 +67,7 @@
<xsl:with-param name="url" select="$config/project-url"/>
<xsl:with-param name="logo" select="$config/project-logo"/>
<xsl:with-param name="root" select="$root"/>
+ <xsl:with-param name="description" select="$config/project-description"/>
</xsl:call-template>
<xsl:comment>================= start Tabs ==================</xsl:comment>
<xsl:apply-templates select="div[@class='tab']"/>
1.22 +3 -1 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- site2xhtml.xsl 22 May 2003 02:33:33 -0000 1.21
+++ site2xhtml.xsl 2 Sep 2003 13:13:21 -0000 1.22
@@ -65,6 +65,7 @@
<xsl:with-param name="url" select="$config/group-url"/>
<xsl:with-param name="logo" select="$config/group-logo"/>
<xsl:with-param name="root" select="$root"/>
+ <xsl:with-param name="description" select="$config/group-description"/>
</xsl:call-template>
</xsl:if>
</td>
@@ -76,6 +77,7 @@
<xsl:with-param name="url" select="$config/project-url"/>
<xsl:with-param name="logo" select="$config/project-logo"/>
<xsl:with-param name="root" select="$root"/>
+ <xsl:with-param name="description" select="$config/project-description"/>
</xsl:call-template>
</td>
<xsl:comment>================= end Project Logo ==================</xsl:comment>