sraeburn 2003/09/11 14:31:24
Modified: doc/userGuide struts-html.xml struts-tiles.xml
struts-nested.xml project.xml struts-logic.xml
building_controller.xml struts-bean.xml
doc project.xml struts.css
doc/faqs project.xml index.xml
doc/stylesheets struts.xsl
Log:
Added back generation of contributors list
Revision Changes Path
1.64 +1 -1 jakarta-struts/doc/userGuide/struts-html.xml
Index: struts-html.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-html.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- struts-html.xml 9 Sep 2003 23:50:34 -0000 1.63
+++ struts-html.xml 11 Sep 2003 21:31:23 -0000 1.64
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document url="struts-html.html">
+<document url="struts-html.html" authors="false">
<properties>
<author>Craig R. McClanahan</author>
1.11 +1 -1 jakarta-struts/doc/userGuide/struts-tiles.xml
Index: struts-tiles.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-tiles.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- struts-tiles.xml 9 Sep 2003 17:49:17 -0000 1.10
+++ struts-tiles.xml 11 Sep 2003 21:31:23 -0000 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document url="struts-tiles.html">
+<document url="struts-tiles.html" authors="false">
<properties>
<author>Cedric Dumoulin</author>
1.22 +1 -1 jakarta-struts/doc/userGuide/struts-nested.xml
Index: struts-nested.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-nested.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- struts-nested.xml 9 Sep 2003 17:49:18 -0000 1.21
+++ struts-nested.xml 11 Sep 2003 21:31:23 -0000 1.22
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document url="struts-nested.html">
+<document url="struts-nested.html" authors="false">
<properties>
<author>Arron Bates</author>
1.22 +3 -2 jakarta-struts/doc/userGuide/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 8 Jul 2003 00:30:33 -0000 1.21
+++ project.xml 11 Sep 2003 21:31:23 -0000 1.22
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Struts User's Guide"
href="http://jakarta.apache.org/struts/userGuide";
- image="../images/struts.gif">
+ image="../images/struts.gif"
+ authors="true">
<title>Getting Started</title>
-
+
<menu name="User Guide">
<item
name="Table of Contents"
1.15 +1 -1 jakarta-struts/doc/userGuide/struts-logic.xml
Index: struts-logic.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-logic.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- struts-logic.xml 10 May 2003 18:39:47 -0000 1.14
+++ struts-logic.xml 11 Sep 2003 21:31:23 -0000 1.15
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document url="struts-logic.html">
+<document url="struts-logic.html" authors="false">
<properties>
<author>Craig R. McClanahan</author>
1.70 +0 -8 jakarta-struts/doc/userGuide/building_controller.xml
Index: building_controller.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/building_controller.xml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- building_controller.xml 9 Sep 2003 17:49:18 -0000 1.69
+++ building_controller.xml 11 Sep 2003 21:31:23 -0000 1.70
@@ -156,14 +156,6 @@
</p>
<table>
-
- <tr>
- <td>
- </td>
- <td>
- </td>
- </tr>
-
<tr>
<td>
<code>processPath</code>
1.17 +1 -1 jakarta-struts/doc/userGuide/struts-bean.xml
Index: struts-bean.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-bean.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- struts-bean.xml 9 Sep 2003 17:49:17 -0000 1.16
+++ struts-bean.xml 11 Sep 2003 21:31:23 -0000 1.17
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document url="struts-bean.html">
+<document url="struts-bean.html" authors="false">
<properties>
<author>Craig R. McClanahan</author>
1.41 +3 -4 jakarta-struts/doc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/project.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- project.xml 29 Aug 2003 16:50:08 -0000 1.40
+++ project.xml 11 Sep 2003 21:31:24 -0000 1.41
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project
name="Struts Framework"
- href="http://jakarta.apache.org/struts";
- image="images/struts.gif"
- >
+ href="http://jakarta.apache.org/struts";
+ image="images/struts.gif">
<title>
Apache Struts Web Application Framework
- </title>
+ </title>
<menu name="Struts">
<item
1.5 +98 -29 jakarta-struts/doc/struts.css
Index: struts.css
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/struts.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- struts.css 9 Sep 2003 21:29:10 -0000 1.4
+++ struts.css 11 Sep 2003 21:31:24 -0000 1.5
@@ -1,170 +1,239 @@
a {
color: #023264;
}
+
body {
- margin: 0;
- padding: 21px 16px;
background: #FFFFFF;
color: #000000;
+ margin: 0;
+ padding: 21px 16px;
+}
+
+div.authors{
+ background: #EEEEFF;
+ border: 1px solid #CCCCFF;
+ color: #333333;
+ margin: 2em 0 0;
+ padding-bottom: 0.5em;
+}
+
+div.authors li {
+ color: #023264;
+ line-height: 1;
+ margin: 0;
+ padding: 0;
}
+
+div.authors ul {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+
div.indent {
padding: 0 5%;
}
+
div.notice {
- width: 80%;
+ background: #00FFFF;
+ border: 1px solid #000000;
margin-left: 8%;
padding: 0 2%;
- border: 1px solid #000000;
- background: #00FFFF;
+ width: 80%;
}
-h1 {
- padding: 5px;
- background: #023264;
- font-size: 1.2em;
- font-weight: bold;
+
+
+h1, h2 , h3 {
+ color: #FFFFFF;
+ font-family: Arial, Helvetica, sans-serif;
+ margin: 1em 0;
}
+
h1 a, h2 a, h3 a {
color: #FFFFFF;
}
-h1, h2 , h3 {
- margin: 1em 0;
- color: #FFFFFF;
- font-family: Arial, Helvetica, sans-serif;
+
+h1 {
+ background: #023264;
+ font-size: 1.2em;
+ font-weight: bold;
+ padding: 5px;
}
+
h2 {
- padding: 3px 5px;
background: #023264;
font-size: 1.1em;
font-weight: normal;
+ padding: 3px 5px;
}
+
h3 {
- padding: 2px 5px;
background: #023264;
font-size: 1em;
font-weight: normal;
+ padding: 2px 5px;
}
+
h4 {
font-size: 1.1em;
}
+
hr {
- border: none;
background: #CCCCCC;
+ border: none;
height: 1px;
}
+
hr.section {
- border: none;
background: #023264;
+ border: none;
height: 1px;
}
+
img {
border: none;
}
+
img.book {
margin: 10px;
}
+
q {
font-family: Arial, Helvetica, sans-serif;
}
+
table {
border: 2px solid #CCCCCC;
border-collapse: collapse;
}
+
table.noborder, table.noborder td, table.noborder td th {
border: none;
}
+
table.tag-attributes{
width: 100%;
}
+
table.taglib-summary {
width: 100%;
}
+
table.task-list {
width: 100%;
}
+
td,th {
border: 1px solid #CCCCCC;
padding: 3px;
}
+
+th.attribute {
+ width: 15%;
+}
+
thead {
border: 2px solid #CCCCCC;
}
+
.center {
text-align: center;
}
+
+.clear{
+ clear: both;
+}
+
.float-left {
float: left;
}
+
.float-right {
float: right;
}
+
.left {
text-align: left;
}
+
.right{
text-align: right;
}
+
.version {
- margin: 0;
+ color: #999999;
font: 0.7em Arial, Helvetica, sans-serif;
- color: #999;
+ margin: 0;
}
+
.warning {
color: #FF0000;
font-weight: bold;
}
+
#footer {
- clear: both;
border-top: 1px solid #333333;
- padding-top: 10px;
+ clear: both;
color: #023264;
font-size: 0.83em;
font-style: italic;
+ padding-top: 10px;
text-align: center;
}
+
#heading {
border-bottom: 1px solid #333333;
+ height: 100px;
margin-bottom: 0.5em;
position: relative;
- height: 100px;
}
+
#jakarta-logo {
+ left: 0;
position: absolute;
top: 0;
- left: 0;
}
+
#main {
- width: 85%;
float: right;
margin-bottom: 1em;
+ width: 85%;
}
+
#menu {
margin: 1em 86% 1em 0;
padding: 0.2em;
}
+
#menu li {
- margin: 0 0 0.5em 2em;
font-size: 0.84em;
font-weight: normal;
+ margin: 0 0 0.5em 2em;
}
+
#menu p {
- margin: 0.5em;
color: #023264;
font-weight: bold;
+ margin: 0.5em;
}
+
#menu ul {
+ list-style: none;
margin: 0 0 1em;
padding: 0;
- list-style: none;
}
+
#powered-logo {
float: right;
margin-bottom: 20px;
}
+
#struts-logo {
position: absolute;
- top: 0;
right: 0;
+ top: 0;
}
+
@media print {
.noprint, #menu, #jakarta-logo {
display: none;
1.11 +2 -1 jakarta-struts/doc/faqs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/faqs/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 1 Sep 2003 13:01:05 -0000 1.10
+++ project.xml 11 Sep 2003 21:31:24 -0000 1.11
@@ -3,7 +3,8 @@
<project
name="Apache Struts Web Application Framework"
href="http://jakarta.apache.org/struts";
- image="images/struts.gif">
+ image="images/struts.gif"
+ authors="true">
<title>Apache Struts Web Application Framework</title>
1.14 +1 -1 jakarta-struts/doc/faqs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/faqs/index.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- index.xml 1 Sep 2003 13:01:05 -0000 1.13
+++ index.xml 11 Sep 2003 21:31:24 -0000 1.14
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<document url="./index.xml">
+<document url="./index.xml" authors="false">
<properties>
<author>Ted Husted</author>
1.14 +52 -61 jakarta-struts/doc/stylesheets/struts.xsl
Index: struts.xsl
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/struts.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- struts.xsl 11 Sep 2003 19:20:14 -0000 1.13
+++ struts.xsl 11 Sep 2003 21:31:24 -0000 1.14
@@ -93,30 +93,31 @@
<div id="main">
<xsl:apply-templates select="body"/>
-
- <!-- TODO
- <hr/>
- <h3>Contributors</h3>
- <p>Project/@Authors: <xsl:value-of
select="boolean($project/@authors)"/></p>
- <p>Document/@Authors: <xsl:value-of
select="boolean(/document/@authors)"/></p>
-
- <xsl:if test="/[EMAIL PROTECTED]'false'] and
- ([EMAIL PROTECTED]'true'] or /[EMAIL PROTECTED]'true'])">
- <div class="authors">
- <p>Contributors</p>
- <ul>
- <xsl:for-each select="/document/properties/author">
- <li><xsl:value-of select="."/></li>
- </xsl:for-each>
- </ul>
- </div>
- </xsl:if>
- -->
-
</div>
<div id="menu">
<xsl:apply-templates select="$project"/>
+
+ <!--
+ Output contributors list if the project 'authors' attribute
+ is true and the document level 'authors' attribute is either
+ true or not specified.
+ -->
+ <xsl:if test="(boolean([EMAIL PROTECTED]'true'])
+ and not(/document/@authors)) or /[EMAIL PROTECTED]'true']">
+
+ <!-- Only output contributors if there are any specified for this
document -->
+ <xsl:if test="/document/properties/author">
+ <div class="authors">
+ <p><strong>Contributors</strong></p>
+ <ul>
+ <xsl:for-each select="/document/properties/author">
+ <li><xsl:value-of select="."/></li>
+ </xsl:for-each>
+ </ul>
+ </div>
+ </xsl:if>
+ </xsl:if>
</div>
</div>
@@ -126,7 +127,8 @@
<xsl:value-of select="$relative-path"/><xsl:value-of
select="$powered-logo"/>
</xsl:variable>
<img src="{$src}" alt="Powered by Struts" id="powered-logo"/>
- Copyright (c) 2000-2003, Apache Software Foundation <span class="noprint">-
<a
href="http://nagoya.apache.org/wiki/apachewiki.cgi?StrutsDocComments";>Comments?</a></span>
+ Copyright (c) 2000-2003, Apache Software Foundation <span class="noprint">-
+ <a
href="http://nagoya.apache.org/wiki/apachewiki.cgi?StrutsDocComments";>Comments?</a></span>
</div>
</body>
@@ -266,53 +268,42 @@
<xsl:apply-templates select="info"/>
- <xsl:if test="not(@document-attributes)">
- <xsl:call-template name="document-tag-attributes" />
- </xsl:if>
- <xsl:if test="@document-attributes='true'">
- <xsl:call-template name="document-tag-attributes" />
- </xsl:if>
-
-<!--
- <xsl:if test="child::task">
- <xsl:apply-templates select="attribute"/>
- </xsl:if>
--->
-
- </div>
- <p><a href="#top">Back to top</a></p>
-
- </xsl:template>
-
- <!-- Create the table of documentation for a tag -->
- <xsl:template name="document-tag-attributes">
+ <xsl:if test="./attribute">
<table class="tag-attributes">
<thead>
<tr>
- <th>Attribute Name</th>
+ <th class="attribute">Attribute Name</th>
<th>Description</th>
</tr>
</thead>
- <xsl:for-each select="attribute">
- <tr>
- <td align="center">
- <xsl:value-of select="name"/>
- </td>
- <td>
- <xsl:apply-templates select="info"/>
- <xsl:variable name="required">
- <xsl:value-of select="required"/>
- </xsl:variable>
- <xsl:if test="required='true'">
- [Required]
- </xsl:if>
- <xsl:if test="rtexprvalue='true'">
- [RT Expr]
- </xsl:if>
- </td>
- </tr>
- </xsl:for-each>
+ <xsl:apply-templates select="attribute"/>
</table>
+ </xsl:if>
+
+ </div>
+ <p><a href="#top">Back to top</a></p>
+
+ </xsl:template>
+
+ <!-- Create the table of documentation for a tag -->
+ <xsl:template match="attribute">
+ <tr>
+ <td align="center">
+ <xsl:value-of select="name"/>
+ </td>
+ <td>
+ <xsl:apply-templates select="info"/>
+ <xsl:variable name="required">
+ <xsl:value-of select="required"/>
+ </xsl:variable>
+ <xsl:if test="required='true'">
+ [Required]
+ </xsl:if>
+ <xsl:if test="rtexprvalue='true'">
+ [RT Expr]
+ </xsl:if>
+ </td>
+ </tr>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
