You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/07/28 09:42:50 UTC
svn commit: r798430 - in /archiva/trunk/archiva-docs: pom.xml
src/site/site.xml
Author: oching
Date: Tue Jul 28 07:42:50 2009
New Revision: 798430
URL: http://svn.apache.org/viewvc?rev=798430&view=rev
Log:
[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
Modified:
archiva/trunk/archiva-docs/pom.xml
archiva/trunk/archiva-docs/src/site/site.xml
Modified: archiva/trunk/archiva-docs/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/pom.xml?rev=798430&r1=798429&r2=798430&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/pom.xml (original)
+++ archiva/trunk/archiva-docs/pom.xml Tue Jul 28 07:42:50 2009
@@ -122,7 +122,7 @@
<![CDATA[
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" ) );
- 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>
</evaluateBeanshell>
Modified: archiva/trunk/archiva-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/site.xml?rev=798430&r1=798429&r2=798430&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/site.xml (original)
+++ archiva/trunk/archiva-docs/src/site/site.xml Tue Jul 28 07:42:50 2009
@@ -21,13 +21,14 @@
<project>
<body>
<breadcrumbs>
- <item name="1.2.1" href="/docs/1.2.1" />
+ <item name="1.2.1" href="/index.html" />
</breadcrumbs>
<menu name="Introduction">
- <item name="Quick Start" href="/quick-start.html" />
- <item name="Feature Tour" href="/tour/index.html" />
+ <item name="Quick Start" href="/quick-start.html" />
+ <item name="Feature Tour" href="/tour/index.html" />
<item name="Release Notes" href="/release-notes.html" />
+ <item name="Downloads" href="http://archiva.apache.org/download.html" />
</menu>
<menu name="Users Guide">