kaz 02/03/26 15:00:12
Modified: src/dvsl/xdocs main.css ns4_toxins.css print.css site.dvsl
src/templates/build build-docs.xml
xdocs project.xml
Added: src/dvsl/xdocs compact.css
src/images icon_alertsml.gif jakarta-logo-blue.gif
Removed: src/images jakarta-reverse.gif
Log:
- Updated the CSS stylesheets from style.tigris.org (I guess this rev is
still not the most updated version, it hasn't been checked into their
CVS yet). This included a few additional stylesheets and images.
- Also added the navigation links in the horizontal gray bar in the banner,
these can be specified in a project's xdocs/project.xml file using the
<link> and <item> elements.
- Updated the jakarta logo so the colors match the background (thx eric)
- It seems as though the relative links defined in the stylesheets are
relative to the location of the stylesheet rather than the current
document (correct me if I'm wrong), thus, we no longer have to use
Ant filtering to put absolute URLs in the stylesheet when its copied
to the project's local directory. build-docs.xml has been modified to
reflect the above.
Revision Changes Path
1.2 +4 -7 jakarta-turbine-maven/src/dvsl/xdocs/main.css
Index: main.css
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/main.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.css 25 Mar 2002 16:49:21 -0000 1.1
+++ main.css 26 Mar 2002 23:00:11 -0000 1.2
@@ -30,7 +30,7 @@
text-align: center !important;
}
#leftcol a:link, #leftcol a:visited {
- color: blue;
+ color: blue;
}
a:active, a:hover, #leftcol a:active, #leftcol a:hover {
color: #f30 !important;
@@ -61,7 +61,7 @@
.datatablechild tr.a td {
background: #cf9;
}
-body .axial th {
+.app .axial th {
background-color: #efefef;
text-align: right;
color: black
@@ -70,7 +70,7 @@
text-align: left;
}
.alert {
- color: red;
+ color: red;
}
.confirm {
color: green;
@@ -125,10 +125,7 @@
padding-top: 1em
}
#navcolumn div {
- margin-bottom: .5em;
- }
-#navcolumn div div {
- margin-top: .5em
+ margin-bottom: .5em
}
#navcolumn div div {
padding-left: 1em;
1.2 +11 -15 jakarta-turbine-maven/src/dvsl/xdocs/ns4_toxins.css
Index: ns4_toxins.css
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/ns4_toxins.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ns4_toxins.css 25 Mar 2002 16:49:21 -0000 1.1
+++ ns4_toxins.css 26 Mar 2002 23:00:11 -0000 1.2
@@ -42,14 +42,14 @@
border: none
}
.app h3, .app h4, .tabs th, .tabs td, .functnbar {
- background-image: url(@PROJECT_BASE_URL@images/nw_min.gif);
+ background-image: url(../images/nw_min.gif);
background-repeat: no-repeat;
}
.app h3, .app h4 {
- padding: 5px;
- margin-right: 2px;
- margin-left: 2px;
- color: #fff;
+ padding: 5px;
+ margin-right: 2px;
+ margin-left: 2px;
+ color: #fff;
}
.app h3 {
background-color: #036;
@@ -127,13 +127,10 @@
padding-bottom: .5em;
}
#navcolumn div div, body.docs #toc li li {
- background-image: url(@PROJECT_BASE_URL@images/strich.gif);
+ background-image: url(../images/strich.gif);
background-repeat: no-repeat;
background-position: .5em .5em;
}
-#navcolumn div div.heading {
- background-image: none;
- }
#breadcrumbs {
border-bottom: 1px solid #999;
background-color: #ccc
@@ -153,9 +150,8 @@
#navcolumn div {
padding-left: 5px
}
-div#navcolumn div div {
- margin-top: .3em;
- margin-bottom: .3em;
+#navcolumn div div {
+ margin-top: .2em;
}
div#navcolumn div.focus {
margin-top: -.1em;
@@ -197,7 +193,7 @@
border-top: 1px solid #ccc;
}
body.docs {
- background: #efefef url(@PROJECT_BASE_URL@images/help_logo.gif) top right
no-repeat !important;
+ background: #efefef url(../images/help_logo.gif) top right no-repeat !important;
margin: 0 !important;
}
#toc h3 {
@@ -219,7 +215,7 @@
padding-top: .3em
}
#alerterrormessage {
- background: url(@PROJECT_BASE_URL@images/icon_alert.gif) top left no-repeat
!important;
+ background: url(../images/icon_alert.gif) top left no-repeat !important;
padding-left: 85px;
}
/* Scarab/App - styles start here */
@@ -227,7 +223,7 @@
background-color: #999;
}
.functnbar2, .functnbar3 {
- background: #999 url(@PROJECT_BASE_URL@images/sw_min.gif) no-repeat bottom left;
+ background: #999 url(../images/sw_min.gif) no-repeat bottom left;
}
.functnbar3 {
background-color: #ccc;
1.2 +6 -2 jakarta-turbine-maven/src/dvsl/xdocs/print.css
Index: print.css
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/print.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- print.css 25 Mar 2002 16:49:21 -0000 1.1
+++ print.css 26 Mar 2002 23:00:11 -0000 1.2
@@ -1,3 +1,7 @@
-#banner, #crumbbar, #leftcol, #footer {
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks {
display: none;
- }
\ No newline at end of file
+ }
+body.docs div.docs {
+ margin: 0 !important;
+ border: none !important
+ }
1.11 +38 -27 jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl
Index: site.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- site.dvsl 25 Mar 2002 21:54:49 -0000 1.10
+++ site.dvsl 26 Mar 2002 23:00:11 -0000 1.11
@@ -53,7 +53,7 @@
<tr>
<td>
<a href="http://jakarta.apache.org/";>
- <img src="$relativePath/images/jakarta-reverse.gif" align="left"
alt="The Jakarta Project" border="0"/>
+ <img src="$relativePath/images/jakarta-logo-blue.gif" align="left"
alt="The Jakarta Project" border="0"/>
</a>
</td>
<td>
@@ -82,8 +82,7 @@
<table border="0" cellspacing="0" cellpadding="4" width="100%">
<tr>
<td>
- ## May want to put something here at some point
-
+ $context.applyTemplates( $project, "body/links" )
</td>
</tr>
</table>
@@ -100,30 +99,32 @@
## Standard Maven Navigation
<div><strong>Maven Generated Docs</strong>
- <div><small><strong><a href="$relativePath/index.html">Front
Page</a></strong></small></div>
- <div><small><strong><a href="$relativePath/mail-lists.html">Mailing
Lists</a></strong></small></div>
- <div><small><strong><a
href="$relativePath/developer-list.html">Developers</a></strong></small></div>
- <div><small><strong><a
href="$relativePath/dependencies.html">Dependencies</a></strong></small></div>
- <div><small><strong><a href="$projectDescriptor.cvsWebUrl">CVS
Repository</a></strong></small></div>
- <div><small><strong><a href="$relativePath/changelog.html">Change
Log</a></strong></small></div>
- <div><small><strong><a
href="$relativePath/jdepend-report.html">Metric Results</a></strong></small></div>
- <div><small><strong><a href="$relativePath/junit-report.html">Unit
Tests</a></strong></small></div>
- <div><small><strong><a
href="$relativePath/apidocs">JavaDocs</a></strong></small></div>
- <div><small><strong><a href="$relativePath/xref">Source
XReference</a></strong></small></div>
+ <div><small><a href="$relativePath/index.html">Front
Page</a></small></div>
+ <div><small><a href="$relativePath/mail-lists.html">Mailing
Lists</a></small></div>
+ <div><small><a
href="$relativePath/developer-list.html">Developers</a></small></div>
+ <div><small><a
href="$relativePath/dependencies.html">Dependencies</a></small></div>
+ <div><small><a href="$projectDescriptor.cvsWebUrl">CVS
Repository</a></small></div>
+ <div><small><a href="$relativePath/changelog.html">Change
Log</a></small></div>
+ <div><small><a href="$relativePath/jdepend-report.html">Metric
Results</a></small></div>
+ <div><small><a href="$relativePath/junit-report.html">Unit
Tests</a></small></div>
+ <div><small><a
href="$relativePath/apidocs">JavaDocs</a></small></div>
+ <div><small><a href="$relativePath/xref">Source
XReference</a></small></div>
</div>
</div>
</td>
<td>
+ ## Provides some space between the first heading and the
+ ## banner without resorting to modifying the stylesheet
+ ## (makes for easier upgrades)
+ <div></div>
<div id="bodycol">
## Insert MAIN body here
- <p>
- <div id="selectmodule" class="app">
+ <div class="app">
$context.applyTemplates("body/section")
$context.applyTemplates("body/glossary")
$context.applyTemplates("body/changelog")
</div>
- </p>
</div>
</td>
</tr>
@@ -143,6 +144,15 @@
</html>
#end
+#macro( itemLink $item )
+ #if( $item.attrib("href").startsWith("http") )
+ <a href="$item.attrib('href')">$item.attrib("name")</a>
+ #elseif ( $item.attrib("href").startsWith("/site") )
+ <a href="$item.attrib('href')">$item.attrib("name")</a>
+ #else
+ <a href="$relativePath$item.attrib('href')">$item.attrib("name")</a>
+ #end
+#end
#*
* Process a menu for the navigation bar
@@ -150,23 +160,24 @@
#match( "menu" )
<div>
<strong>$attrib.name</strong>
- $context.applyTemplates("item")
+ #foreach ($item in $node.selectNodes("item"))
+ <div><small>
+ #itemLink( $item )
+ </small></div>
+ #end
</div>
#end
#*
- * Process a menu item for the navigation bar
+ * Process the breadcrumb navbar
*#
-#match( "item" )
- <div><small><strong>
- #if( $attrib.href.startsWith("http") )
- <a href="$attrib.href">$attrib.name</a>
- #elseif ( $attrib.href.startsWith("/site") )
- <a href="$attrib.href">$attrib.name</a>
- #else
- <a href="$relativePath$attrib.href">$attrib.name</a>
+#match ( "links" )
+ <div align="right">
+ #foreach ($item in $node.selectNodes("item"))
+ #if ($velocityCount != 1) | #end
+ #itemLink( $item )
#end
- </strong></small></div>
+ </div>
#end
#*
1.1 jakarta-turbine-maven/src/dvsl/xdocs/compact.css
Index: compact.css
===================================================================
#banner, #footer, #leftcol {
display: none;
}
1.1 jakarta-turbine-maven/src/images/icon_alertsml.gif
<<Binary file>>
1.1 jakarta-turbine-maven/src/images/jakarta-logo-blue.gif
<<Binary file>>
1.39 +2 -9 jakarta-turbine-maven/src/templates/build/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build-docs.xml 26 Mar 2002 14:08:13 -0000 1.38
+++ build-docs.xml 26 Mar 2002 23:00:12 -0000 1.39
@@ -224,15 +224,8 @@
</fileset>
</copy>
- <!-- Copy maven supplied stylesheets. We need to filter here
- because the stylesheets need to reference files in the images
- directory. Since this file is referenced from each page on the
- site, relative URLs will not work. Thus, the base URL must be
- passed into the sheet here. We should also make a note that
- the Url in the project descriptor should be the base URL of a
- site and that it should end with a trailing slash. -->
- <filter token="PROJECT_BASE_URL" value="${url}"/>
- <copy todir="${docs.dest}/style" filtering="yes">
+ <!-- Copy maven supplied stylesheets. -->
+ <copy todir="${docs.dest}/style" filtering="no">
<fileset dir="${maven.home}/stylesheets">
<include name="**/*.css"/>
</fileset>
1.21 +10 -0 jakarta-turbine-maven/xdocs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 26 Mar 2002 14:09:36 -0000 1.20
+++ project.xml 26 Mar 2002 23:00:12 -0000 1.21
@@ -5,6 +5,16 @@
<logo href="/images/maven.jpg">Maven</logo>
<body>
+ <links>
+ <item name="Turbine"
href="http://jakarta.apache.org/turbine"/>
+ <item name="Turbine-2"
href="http://jakarta.apache.org/turbine/turbine-2"/>
+ <item name="Turbine-3"
href="http://jakarta.apache.org/turbine/turbine-3"/>
+ <item name="Torque"
href="http://jakarta.apache.org/turbine/torque"/>
+ <item name="Fulcrum"
href="http://jakarta.apache.org/turbine/fulcrum"/>
+ <item name="TDK"
href="http://jakarta.apache.org/turbine/tdk"/>
+ <item name="Stratum"
href="http://jakarta.apache.org/turbine/stratum"/>
+ <item name="Maven"
href="http://jakarta.apache.org/turbine/maven"/>
+ </links>
<menu name="Overview">
<item name="Goals" href="/goals.html"/>
<item name="Getting Started" href="/getting-started.html"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
