You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2007/05/26 17:34:11 UTC
svn commit: r541904 - in /maven/maven-1/plugins/trunk/xdoc: project.xml
src/plugin-resources/site.jsl src/plugin-resources/sitemap.jsl
src/plugin-resources/templates/team-list.xml xdocs/changes.xml
Author: ltheussl
Date: Sat May 26 08:34:11 2007
New Revision: 541904
URL: http://svn.apache.org/viewvc?view=rev&rev=541904
Log:
PR: MPXDOC-204
Plugin produces invalid xhtml.
Fix duplicate id attributes that are generated in the sitemap and
with several powered-by logos and contributors.
Modified:
maven/maven-1/plugins/trunk/xdoc/project.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/sitemap.jsl
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/project.xml?view=diff&rev=541904&r1=541903&r2=541904
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Sat May 26 08:34:11 2007
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-xdoc-plugin</id>
<name>Maven XDoc Plugin</name>
- <currentVersion>1.10.1</currentVersion>
+ <currentVersion>1.10.2-SNAPSHOT</currentVersion>
<description>Convert xdocs into HTML.</description>
<shortDescription>Convert xdocs into HTML</shortDescription>
<versions>
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl?view=diff&rev=541904&r1=541903&r2=541904
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/site.jsl Sat May 26 08:34:11 2007
@@ -655,16 +655,18 @@
<!-- Process additional powered-by's -->
<jsl:template match="powered-by" trim="true">
+ <span id="poweredByExternal">
<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}">
+ <a href="${poweredbyurl}" title="${poweredbytitle}">
<img alt="${poweredbytitle}" src="${poweredbyimage}" />
</a>
</j:if>
</x:forEach>
+ </span>
</jsl:template>
<!-- Process the links navbar -->
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/sitemap.jsl
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/sitemap.jsl?view=diff&rev=541904&r1=541903&r2=541904
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/sitemap.jsl (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/sitemap.jsl Sat May 26 08:34:11 2007
@@ -37,6 +37,40 @@
bundle="plugin-resources.templates.templates" />
</title>
</properties>
+ <head>
+ <style type="text/css">
+h5 {
+ font-size: smaller;
+ border-bottom: 1px solid #aaaaaa;
+ padding-top: 2px;
+ padding-left: 9px;
+ color: #49635a;
+ background-image: url(../images/h5.jpg);
+ background-repeat: no-repeat;
+ background-position: left bottom;
+}
+ul {
+ padding: 0;
+ margin: 5px 0 15px -0em;
+}
+ul ul {
+ margin: 0px 0 0px -0em;
+}
+li {
+ list-style-type: none;
+ background-image: none;
+ background-repeat: no-repeat;
+ background-position: 0 0.4em;
+ padding-left: 16px;
+ list-style-position: outside;
+ line-height: 1.2em;
+ font-size: smaller;
+}
+li.expanded {
+ background-image: url(images/expanded.gif);
+}
+ </style>
+ </head>
<body>
<j:set var="name"><x:expr select="@name"/></j:set>
<section key="sitemap.section.title"
@@ -51,7 +85,6 @@
<jsl:template match="menu" trim="true">
<x:set var="currentMenu" select="." />
- <div id="navcolumn">
<x:if select="$currentMenu/@name and not($currentMenu/@key)">
<h5><x:expr select="string(@name)"/></h5>
</x:if>
@@ -68,7 +101,6 @@
</h5>
</x:if>
<ul><jsl:applyTemplates select="item"/></ul>
- </div>
</jsl:template>
<jsl:template match="item">
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml?view=diff&rev=541904&r1=541903&r2=541904
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/templates/team-list.xml Sat May 26 08:34:11 2007
@@ -233,10 +233,8 @@
</td>
<td>$!contributor.timezone</td>
<td>
- <span id="contributor-$contributor.name">
- <message key="template.team_list.section.developer.timezone.unknown"
- bundle="plugin-resources.templates.templates" />
- </span>
+ <message key="template.team_list.section.developer.timezone.unknown"
+ bundle="plugin-resources.templates.templates" />
</td>
</tr>
#end
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?view=diff&rev=541904&r1=541903&r2=541904
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Sat May 26 08:34:11 2007
@@ -28,6 +28,9 @@
<author email="shinobu@apache.org">Shinobu Kawai</author>
</properties>
<body>
+ <release version="1.10.2-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPXDOC-204">Plugin produces invalid xhtml.</action>
+ </release>
<release version="1.10.1" date="2007-05-07">
<action dev="shinobu" type="fix" issue="MPXDOC-200" due-to="Benoit Xhenseval">maven-xdoc-plugin-1.10.1-SNAPSHOT fails under JDK 6</action>
<action dev="aheritier" type="add" issue="MPXDOC-203">New 'Built by Maven' logos - default changed to mavenlogo_builtby_w.png</action>