Author: gmcdonald
Date: Sat Jul 14 23:44:47 2007
New Revision: 556368
URL: http://svn.apache.org/viewvc?view=rev&rev=556368
Log:
Part Three - Re-organised samples into two sections, highlights the use of
sub-tabs etc. General improvement and also Fix for FOR-1001
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/tabs.xml
Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml?view=diff&rev=556368&r1=556367&r2=556368
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
(original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml Sat
Jul 14 23:44:47 2007
@@ -42,15 +42,18 @@
<index label="Index" href="index.html" description="Welcome to MyProj"/>
<linkmap label="Documentation ToC" href="linkmap.html" description="Table
of Contents for this example site"/>
</about>
- <samples label="Samples" href="samples/" tab="samples">
- <index label="Overview" href="index.html"/>
+ <samples tab="samples">
+ <overview label="Overview" href="samples/index.html"/>
+ <samples_1 label="Samples 1" href="site:samples1//index"/>
+ <samples_2 label="Samples 2" href="site:samples2//index"/>
+ </samples>
+ <samples1 label="First set of Samples" description="First Set of Samples">
+ <docs-samples1 label="Samples 1" href="samples1/" tab="samples-1">
+ <index label="Overview" href="index.html"/>
<sample label="Apache doc v2.0" href="sample.html" description="A nonsense
- document using all possible elements in the current document v2.0">
+ document using all possible elements in the current document
v2.0"/>
<top href="#top"/>
<section href="#section"/>
- </sample>
- <static label="Static content" href="static.html" description="Static raw
- un-processed content"/>
<linking label="Linking" href="linking.html" description="Linking explained
and demonstrated"/>
<sample-howto label="How To" href="howto-howto.html"
@@ -62,8 +65,6 @@
<svg label="Using SVG" href="svg.html" description="Using Scalable Vector
Graphics (SVG)"/>
<sample-usemap label="usemap" href="usemap.html" description="Client-side
imagemap"/>
- <i18n label="Internationalisation (i18n)" href="i18n.html"/>
- <i18n-demo label="i18n demonstration" href="demo-i18n.html"/>
<sample-custom label="Custom Schema" href="customSchema.html"
description="Custom XML schema and doctypes"/>
<custom-example href="custom.html" description="A custom XML file"/>
@@ -73,15 +74,27 @@
<locationmap label="Locationmap" href="locationmap/index.html"
description="Locationmaps allow the user URL space to be different from
the storage URL Space"/>
- <subdir label="Subdir" href="subdir/">
- <index label="Index" href="index.html" description="Page generated from a
+ <static-tab label="Static content" tab="samples-sample2">
+ <static label="Static Content" href="static.html"
description="Static Content"/>
+ </static-tab>
+ </docs-samples1>
+ </samples1>
+ <samples2 label="Second Set of Samples" description="Second Set of
Samples">
+ <docs-samples2 label="Samples 2" href="samples2/" tab="samples-2">
+ <index label="Overview" href="index.html"/>
+ <i18n label="Internationalisation (i18n)" href="i18n.html"/>
+ <i18n-demo label="i18n demonstration" href="demo-i18n.html"/>
+ <faq label="FAQ" href="site:docs-samples1/faq" description="Frequently
Asked Questions"/>
+ <subdir label="Subdir" href="subdir/">
+ <index label="Index" href="index.html" description="Page generated
from a
sub-directory"/>
- </subdir>
+ </subdir>
<showonlywhenselected label="Conditional display of menuitems"
href="showonlywhenselected/">
<page1 label="Always visible page" href="page1.html"/>
<page2 label="Visible only when current" href="page2.html"
type="showWhenSelected"/>
</showonlywhenselected>
- </samples>
+ </docs-samples2>
+ </samples2>
<plugins label="Plugins" href="pluginDocs/plugins_0_90/" tab="plugins">
<index label="Index" href="index.html" description="List of plugins
available for Forrest"/>
Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/tabs.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/tabs.xml?view=diff&rev=556368&r1=556367&r2=556368
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/tabs.xml
(original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/tabs.xml Sat
Jul 14 23:44:47 2007
@@ -31,9 +31,9 @@
be displayed when their parent tab is selected.
-->
<tab id="" label="Home" dir="" indexfile="index.html"/>
- <tab id="samples" label="Samples" dir="samples" indexfile="sample.html">
- <tab id="samples-index" label="Index" dir="samples"
indexfile="index.html"/>
- <tab id="samples-sample2" label="Sample2" dir="samples"
indexfile="static.html"/>
+ <tab id="samples" label="Samples" dir="samples">
+ <tab id="samples-1" label="Samples1" dir="samples1" />
+ <tab id="samples-2" label="Samples2" dir="samples2" />
</tab>
<tab label="Apache XML Projects" href="http://xml.apache.org";>
<tab label="Forrest" href="http://forrest.apache.org"/>
