diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly index 9dfa03ee..4737e87f 100644 --- a/xdoc/plugin.jelly +++ b/xdoc/plugin.jelly @@ -61,6 +61,7 @@ @fileSuffix the file suffix to add to the link ('.html' by default) @externalLink the nav-bar link for this report @target the target for the new page (_self, _blank, ...) + @image an image to display in the link generated in the reports list --> @@ -82,6 +83,7 @@ ${report.put('fileSuffix', fileSuffix)} ${report.put('externalLink', externalLink)} ${report.put('target', target)} + ${report.put('image', image)} ${reports.add(report)} @@ -192,6 +194,7 @@ @img @state - expanded / collapsed / none @target + @hideName set it to true to hide the link name (can be use to display only the image) --> @@ -218,8 +221,7 @@ ${target} - ${name} - ${name} + ${name}${name} diff --git a/xdoc/src/plugin-resources/css/maven-base.css b/xdoc/src/plugin-resources/css/maven-base.css index 53e3cf53..5c69720e 100644 --- a/xdoc/src/plugin-resources/css/maven-base.css +++ b/xdoc/src/plugin-resources/css/maven-base.css @@ -154,3 +154,11 @@ div.clear hr{ margin: 0px; padding: 0px; } +#navcolumn img.imageLink, .imageLink{ + padding-left: 0px; + padding-bottom: 0px; + padding-top: 0px; + padding-right: 2px; + border: 0px; + margin: 0px; +} diff --git a/xdoc/src/plugin-resources/images/pdf.gif b/xdoc/src/plugin-resources/images/pdf.gif deleted file mode 100644 index 7bce3389..00000000 Binary files a/xdoc/src/plugin-resources/images/pdf.gif and /dev/null differ diff --git a/xdoc/src/plugin-resources/navigation.jelly b/xdoc/src/plugin-resources/navigation.jelly index 506bab75..343bd623 100644 --- a/xdoc/src/plugin-resources/navigation.jelly +++ b/xdoc/src/plugin-resources/navigation.jelly @@ -82,12 +82,14 @@ + target="${report.target}" + img="${report.image}"/> + target="${report.target}" + img="${report.image}"/> diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl index 05cbe806..3ed7a104 100644 --- a/xdoc/src/plugin-resources/site.jsl +++ b/xdoc/src/plugin-resources/site.jsl @@ -673,13 +673,14 @@ + ${maven.xdoc.crumb.separator} - + @@ -692,8 +693,9 @@ + -  > +  > @@ -742,6 +744,7 @@ + @@ -771,10 +774,10 @@
  • - + - +
      diff --git a/xdoc/src/plugin-resources/xsd/maven-navigation.xsd b/xdoc/src/plugin-resources/xsd/maven-navigation.xsd index 9a9d88af..e3cf867d 100644 --- a/xdoc/src/plugin-resources/xsd/maven-navigation.xsd +++ b/xdoc/src/plugin-resources/xsd/maven-navigation.xsd @@ -97,6 +97,7 @@ + diff --git a/xdoc/src/xsd/maven-navigation-1.10.xsd b/xdoc/src/xsd/maven-navigation-1.10.xsd index 9a9d88af..e3cf867d 100644 --- a/xdoc/src/xsd/maven-navigation-1.10.xsd +++ b/xdoc/src/xsd/maven-navigation-1.10.xsd @@ -97,6 +97,7 @@ + diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index 742990bb..2dc8346f 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -27,6 +27,8 @@ + An image can be used in the menu entry for a report. + Item name is always displayed even if img attribute is setted. In the navigation file the new attribute 'hideName' can be used to hide the name in the link (if you want to display only the image for example). Allow the use of items' attributes 'target' and 'img' for breadcrumbs entries in the navigation file. In breadcrumbs, use for the project's name nav.title if defined, pom.name otherwise. Display the "external link" icon only if the link host is different from the project url (pom.url). diff --git a/xdoc/xdocs/tags.xml b/xdoc/xdocs/tags.xml index 28ef336a..fb04c2da 100644 --- a/xdoc/xdocs/tags.xml +++ b/xdoc/xdocs/tags.xml @@ -76,6 +76,11 @@ Yes The target for the new page (_self, _blank, ...). + + image + Yes + The link to an image to display in the report entry in the navigation bar. This link must be relative to the root directory of the documentation. + @@ -183,7 +188,7 @@ -

      Used to generate the links in the navigation bar.

      +

      Used to generate the links in the navigation bar, the breadcrumbs and the quick links.

      @@ -204,7 +209,12 @@ - + + + + + + @@ -214,7 +224,7 @@ - +
      AttributeOptional?Description
      img YesAn optional image to display instead of the link name.An optional image to display in addition to the name.
      hideNameYesSet to true to hide the link's name (can be used to only display the image for example).
      state
      target YesThe same as in HTML. Used with frames to specify in which frame the link should be rendered. If _blank is used, an icon is displayed to show that a new window is opened by clicking on this link.