Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPXDOC-204

Browse Source 
Plugin produces invalid xhtml.
Fix duplicate id attributes that are generated in the sitemap and
with several powered-by logos and contributors.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@541904 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2007-05-26 15:34:11 +00:00
parent 451226e00d
commit 6e3dc392bc
5 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xdoc/project.xml
View File

@ -23,7 +23,7 @@
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
<id>maven-xdoc-plugin</id> <id>maven-xdoc-plugin</id>
<name>Maven XDoc Plugin</name> <name>Maven XDoc Plugin</name>
<currentVersion>1.10.1</currentVersion> <currentVersion>1.10.2-SNAPSHOT</currentVersion>
<description>Convert xdocs into HTML.</description> <description>Convert xdocs into HTML.</description>
<shortDescription>Convert xdocs into HTML</shortDescription> <shortDescription>Convert xdocs into HTML</shortDescription>
<versions> <versions>

4
xdoc/src/plugin-resources/site.jsl
View File

@ -655,16 +655,18 @@
<!-- Process additional powered-by's --> <!-- Process additional powered-by's -->
<jsl:template match="powered-by" trim="true"> <jsl:template match="powered-by" trim="true">
<span id="poweredByExternal">
<x:forEach var="link" select="item"> <x:forEach var="link" select="item">
<x:set var="poweredbyimage" select="string(@img)"/> <x:set var="poweredbyimage" select="string(@img)"/>
<x:set var="poweredbytitle" select="string(@name)"/> <x:set var="poweredbytitle" select="string(@name)"/>
<x:set var="poweredbyurl" select="string(@href)"/> <x:set var="poweredbyurl" select="string(@href)"/>
<j:if test="${!empty(poweredbyimage)}"> <j:if test="${!empty(poweredbyimage)}">
<a id="poweredByExternal" href="${poweredbyurl}" title="${poweredbytitle}"> <a href="${poweredbyurl}" title="${poweredbytitle}">
<img alt="${poweredbytitle}" src="${poweredbyimage}" /> <img alt="${poweredbytitle}" src="${poweredbyimage}" />
</a> </a>
</j:if> </j:if>
</x:forEach> </x:forEach>
</span>
</jsl:template> </jsl:template>
<!-- Process the links navbar --> <!-- Process the links navbar -->

36
xdoc/src/plugin-resources/sitemap.jsl
View File

@ -37,6 +37,40 @@
bundle="plugin-resources.templates.templates" /> bundle="plugin-resources.templates.templates" />
</title> </title>
</properties> </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> <body>
<j:set var="name"><x:expr select="@name"/></j:set> <j:set var="name"><x:expr select="@name"/></j:set>
<section key="sitemap.section.title" <section key="sitemap.section.title"
@ -51,7 +85,6 @@
<jsl:template match="menu" trim="true"> <jsl:template match="menu" trim="true">
<x:set var="currentMenu" select="." /> <x:set var="currentMenu" select="." />
<div id="navcolumn">
<x:if select="$currentMenu/@name and not($currentMenu/@key)"> <x:if select="$currentMenu/@name and not($currentMenu/@key)">
<h5><x:expr select="string(@name)"/></h5> <h5><x:expr select="string(@name)"/></h5>
</x:if> </x:if>
@ -68,7 +101,6 @@
</h5> </h5>
</x:if> </x:if>
<ul><jsl:applyTemplates select="item"/></ul> <ul><jsl:applyTemplates select="item"/></ul>
</div>
</jsl:template> </jsl:template>
<jsl:template match="item"> <jsl:template match="item">

2
xdoc/src/plugin-resources/templates/team-list.xml
View File

@ -233,10 +233,8 @@
</td> </td>
<td>$!contributor.timezone</td> <td>$!contributor.timezone</td>
<td> <td>
<span id="contributor-$contributor.name">
<message key="template.team_list.section.developer.timezone.unknown" <message key="template.team_list.section.developer.timezone.unknown"
bundle="plugin-resources.templates.templates" /> bundle="plugin-resources.templates.templates" />
</span>
</td> </td>
</tr> </tr>
#end #end

3
xdoc/xdocs/changes.xml
View File

@ -28,6 +28,9 @@
<author email="shinobu@apache.org">Shinobu Kawai</author> <author email="shinobu@apache.org">Shinobu Kawai</author>
</properties> </properties>
<body> <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"> <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="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> <action dev="aheritier" type="add" issue="MPXDOC-203">New 'Built by Maven' logos - default changed to mavenlogo_builtby_w.png</action>