Author: crossley
Date: Tue Jan 29 23:42:35 2008
New Revision: 616669
URL: http://svn.apache.org/viewvc?rev=616669&view=rev
Log:
Added demonstration of more xdoc elements to the sample document-v20
Contributed by: Carlos Tejo
Issue: FOR-1062
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml
forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml
forrest/trunk/site-author/status.xml
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml?rev=616669&r1=616668&r2=616669&view=diff
==============================================================================
---
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml
(original)
+++
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/sample.xml
Tue Jan 29 23:42:35 2008
@@ -19,11 +19,20 @@
<document>
<header>
<title>The Apache Forrest xdocs document-v2.0 DTD</title>
+ <subtitle>This is a subtitle</subtitle>
+ <version>SVN: $Revision$ $Date$</version>
+ <type>Example</type>
+ <authors>
+ <person name="Joe Bloggs" email="[EMAIL PROTECTED]" />
+ <person name="Fred Bloggs" email="[EMAIL PROTECTED]" />
+ </authors>
<notice>The content of this document doesn't make any sense at
all.</notice>
<abstract>
This is a demonstration document using all possible elements in the
current Apache Forrest xdocs <code>document-v20.dtd</code>
</abstract>
+ <meta name="keywords">Forrest, Apache, example</meta>
+ <meta name="resource-type">document</meta>
</header>
<body>
<note>
@@ -54,7 +63,8 @@
way special.
</p>
<p>
- This next paragraph has a class attribute of 'quote'. CSS can be used
+ This next paragraph has a class attribute of 'quote'.
+ <acronym title="Cascading Style Sheets">CSS</acronym> can be used
to present this <code><p class='quote'></code> in a different
style than the other paragraphs. The handling of this quoted
paragraph
is defined in the <extra-css> element in the skinconf.xml.
@@ -86,7 +96,7 @@
<li>Another possibility is the <code><img></code> element:
<img src="images/icon.png" alt="another feather" height="22"
width="26"/>,
which offers the ability to refer to an image map.</li>
- <li>We have elements for hyperlinking:
+ <li>We have elements for hyperlinking:
<dl>
<dt><code><a href="../index.html"></code></dt>
<dd>Use this to
@@ -338,6 +348,23 @@
can also be implemented with an <code><img></code> element.
</p>
<figure src="images/project-logo.png" alt="The fine Forrest logo"
width="220" height="65"/>
+ </section>
+ <section id="area-map">
+ <title>Using map and area</title>
+ <p>
+ <img src="/images/usemap.gif" usemap="#my-map"
+ alt="usemap demo" width="256" height="256"/>
+ </p>
+ <p>
+ <map name="my-map">
+ <area shape="rect" coords="173,14,240,71"
+ alt="Rectangle" href="ext:forrest"/>
+ <area shape="circle" coords="53,172,28"
+ alt="Circle" href="../index.html"/>
+ <area shape="default" coords="0,0.256,256"
+ alt="Default" href="http://www.apache.org"/>
+ </map>
+ </p>
</section>
<section id="link-class">
<title>Using class attribute on links</title>
Modified: forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml?rev=616669&r1=616668&r2=616669&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml (original)
+++ forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml Tue Jan 29
23:42:35 2008
@@ -19,11 +19,20 @@
<document>
<header>
<title>The Apache Forrest xdocs document-v2.0 DTD</title>
+ <subtitle>This is a subtitle</subtitle>
+ <version>SVN: $Revision$ $Date$</version>
+ <type>Example</type>
+ <authors>
+ <person name="Joe Bloggs" email="[EMAIL PROTECTED]" />
+ <person name="Fred Bloggs" email="[EMAIL PROTECTED]" />
+ </authors>
<notice>The content of this document doesn't make any sense at
all.</notice>
<abstract>
This is a demonstration document using all possible elements in the
current Apache Forrest xdocs <code>document-v20.dtd</code>
</abstract>
+ <meta name="keywords">Forrest, Apache, example</meta>
+ <meta name="resource-type">document</meta>
</header>
<body>
<note>
@@ -50,7 +59,8 @@
way special.
</p>
<p>
- This next paragraph has a class attribute of 'quote'. CSS can be used
+ This next paragraph has a class attribute of 'quote'.
+ <acronym title="Cascading Style Sheets">CSS</acronym> can be used
to present this <code><p class='quote'></code> in a different
style than the other paragraphs. The handling of this quoted
paragraph
is defined in the <extra-css> element in the skinconf.xml.
@@ -82,7 +92,7 @@
<li>Another possibility is the <code><img></code> element:
<img src="images/icon.png" alt="another feather" height="22"
width="26"/>,
which offers the ability to refer to an image map.</li>
- <li>We have elements for hyperlinking:
+ <li>We have elements for hyperlinking:
<dl>
<dt><code><a href="../index.html"></code></dt>
<dd>Use this to
@@ -336,6 +346,23 @@
can also be implemented with an <code><img></code> element.
</p>
<figure src="images/project-logo.png" alt="The fine Forrest logo"
width="220" height="65"/>
+ </section>
+ <section id="area-map">
+ <title>Using map and area</title>
+ <p>
+ <img src="/images/usemap.gif" usemap="#my-map"
+ alt="usemap demo" width="256" height="256"/>
+ </p>
+ <p>
+ <map name="my-map">
+ <area shape="rect" coords="173,14,240,71"
+ alt="Rectangle" href="ext:forrest"/>
+ <area shape="circle" coords="53,172,28"
+ alt="Circle" href="../index.html"/>
+ <area shape="default" coords="0,0.256,256"
+ alt="Default" href="http://www.apache.org"/>
+ </map>
+ </p>
</section>
<section id="link-class">
<title>Using class attribute on links</title>
Modified: forrest/trunk/site-author/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=616669&r1=616668&r2=616669&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Tue Jan 29 23:42:35 2008
@@ -152,6 +152,9 @@
<link href="site:upgrading_09">upgrading to v0.9</link>
</action>
<!-- 2008-01 -->
+ <action context="docs" type="update" dev="DC" fixes-bug="FOR-1062"
due-to="Carlos Tejo">
+ Added demonstration of more xdoc elements to the sample document-v20
+ </action>
<action context="code" type="update" dev="TS" fixes-bug="FOR-733">
The "wholesite" html/pdf ability was broken with the locationmap.
</action>
