Author: ltheussl
Date: Sat Sep 17 20:02:45 2005
New Revision: 289882
URL: http://svn.apache.org/viewcvs?rev=289882&view=rev
Log:
Add support for more powered-by banners. Thanks to Maarten Coene
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/index.xml
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css?rev=289882&r1=289881&r2=289882&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css
(original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/css/maven-base.css
Sat Sep 17 20:02:45 2005
@@ -89,7 +89,7 @@
#navcolumn li.collapsed {
background-image: url(../images/collapsed.gif);
}
-#poweredBy {
+#poweredBy, #poweredByExternal {
text-align: center;
}
#navcolumn img {
@@ -102,6 +102,10 @@
border: 1px solid black;
width: 90px;
height: 30px;
+}
+#poweredByExternal img {
+ display:block;
+ margin: 20px 0 20px 17px;
}
#searchbar img {
margin: 0px;
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl?rev=289882&r1=289881&r2=289882&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl Sat Sep 17
20:02:45 2005
@@ -397,6 +397,10 @@
</j:if>
</j:if>
+ <x:if select="$nav/body/powered-by">
+ <jsl:applyTemplates select="$nav/body/powered-by"/>
+ </x:if>
+
<!-- Standard Maven Navigation -->
<j:set var="fileName">${file}</j:set>
<j:set var="poweredbyimage">${maven.xdoc.poweredby.image}</j:set>
@@ -639,7 +643,21 @@
<j:set var="linkCount" value="${1+linkCount}"/>
</x:forEach>
</jsl:template>
-
+
+ <!-- Process additional powered-by's -->
+ <jsl:template match="powered-by" trim="true">
+ <x:forEach var="link" select="item">
+ <x:set var="poweredbyimage" select="string(@img)"/>
+ <x:set var="poweredbytitle" select="string(@name)"/>
+ <x:set var="poweredbyurl" select="string(@href)"/>
+ <j:if test="${!empty(poweredbyimage)}">
+ <a id="poweredByExternal" href="${poweredbyurl}"
title="${poweredbytitle}">
+ <img alt="${poweredbytitle}" src="${poweredbyimage}" />
+ </a>
+ </j:if>
+ </x:forEach>
+ </jsl:template>
+
<!-- Process the breadcrumb navbar -->
<jsl:template match="breadcrumbs" trim="true">
<x:forEach var="link" select="item">
Modified: maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd?rev=289882&r1=289881&r2=289882&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd Sat Sep 17
20:02:45 2005
@@ -42,6 +42,7 @@
<xs:element ref="links" minOccurs="0"/>
<xs:element ref="menu" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="search" minOccurs="0"/>
+ <xs:element ref="powered-by" minOccurs="0"/>
<xs:element ref="footer" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
@@ -72,6 +73,13 @@
<xs:attribute name="key" type="xs:string"/>
<!-- type is an optional entry that defines where the menu is destined
for.
Values - left-header (default), left-footer -->
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="powered-by">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="item">
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=289882&r1=289881&r2=289882&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Sat Sep 17 20:02:45 2005
@@ -27,6 +27,8 @@
</properties>
<body>
<release version="1.10" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPXDOC-126" due-to="Maarten
Coene">Add support for more powered-by banners.</action>
+
<action dev="ltheussl" type="add" issue="MPXDOC-80" due-to="Joerg
Schaible">Support global theme.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-24" due-to="Gilles
Dodinet">Add a navigation bar.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-158">Add an optional id
tag to sub/sections, so they can be referenced.</action>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/index.xml?rev=289882&r1=289881&r2=289882&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/index.xml Sat Sep 17 20:02:45 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE document [
- <!ENTITY escapeXmlExample SYSTEM "escapeXml.xml">
+ <!ENTITY escapeXmlExample SYSTEM "file:xdocs/escapeXml.xml">
]>
<!--
/*
@@ -58,8 +58,22 @@
<source><![CDATA[<navbar prev="first.html" home="../index.html"
next="next.html"/>]]></source>
</subsection>
<subsection name="Google Search">
- <p>If a <code>search</code> element is found in the
<code>navigation.xml</code> body, a search navigation menu is generated that
uses <a href="http://www.google.com";>google</a>
+ <p>If a <code><search/></code> element is found in the
<code>navigation.xml</code> body, a search navigation menu is generated that
uses <a href="http://www.google.com";>google</a>
</p>
+ </subsection>
+ <subsection name="Additional 'powered-by' logos">
+ <p>
+ You can add additional 'powered-by' logos above the maven logo by
+ specifying a <code><powered-by></code> element in the body
+ of <code>navigation.xml</code>, e.g.:
+ </p>
+ <source><![CDATA[<powered-by>
+ <item
+ name="Hosted by SourceForge"
+ href="http://www.sourceforge.net";
+ img="http://sourceforge.net/sflogo.php?group_id=16035&type=1"/>
+</powered-by>]]></source>
+ <p>You may specify several items to include more logos.</p>
</subsection>
<subsection name="escapeXml Tag">
<p>If you need to include the contents of another XML document in your
document, you can use the <code><escapeXml></code> tag, as demonstrated
below. For instance, the code:</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
