[MRM-1002] Website navigation links don't work as expected

Submitted by: Jevica Arianne Zurbano

* replaced the breadcrumbs to point to the documentation's index to avoid
  o the directory listing when accessing http://archiva.apache.org/docs/
  o being pointed to a non-existing page like http://archiva.apache.org/docs/1.2-M1/docs/1.2-M1
* added 'Downloads' link in site.xml
* updated the evaluateBeanshell condition to coincide with site.xml modification


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@798430 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maria Odea B. Ching 2009-07-28 07:42:50 +00:00
parent 0586f7bd5b
commit 2de9b3de75
2 changed files with 5 additions and 4 deletions

View File

@ -122,7 +122,7 @@
<![CDATA[ <![CDATA[
javax.xml.xpath.XPath xpath = javax.xml.xpath.XPathFactory.newInstance().newXPath(); javax.xml.xpath.XPath xpath = javax.xml.xpath.XPathFactory.newInstance().newXPath();
org.xml.sax.InputSource is = new org.xml.sax.InputSource( new java.io.FileInputStream( "${basedir}/src/site/site.xml" ) ); org.xml.sax.InputSource is = new org.xml.sax.InputSource( new java.io.FileInputStream( "${basedir}/src/site/site.xml" ) );
xpath.evaluate( "//project/body/breadcrumbs/item[@name='${project.version}']/@href", is ).equals( "/docs/${project.version}" ) xpath.evaluate( "//project/body/breadcrumbs/item[@name='${project.version}']/@href", is ).equals( "/index.html" )
]]> ]]>
</condition> </condition>
</evaluateBeanshell> </evaluateBeanshell>

View File

@ -21,13 +21,14 @@
<project> <project>
<body> <body>
<breadcrumbs> <breadcrumbs>
<item name="1.2.1" href="/docs/1.2.1" /> <item name="1.2.1" href="/index.html" />
</breadcrumbs> </breadcrumbs>
<menu name="Introduction"> <menu name="Introduction">
<item name="Quick Start" href="/quick-start.html" /> <item name="Quick Start" href="/quick-start.html" />
<item name="Feature Tour" href="/tour/index.html" /> <item name="Feature Tour" href="/tour/index.html" />
<item name="Release Notes" href="/release-notes.html" /> <item name="Release Notes" href="/release-notes.html" />
<item name="Downloads" href="http://archiva.apache.org/download.html" />
</menu> </menu>
<menu name="Users Guide"> <menu name="Users Guide">