forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject svn commit: rev 36154 - in forrest/trunk/scratchpad/tests/whole-site/src/documentation: . content/subdir content/subdir/deep content/xdocs content/xdocs/subdir content/xdocs/subdir/deep resources resources/images
Date Tue, 10 Aug 2004 03:57:49 GMT
Author: brondsem
Date: Mon Aug  9 20:57:48 2004
New Revision: 36154

Added:
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/subdir/
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/subdir/deep/
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/subdir/deep/raw.jpg
  (contents, props changed)
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/deep/
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/deep/foo.xml
  (contents, props changed)
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/peer1.xml
  (contents, props changed)
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/peer2.xml
  (contents, props changed)
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/resources/
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/resources/images/
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/resources/images/common.jpg
  (contents, props changed)
Modified:
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/index.xml
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/site.xml
   forrest/trunk/scratchpad/tests/whole-site/src/documentation/skinconf.xml
Log:
do some tricky references

Added: forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/subdir/deep/raw.jpg
==============================================================================
Binary file. No diff available.

Modified: forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/index.xml
==============================================================================
--- forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/index.xml	(original)
+++ forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/index.xml	Mon
Aug  9 20:57:48 2004
@@ -22,6 +22,19 @@
   <body> 
     <section>
       <title>Section Title</title>
+      <p><link href="#samepage_target">same page target</link></p>
+      <p><link href="#sometarget">target w/ name shared on other pages</link></p>
     </section>
+    <section id="samepage_target">
+       <title>part two</title>
+      <p>1 2 4 34 4 blah blah content</p>
+      <p>1 2 4 34 4 blah blah content</p>
+     </section>
+    <section id="sometarget">
+      <title>a third part</title>
+      <p>1 2 4 34 4 blah <link href="site:foo">deep link</link> content</p>
+      <p>1 2 4 34 4 blah <link href="ext:forrest">external link</link>
content</p>
+      <p>1 2 4 34 4 blah blah content</p>
+     </section>
   </body>
 </document>

Modified: forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/site.xml
==============================================================================
--- forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/site.xml	(original)
+++ forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/site.xml	Mon
Aug  9 20:57:48 2004
@@ -17,10 +17,23 @@
 
 <site href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
 
-  <about label="About">
-    <index label="Index" href="index.html" description="Index"/>
+  <main label="Main">
+    <index label="Index" href="index.html">
+        <target label="a target" href="#samepage_target"/>
+    </index>
+    <subdir label="Subdirectory" href="subdir/">
+       <peer1 label="Peer 1" href="peer1.html"/>
+       <peer2 label="Peer 2" href="peer2.html"/>
+       <deep label="getting deeper" href="deep/">
+          <foo label="foo" href="foo.html"/>
+       </deep>
+    </subdir>
     <whole-html label="Whole HTML" href="site.html" description="Whole site as HTML"/>
     <whole-pdf label="Whole PDF" href="site.pdf" description="Whole site as a PDF"/>
-  </about>
+  </main>
+  
+      <external-refs>
+          <forrest href="http://forrest.apache.org/"/>
+      </external-refs>
 
 </site>

Added: forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/deep/foo.xml
==============================================================================
--- (empty file)
+++ forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/deep/foo.xml
Mon Aug  9 20:57:48 2004
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<document> 
+  <header> 
+    <title>foo</title> 
+  </header> 
+  <body> 
+    <section>
+      <title>foo</title>
+      <p><img src="images/common.jpg" alt="an image"/> an image within a deep
subdir (this was from the resources/images dir for common files)</p>
+      <p><img src="raw.jpg" alt="a raw image"/> another image within a deep subdir</p>
+      <p><link href="site:main/index">index link</link></p>
+    </section>
+  </body>
+</document>

Added: forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/peer1.xml
==============================================================================
--- (empty file)
+++ forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/peer1.xml
Mon Aug  9 20:57:48 2004
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<document> 
+  <header> 
+    <title>peer1</title> 
+  </header> 
+  <body> 
+    <section>
+      <title>peer1 is nifty</title>
+      <p>one two three</p>
+      <p><img src="images/common.jpg" alt="an image"/> an image within a subdir
(this was from the resources/images dir for common files)</p>
+    </section>
+    <section id="sometarget">
+      <title>hello</title>
+      <p>blah blah abc def</p>
+      <p>this target has the same name as it's <link href="site:peer2">peer</link>.
 that was a shortened site: link</p>
+    </section>
+  </body>
+</document>

Added: forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/peer2.xml
==============================================================================
--- (empty file)
+++ forrest/trunk/scratchpad/tests/whole-site/src/documentation/content/xdocs/subdir/peer2.xml
Mon Aug  9 20:57:48 2004
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<document> 
+  <header> 
+    <title>peer2</title> 
+  </header> 
+  <body> 
+    <section>
+      <title>peer2 is cool</title>
+      <p>one two three</p>
+      <p>one <link href="site:main/index/target">two</link> three.  that
was a site: link to an internal target</p>
+    </section>
+    <section id="sometarget">
+      <title>hey there</title>
+      <p>more content here... wow this is boring...... test test test!</p>
+      <p>this target has the same name as it's <link href="site:main/subdir/peer1">peer</link>.
 that was a full site: link</p>
+    </section>
+  </body>
+</document>

Added: forrest/trunk/scratchpad/tests/whole-site/src/documentation/resources/images/common.jpg
==============================================================================
Binary file. No diff available.

Modified: forrest/trunk/scratchpad/tests/whole-site/src/documentation/skinconf.xml
==============================================================================
--- forrest/trunk/scratchpad/tests/whole-site/src/documentation/skinconf.xml	(original)
+++ forrest/trunk/scratchpad/tests/whole-site/src/documentation/skinconf.xml	Mon Aug  9 20:57:48
2004
@@ -17,5 +17,5 @@
 
 <!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.6-2//EN" "http://forrest.apache.org/dtd/skinconfig-v06-2.dtd">
 <skinconfig>
-
+   <project-logo>images/project.png</project-logo>
 </skinconfig>

Mime
View raw message