You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/09/10 21:21:23 UTC
svn commit: r1521594 [16/16] - in /tomcat/site/trunk: docs/ docs/images/
docs/stylesheets/ xdocs/images/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/whoweare.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1521594&r1=1521593&r2=1521594&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Tue Sep 10 19:21:22 2013
@@ -1,197 +1,5 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Apache Tomcat - Who We Are</title>
-<link type="text/css" href="stylesheets/tomcat.css" rel="stylesheet">
-<link type="text/css" href="stylesheets/tomcat-printer.css" rel="stylesheet" media="print">
-</head>
-<body bgcolor="#ffffff" text="#000000" link="#525D76" alink="#525D76" vlink="#525D76">
-<table border="0" width="100%" cellspacing="0">
-<!--PAGE HEADER-->
-<tr>
-<td>
-<!--PROJECT LOGO--><a href="http://tomcat.apache.org/"><img src="./images/tomcat.gif" align="left" alt="Tomcat Logo" border="0"></a></td><td><font face="arial,helvetica,sanserif">
-<h1>Apache Tomcat</h1>
-</font></td><td>
-<!--APACHE LOGO--><a href="http://www.apache.org/"><img src="http://www.apache.org/images/asf-logo.gif" align="right" alt="Apache Logo" border="0"></a></td>
-</tr>
-</table>
-<div class="searchbox noPrint">
-<form action="http://www.google.com/search" method="get">
-<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input value="Search the Site" size="25" name="q" id="query" type="text"><input name="Search" value="Search Site" type="submit">
-</form>
-</div>
-<table border="0" width="100%" cellspacing="4">
-<!--HEADER SEPARATOR-->
-<tr>
-<td colspan="2">
-<hr noshade size="1">
-</td>
-</tr>
-<tr>
-<!--LEFT SIDE NAVIGATION-->
-<td width="20%" valign="top" nowrap="true" class="noPrint">
-<p>
-<strong>Apache Tomcat</strong>
-</p>
-<ul>
-<li>
-<a href="./index.html">Home</a>
-</li>
-<li>
-<a href="./taglibs/">Taglibs</a>
-</li>
-<li>
-<a href="./maven-plugin.html">Maven Plugin</a>
-</li>
-</ul>
-<p>
-<strong>Download</strong>
-</p>
-<ul>
-<li>
-<a href="./whichversion.html">Which version?</a>
-</li>
-<li>
-<a href="./download-80.cgi">Tomcat 8.0</a>
-</li>
-<li>
-<a href="./download-70.cgi">Tomcat 7.0</a>
-</li>
-<li>
-<a href="./download-60.cgi">Tomcat 6.0</a>
-</li>
-<li>
-<a href="./download-connectors.cgi">Tomcat Connectors</a>
-</li>
-<li>
-<a href="./download-native.cgi">Tomcat Native</a>
-</li>
-<li>
-<a href="http://archive.apache.org/dist/tomcat/">Archives</a>
-</li>
-</ul>
-<p>
-<strong>Documentation</strong>
-</p>
-<ul>
-<li>
-<a href="./tomcat-8.0-doc/index.html">Tomcat 8.0</a>
-</li>
-<li>
-<a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
-</li>
-<li>
-<a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a>
-</li>
-<li>
-<a href="./connectors-doc/">Tomcat Connectors</a>
-</li>
-<li>
-<a href="./native-doc/">Tomcat Native</a>
-</li>
-<li>
-<a href="http://wiki.apache.org/tomcat/FrontPage">Wiki</a>
-</li>
-<li>
-<a href="./migration.html">Migration Guide</a>
-</li>
-</ul>
-<p>
-<strong>Problems?</strong>
-</p>
-<ul>
-<li>
-<a href="./security.html">Security Reports</a>
-</li>
-<li>
-<a href="./findhelp.html">Find help</a>
-</li>
-<li>
-<a href="http://wiki.apache.org/tomcat/FAQ">FAQ</a>
-</li>
-<li>
-<a href="./lists.html">Mailing Lists</a>
-</li>
-<li>
-<a href="./bugreport.html">Bug Database</a>
-</li>
-<li>
-<a href="./irc.html">IRC</a>
-</li>
-</ul>
-<p>
-<strong>Get Involved</strong>
-</p>
-<ul>
-<li>
-<a href="./getinvolved.html">Overview</a>
-</li>
-<li>
-<a href="./svn.html">SVN Repositories</a>
-</li>
-<li>
-<a href="./ci.html">Buildbot</a>
-</li>
-<li>
-<a href="https://reviews.apache.org/groups/tomcat/">Reviewboard</a>
-</li>
-<li>
-<a href="./tools.html">Tools</a>
-</li>
-</ul>
-<p>
-<strong>Media</strong>
-</p>
-<ul>
-<li>
-<a href="http://blogs.apache.org/tomcat/">Blog</a>
-</li>
-<li>
-<a href="http://twitter.com/theapachetomcat">Twitter</a>
-</li>
-</ul>
-<p>
-<strong>Misc</strong>
-</p>
-<ul>
-<li>
-<a href="./whoweare.html">Who We Are</a>
-</li>
-<li>
-<a href="./heritage.html">Heritage</a>
-</li>
-<li>
-<a href="http://www.apache.org">Apache Home</a>
-</li>
-<li>
-<a href="./resources.html">Resources</a>
-</li>
-<li>
-<a href="./contact.html">Contact</a>
-</li>
-<li>
-<a href="./legal.html">Legal</a>
-</li>
-<li>
-<a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-</li>
-<li>
-<a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
-</li>
-</ul>
-</td>
-<!--RIGHT SIDE MAIN BODY--><td width="80%" valign="top" align="left" id="mainBody">
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Who We Are">
-<!--()--></a><a name="Who_We_Are"><strong>Who We Are</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<p>
-<blockquote>
-
+<!DOCTYPE html SYSTEM "about:legacy-compat">
+<html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css"><link href="stylesheets/tomcat-printer.css" rel="stylesheet" type="text/css" media="print"><title>Apache Tomcat - Who We Are</title></head><body><div id="wrapper"><header id="header"><div><div><div class="logo noPrint"><a href=""><img alt="Tomcat Home" src="./images/tomcat.png"></a></div><div style="height: 1px;"></div><div class="asfLogo"><a href="http://www.apache.org/" target="_blank"><img src="http://www.apache.org/images/feather.png" alt="The Apache Software Foundation" style="width: 266px; height: 83px;"></a></div><h1 style="margin-top: 35px;">Apache Tomcat</h1><div style="clear: right;"></div><div class="searchbox noPrint"><form action="http://www.google.com/search" method="get"><input value="tomcat.apache.org" name="sitesearch" type="hidden"><input placeholder="Search the Site…" required="required" size="25" name
="q" id="query" type="search"><button>Search</button></form></div><div style="height: 1px;"></div><div style="clear: left;"></div></div></div></header><div id="middle"><div><div id="mainLeft" class="noprint"><div><nav><div><h2><strong>Apache Tomcat</strong></h2><ul><li><a href="./index.html">Home</a></li><li><a href="./taglibs/">Taglibs</a></li><li><a href="./maven-plugin.html">Maven Plugin</a></li></ul></div><div><h2><strong>Download</strong></h2><ul><li><a href="./whichversion.html">Which version?</a></li><li><a href="./download-80.cgi">Tomcat 8.0</a></li><li><a href="./download-70.cgi">Tomcat 7.0</a></li><li><a href="./download-60.cgi">Tomcat 6.0</a></li><li><a href="./download-connectors.cgi">Tomcat Connectors</a></li><li><a href="./download-native.cgi">Tomcat Native</a></li><li><a href="http://archive.apache.org/dist/tomcat/">Archives</a></li></ul></div><div><h2><strong>Documentation</strong></h2><ul><li><a href="./tomcat-8.0-doc/index.html">Tomcat 8.0</a></li><li><a href="./to
mcat-7.0-doc/index.html">Tomcat 7.0</a></li><li><a href="./tomcat-6.0-doc/index.html">Tomcat 6.0</a></li><li><a href="./connectors-doc/">Tomcat Connectors</a></li><li><a href="./native-doc/">Tomcat Native</a></li><li><a href="http://wiki.apache.org/tomcat/FrontPage">Wiki</a></li><li><a href="./migration.html">Migration Guide</a></li></ul></div><div><h2><strong>Problems?</strong></h2><ul><li><a href="./security.html">Security Reports</a></li><li><a href="./findhelp.html">Find help</a></li><li><a href="http://wiki.apache.org/tomcat/FAQ">FAQ</a></li><li><a href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2><strong>Get Involved</strong></h2><ul><li><a href="./getinvolved.html">Overview</a></li><li><a href="./svn.html">SVN Repositories</a></li><li><a href="./ci.html">Buildbot</a></li><li><a href="https://reviews.apache.org/groups/tomcat/">Reviewboard</a></li><li><a href="./tools.html">Tool
s</a></li></ul></div><div><h2><strong>Media</strong></h2><ul><li><a href="http://blogs.apache.org/tomcat/">Blog</a></li><li><a href="http://twitter.com/theapachetomcat">Twitter</a></li></ul></div><div><h2><strong>Misc</strong></h2><ul><li><a href="./whoweare.html">Who We Are</a></li><li><a href="./heritage.html">Heritage</a></li><li><a href="http://www.apache.org">Apache Home</a></li><li><a href="./resources.html">Resources</a></li><li><a href="./contact.html">Contact</a></li><li><a href="./legal.html">Legal</a></li><li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li></ul></div></nav></div></div><div id="mainRight"><div id="content"><main><h2 style="display: none;">Content</h2><h3 id="Who_We_Are">Who We Are</h3><div class="text">
<p>
The Apache Tomcat Project operates on a meritocracy: the more you do,
the more responsibility you will obtain. This page lists all of the
@@ -201,7 +9,6 @@ see the overview on <a href="getinvolved
involved</a>.
</p>
-
<p>
We ask that you please do not send us emails privately asking for support. We
are non-paid volunteers who help out with the project and we do not
@@ -213,227 +20,107 @@ communication is that it is a shared res
common mistakes and as a community we all grow together.
</p>
-
<p>
The following is a list of the Apache Tomcat PMC members and Committers with
short bios for some of them.</p>
-
<p>
A complete list of all the Apache Committers is
<a href="http://www.apache.org/~jim/committers.html">also available</a>.
(It's a long list, so please be patient.)
</p>
-
-</blockquote>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Project Management Committee">
-<!--()--></a><a name="Project_Management_Committee"><strong>Project Management Committee</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<p>
-<blockquote>
-
+</div><h3 id="Project_Management_Committee">Project Management Committee</h3><div class="text">
<h3>PMC Chair</h3>
-
-<p>
-<b>Mladen Turk</b> (mturk at apache.org)<br>
-</p>
-
+<p><b>Mladen Turk</b> (mturk at apache.org)<br></p>
<h3>PMC Members & Committers</h3>
+<p><b>Jean-Francois Arcand</b> (jfarcand at apache.org)<br></p>
-<p>
-<b>Jean-Francois Arcand</b> (jfarcand at apache.org)<br>
-</p>
+<p><b>Bill Barker</b> (billbarker at apache.org)<br></p>
-<p>
-<b>Bill Barker</b> (billbarker at apache.org)<br>
-</p>
+<p><b>Jean-Frederic Clere</b> (jfclere at apache.org)<br></p>
+<p><b>Ian Darwin</b> (idarwin at apache.org)<br></p>
-<p>
-<b>Jean-Frederic Clere</b> (jfclere at apache.org)<br>
-</p>
+<p><b>Keiichi Fujino</b> (kfujino at apache.org)<br></p>
-<p>
-<b>Ian Darwin</b> (idarwin at apache.org)<br>
-</p>
+<p><b>Tim Funk</b> (funkman at apache.org)<br></p>
-<p>
-<b>Keiichi Fujino</b> (kfujino at apache.org)<br>
-</p>
+<p><b>Violeta Georgieva</b> (violetagg at apache.org)<br></p>
+<p><b>Henri Gomez</b> (hgomez at apache.org)<br></p>
-<p>
-<b>Tim Funk</b> (funkman at apache.org)<br>
-</p>
+<p><b>Filip Hanik</b> (fhanik at apache.org)<br></p>
+<p><b>Jacob Hookom</b> (jhook at apache.org)<br></p>
-<p>
-<b>Violeta Georgieva</b> (violetagg at apache.org)<br>
-</p>
+<p><b>Jim Jagielski</b> (jim at apache.org)<br></p>
-<p>
-<b>Henri Gomez</b> (hgomez at apache.org)<br>
-</p>
+<p><b>Rainer Jung</b> (rjung at apache.org)<br></p>
+<p><b>Konstantin Kolinko</b> (kkolinko at apache.org)<br></p>
-<p>
-<b>Filip Hanik</b> (fhanik at apache.org)<br>
-</p>
+<p><b>Olivier Lamy</b> (olamy at apache.org)<br></p>
-<p>
-<b>Jacob Hookom</b> (jhook at apache.org)<br>
-</p>
+<p><b>Sylvain Laurent</b> (slaurent at apache.org)<br></p>
-
-<p>
-<b>Jim Jagielski</b> (jim at apache.org)<br>
-</p>
+<p><b>Remy Maucherat</b> (remm at apache.org)<br></p>
+<p><b>Costin Manolache</b> (costin at apache.org)<br></p>
-<p>
-<b>Rainer Jung</b> (rjung at apache.org)<br>
-</p>
+<p><b>Peter Rossbach</b> (pero at apache.org)<br></p>
-<p>
-<b>Konstantin Kolinko</b> (kkolinko at apache.org)<br>
-</p>
+<p><b>Christopher Schultz</b> (schultz at apache.org)<br></p>
-
-<p>
-<b>Olivier Lamy</b> (olamy at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Sylvain Laurent</b> (slaurent at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Remy Maucherat</b> (remm at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Costin Manolache</b> (costin at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Peter Rossbach</b> (pero at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Christopher Schultz</b> (schultz at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Yoav Shapira</b> (yoavs at apache.org)<br>
-</p>
+<p><b>Yoav Shapira</b> (yoavs at apache.org)<br></p>
Yoav Shapira contributes to numerous Apache and other
open-source projects: you can read more about him at
<a href="http://www.yoavshapira.com">YoavShapira.com</a>.
-<p>
-<b>Eiji Takahashi</b> (eijit at apache.org)<br>
-</p>
-
-
-
-<p>
-<b>Mark Thomas</b> (markt at apache.org)<br>
-</p>
-
+<p><b>Eiji Takahashi</b> (eijit at apache.org)<br></p>
-<p>
-<b>Keith Wannamaker</b> (keith at apache.org)<br>
-</p>
+<p><b>Mark Thomas</b> (markt at apache.org)<br></p>
+<p><b>Keith Wannamaker</b> (keith at apache.org)<br></p>
-<p>
-<b>Tim Whittington</b> (timw at apache.org)<br>
-</p>
+<p><b>Tim Whittington</b> (timw at apache.org)<br></p>
<b>William A. Rowe Jr.</b> (wrowe at apache.org)
-</blockquote>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Emeritus Committers">
-<!--()--></a><a name="Emeritus_Committers"><strong>Emeritus Committers</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<p>
-<blockquote>
+</div><h3 id="Emeritus_Committers">Emeritus Committers</h3><div class="text">
-
-<p>
-<a href="http://www.apache.org/foundation/glossary.html#Emeritus">
+<p><a href="http://www.apache.org/foundation/glossary.html#Emeritus">
Emeritus</a> is defined in the Apache glossary.</p>
-
<p>
-
<b>James Duncan Davidson</b> (duncan at apache.org),
<b>Jon Scott Stevens</b> (jon at apache.org),
<b>Sam Ruby</b> (rubys at apache.org),
@@ -487,38 +174,9 @@ Emeritus</a> is defined in the Apache gl
<b>Jean-Jacques Clar</b> (clar at apache.org),
</p>
-
-</blockquote>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-<!--FOOTER SEPARATOR-->
-<tr>
-<td colspan="2">
-<hr noshade size="1">
-</td>
-</tr>
-<!--PAGE FOOTER-->
-<tr>
-<td colspan="2">
-<div align="center">
-<font color="#525D76" size="-1"><em>
- Copyright © 1999-2013, The Apache Software Foundation
- <br>
- Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
- project logo are trademarks of the Apache Software Foundation.
- </em></font>
-</div>
-</td>
-</tr>
-</table>
-</body>
-</html>
+</div></main></div></div></div></div><footer id="footer">
+ Copyright © 1999-2013, The Apache Software Foundation
+ <br>
+ Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+ project logo are trademarks of the Apache Software Foundation.
+ </footer></div></body></html>
\ No newline at end of file
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-printer.css
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-printer.css?rev=1521594&r1=1521593&r2=1521594&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-printer.css (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-printer.css Tue Sep 10 19:21:22 2013
@@ -1,3 +1,20 @@
-.noPrint {display: none;}
-td#mainBody {width: 100%;}
+@charset "utf-8";
+/*
+* Copyright 2002-2013 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.
+*/
+.noPrint { display: none; }
+#middle > div > div#mainLeft { display: none; }
+a { color: inherit; text-decoration: none; }
\ No newline at end of file
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1521594&r1=1521593&r2=1521594&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Tue Sep 10 19:21:22 2013
@@ -1,35 +1,44 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
<!-- Content Stylesheet for "tomcat-site" Documentation -->
<!-- $Id$ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
+ version="3.0">
<!-- Output method -->
<xsl:output method="html"
- encoding="utf-8"
- indent="yes"/>
+ html-version="5.0"
+ encoding="UTF-8"
+ indent="no"
+ doctype-system="about:legacy-compat"/>
<!-- Defined parameters (overrideable) -->
<xsl:param name="relative-path" select="'.'"/>
+ <xsl:param name="home-logo" select="'/images/tomcat.png'"/>
<xsl:param name="buglink" select="'https://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
<xsl:param name="revlink" select="'http://svn.apache.org/viewvc?view=rev&rev='"/>
<xsl:param name="cvelink" select="'http://cve.mitre.org/cgi-bin/cvename.cgi?name='"/>
<!-- Defined variables (non-overrideable) -->
- <xsl:variable name="body-bg" select="'#ffffff'"/>
- <xsl:variable name="body-fg" select="'#000000'"/>
- <xsl:variable name="body-link" select="'#525D76'"/>
- <xsl:variable name="banner-bg" select="'#525D76'"/>
- <xsl:variable name="banner-fg" select="'#ffffff'"/>
- <xsl:variable name="sub-banner-bg" select="'#828DA6'"/>
- <xsl:variable name="sub-banner-fg" select="'#ffffff'"/>
- <xsl:variable name="table-th-bg" select="'#039acc'"/>
- <xsl:variable name="table-td-bg" select="'#a0ddf0'"/>
- <xsl:variable name="source-color" select="'#023264'"/>
<!-- Process an entire document into an HTML page -->
@@ -37,8 +46,19 @@
<xsl:variable name="project"
select="document('project.xml')/project"/>
- <html>
- <head>
+<html lang="en">
+<head>
+ <!-- Note: XLST seems to always output a
+ <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ when method="html",
+ therefore we can't use
+ <meta charset="UTF-8"/>.
+
+ In XHTML, this is not needed as the encoding will be
+ specified in the XML declaration.
+ -->
+ <link href="stylesheets/tomcat.css" rel="stylesheet" type="text/css"/>
+ <link href="stylesheets/tomcat-printer.css" rel="stylesheet" type="text/css" media="print"/>
<xsl:apply-templates select="meta"/>
<title><xsl:value-of select="$project/title"/> - <xsl:value-of select="properties/title"/></title>
<xsl:for-each select="properties/author">
@@ -59,102 +79,88 @@
<xsl:if test="properties/base">
<base href="{properties/base/@href}"/>
</xsl:if>
+ </head>
- <!-- YS 20051102: Add a stylesheet -->
- <link type="text/css" href="stylesheets/tomcat.css" rel="stylesheet" />
- <link type="text/css" href="stylesheets/tomcat-printer.css" rel="stylesheet" media="print" />
- </head>
-
- <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
- alink="{$body-link}" vlink="{$body-link}">
-
- <table border="0" width="100%" cellspacing="0">
-
- <xsl:comment>PAGE HEADER</xsl:comment>
- <tr>
- <td>
- <xsl:comment>PROJECT LOGO</xsl:comment>
- <a href="http://tomcat.apache.org/">
- <img src="./images/tomcat.gif" align="left" alt="Tomcat Logo" border="0"/>
- </a>
- </td>
- <td>
- <font face="arial,helvetica,sanserif">
- <h1><xsl:value-of select="$project/title"/></h1>
- </font>
- </td>
- <td>
- <xsl:comment>APACHE LOGO</xsl:comment>
- <a href="http://www.apache.org/">
- <img src="http://www.apache.org/images/asf-logo.gif"
- align="right" alt="Apache Logo" border="0"/>
- </a>
- </td>
- </tr>
- </table>
-
- <!-- Search box: uses CSS positioning -->
+ <body>
+ <div id="wrapper">
+ <!-- Header -->
+ <header id="header">
+ <div>
+ <div>
+ <xsl:variable name="src">
+ <xsl:value-of select="$relative-path"/><xsl:value-of select="$home-logo"/>
+ </xsl:variable>
+ <div class="logo noPrint">
+ <a href="{project/@href}"><img alt="Tomcat Home" src="{$src}"/></a>
+ </div>
+
+ <div style="height: 1px;"/>
+ <div class="asfLogo"><a href="http://www.apache.org/" target="_blank"><img src="http://www.apache.org/images/feather.png" alt="The Apache Software Foundation" style="width: 266px; height: 83px;"/></a></div>
+ <h1 style="margin-top: 35px;"><xsl:value-of select="$project/title"/></h1>
+
+ <div style="clear: right;"/>
+ <!-- Search box: uses CSS positioning -->
<div class="searchbox noPrint">
<form action="http://www.google.com/search" method="get">
<input value="tomcat.apache.org" name="sitesearch" type="hidden" />
- <input value="Search the Site" size="25" name="q" id="query" type="text" />
- <input name="Search" value="Search Site" type="submit" />
+ <input placeholder="Search the Siteâ¦" required="required" size="25" name="q" id="query" type="search" />
+ <button>Search</button>
</form>
</div>
<!-- End search box -->
+
+ <div style="height: 1px;"/>
+ <div style="clear: left;"/>
+ </div>
+ </div>
+ </header>
+
+
+ <div id="middle">
+ <div>
+ <div id="mainLeft" class="noprint">
+ <div>
+ <!-- Navigation -->
+ <nav>
+ <xsl:apply-templates select="$project/body/menu"/>
+ </nav>
+ </div>
+ </div>
+ <div id="mainRight">
+ <div id="content">
+ <!-- Main Part -->
+ <main>
+ <!-- Hidden heading -->
+ <h2 style="display: none;">Content</h2>
+ <xsl:apply-templates select="body/section"/>
+ </main>
+ </div>
+ </div>
+ </div>
+ </div>
- <table border="0" width="100%" cellspacing="4">
-
- <xsl:comment>HEADER SEPARATOR</xsl:comment>
- <tr>
- <td colspan="2">
- <hr noshade="" size="1"/>
- </td>
- </tr>
-
- <tr>
- <xsl:comment>LEFT SIDE NAVIGATION</xsl:comment>
- <td width="20%" valign="top" nowrap="true" class="noPrint">
- <xsl:apply-templates select="$project/body/menu"/>
- </td>
-
- <xsl:comment>RIGHT SIDE MAIN BODY</xsl:comment>
- <td width="80%" valign="top" align="left" id="mainBody">
- <xsl:apply-templates select="body/section"/>
- </td>
-
- </tr>
-
- <xsl:comment>FOOTER SEPARATOR</xsl:comment>
- <tr>
- <td colspan="2">
- <hr noshade="" size="1"/>
- </td>
- </tr>
-
- <xsl:comment>PAGE FOOTER</xsl:comment>
- <tr><td colspan="2">
- <div align="center"><font color="{$body-link}" size="-1"><em>
- Copyright © 1999-2013, The Apache Software Foundation
- <br/>
- Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
- project logo are trademarks of the Apache Software Foundation.
- </em></font></div>
- </td></tr>
-
- </table>
- </body>
- </html>
+ <!-- Footer -->
+ <footer id="footer">
+ Copyright © 1999-2013, The Apache Software Foundation
+ <br/>
+ Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+ project logo are trademarks of the Apache Software Foundation.
+ </footer>
+</div>
+</body>
+</html>
</xsl:template>
<!-- Process a menu for the navigation bar -->
<xsl:template match="menu">
- <p><strong><xsl:value-of select="@name"/></strong></p>
+ <div>
+ <h2><strong><xsl:value-of select="@name"/></strong></h2>
<ul>
<xsl:apply-templates select="item"/>
</ul>
+ </div>
</xsl:template>
@@ -182,7 +188,7 @@
<!-- Process a documentation section -->
<xsl:template match="section">
- <xsl:variable name="name">
+ <xsl:variable name="name2">
<xsl:choose>
<xsl:when test="@anchor">
<xsl:value-of select="@anchor" />
@@ -192,41 +198,31 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:variable name="name2">
- <xsl:value-of select="translate($name, ' #', '__')"/>
+ <xsl:variable name="name">
+ <xsl:value-of select="translate($name2, ' #', '__')"/>
</xsl:variable>
- <table border="0" cellspacing="0" cellpadding="2" width="100%">
- <!-- Section heading -->
- <tr><td bgcolor="{$banner-bg}">
- <font color="{$banner-fg}" face="arial,helvetica,sanserif">
- <xsl:if test="$name != $name2"><a name="{$name}"><xsl:comment>()</xsl:comment></a></xsl:if>
- <a name="{$name2}">
- <strong><xsl:value-of select="@name"/></strong></a></font>
- </td>
- <xsl:if test="@rtext">
- <td align="right" bgcolor="{$banner-bg}">
- <font color="{$banner-fg}" face="arial,helvetica.sanserif">
- <strong><xsl:value-of select="@rtext"/></strong></font>
- </td>
- </xsl:if>
- </tr>
- <!-- Section body -->
- <tr><td>
+
+ <!-- Section heading -->
+ <h3 id="{$name}">
<xsl:if test="@rtext">
- <xsl:attribute name="colspan">2</xsl:attribute>
+ <!-- Additional right-aligned text cell in section heading. -->
+ <span style="float: right;">
+ <xsl:value-of select="@rtext"/>
+ </span><xsl:text> </xsl:text> <!-- Ensure a space follows after </span> -->
</xsl:if>
- <p><blockquote>
- <xsl:apply-templates/>
- </blockquote></p>
- </td></tr>
- <tr><td><br/></td></tr>
- </table>
+ <xsl:value-of select="@name"/>
+ </h3>
+ <!-- Section body -->
+ <div class="text">
+ <xsl:apply-templates/>
+ </div>
+
</xsl:template>
<!-- Process a documentation subsection -->
<xsl:template match="subsection">
- <xsl:variable name="name">
+ <xsl:variable name="name2">
<xsl:choose>
<xsl:when test="@anchor">
<xsl:value-of select="@anchor" />
@@ -241,23 +237,23 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:variable name="name2">
- <xsl:value-of select="translate($name, ' #', '__')"/>
+ <xsl:variable name="name">
+ <xsl:value-of select="translate($name2, ' #', '__')"/>
</xsl:variable>
- <table border="0" cellspacing="0" cellpadding="2" width="100%">
+
+ <div class="subsection">
<!-- Subsection heading -->
- <tr><td bgcolor="{$sub-banner-bg}">
- <font color="{$sub-banner-fg}" face="arial,helvetica,sanserif">
- <xsl:if test="$name != $name2"><a name="{$name}"><xsl:comment>()</xsl:comment></a></xsl:if>
- <a name="{$name2}">
- <strong><xsl:value-of select="@name"/></strong></a></font>
- </td></tr>
+ <!-- TODO: When a <subsection> is nested in another <subsection>,
+ the output should be <h5>, not <h4>. Same with <h6>. -->
+ <h4 id="{$name}">
+ <xsl:value-of select="@name"/>
+ </h4>
<!-- Subsection body -->
- <tr><td><blockquote>
+ <div class="text">
<xsl:apply-templates/>
- </blockquote></td></tr>
- <tr><td><br/></td></tr>
- </table>
+ </div>
+ </div>
+
</xsl:template>
@@ -267,7 +263,7 @@
</xsl:template>
<xsl:template mode="toc" match="section|subsection">
- <xsl:variable name="name">
+ <xsl:variable name="name2">
<xsl:choose>
<xsl:when test="@anchor">
<xsl:value-of select="@anchor" />
@@ -282,10 +278,10 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:variable name="name2">
- <xsl:value-of select="translate($name, ' #', '__')"/>
+ <xsl:variable name="name">
+ <xsl:value-of select="translate($name2, ' #', '__')"/>
</xsl:variable>
- <li><a href="#{$name2}"><xsl:value-of select="@name"/></a>
+ <li><a href="#{$name}"><xsl:value-of select="@name"/></a>
<xsl:if test="subsection">
<ol><xsl:apply-templates mode="toc" select="subsection"/></ol>
</xsl:if>
@@ -295,43 +291,14 @@
<!-- Process a source code example -->
<xsl:template match="source">
- <div align="left">
- <table cellspacing="4" cellpadding="0" border="0">
- <tr>
- <td bgcolor="{$source-color}" width="1" height="1">
- <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
- </td>
- <td bgcolor="{$source-color}" height="1">
- <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
- </td>
- <td bgcolor="{$source-color}" width="1" height="1">
- <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
- </td>
- </tr>
- <tr>
- <td bgcolor="{$source-color}" width="1">
- <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
- </td>
- <td bgcolor="#ffffff" height="1"><pre>
- <xsl:value-of select="."/>
- </pre></td>
- <td bgcolor="{$source-color}" width="1">
- <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
- </td>
- </tr>
- <tr>
- <td bgcolor="{$source-color}" width="1" height="1">
- <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
- </td>
- <td bgcolor="{$source-color}" height="1">
- <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
- </td>
- <td bgcolor="{$source-color}" width="1" height="1">
- <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
- </td>
- </tr>
- </table>
- </div>
+ <div class="codeBox">
+ <pre>
+ <xsl:if test="@wrapped='true'">
+ <xsl:attribute name="class">wrap</xsl:attribute>
+ </xsl:if>
+ <code><xsl:apply-templates/></code>
+ </pre>
+ </div>
</xsl:template>
<!-- Link to a bug report -->
@@ -359,28 +326,6 @@
<a href="{$link}" rel="nofollow"><xsl:apply-templates/></a>
</xsl:template>
- <!-- specially process td tags ala site.vsl -->
- <xsl:template match="table[@class='detail-table']/tr/td">
- <td bgcolor="{$table-td-bg}" valign="top" align="left">
- <xsl:if test="@colspan"><xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute></xsl:if>
- <xsl:if test="@rowspan"><xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute></xsl:if>
- <font color="#000000" size="-1" face="arial,helvetica,sanserif">
- <xsl:apply-templates/>
- </font>
- </td>
- </xsl:template>
-
- <!-- handle th ala site.vsl -->
- <xsl:template match="table[@class='detail-table']/tr/th">
- <td bgcolor="{$table-th-bg}" valign="top">
- <xsl:if test="@colspan"><xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute></xsl:if>
- <xsl:if test="@rowspan"><xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute></xsl:if>
- <font color="#000000" size="-1" face="arial,helvetica,sanserif">
- <xsl:apply-templates />
- </font>
- </td>
- </xsl:template>
-
<!-- Process everything else by just passing it through -->
<xsl:template match="*|@*">
<xsl:copy>
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat.css
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat.css?rev=1521594&r1=1521593&r2=1521594&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/tomcat.css (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat.css Tue Sep 10 19:21:22 2013
@@ -1,3 +1,4 @@
+@charset "utf-8";
/*
* Copyright 2002-2013 The Apache Software Foundation
*
@@ -14,20 +15,239 @@
* limitations under the License.
*/
+
+/* General style */
+
+body {
+ margin: 0;
+}
+
+body, input {
+ font-family: 'Lucida Sans Unicode', Arial, Helvetica, sans-serif;
+ font-size: 10.5pt;
+}
+
+code, pre {
+ font-family: Consolas, monospace;
+}
+
+img {
+ border: 0;
+}
+
+table {
+ border-collapse: collapse;
+ text-align: left;
+}
+table *:not(table) {
+ /* Prevent border-collapsing for table child elements like <div> */
+ border-collapse: separate;
+}
+
+main {
+ /* Remove this once all IEs support <main> element */
+ display: block;
+}
+
+
+/* Layout */
+
+#wrapper {
+ min-width: 400px;
+}
+
+#header {
+ box-shadow: 0 0 7px #aaa;
+ border-bottom: 1px solid #bbb;
+}
+
+#header > div {
+ padding-left: 15px;
+ padding-right: 15px;
+ background: linear-gradient(to bottom, #ffffff -10%, #F8F3E4 100%);
+ position: relative;
+}
+
+#header .logo {
+ float: left;
+ padding-top: 20px;
+ min-width: 190px;
+}
+
+#header .logo img{
+ /* To avoid that the Font Descender being added to the parent div's height */
+ vertical-align: middle;
+}
+
+#header .asfLogo {
+ float: right;
+ position: relative;
+ top: 8px;
+}
+
+#header h1 {
+ margin-top: 0.6em;
+ margin-bottom: 0;
+}
+
+#header .versionInfo {
+ font-size: 13pt;
+ margin-bottom: 1em;
+}
+
+#middle {
+ display: table;
+ table-layout: fixed;
+ margin: 0;
+ width: 100%;
+}
+#middle > div { display: table-row; }
+#middle > div > div { display: table-cell; vertical-align: top; }
+
+
+
+#mainLeft {
+ width: 190px;
+}
+
+#mainLeft > div {
+ margin-top: -1px; /* to overwrite border of element above */
+ padding-left: 16px;
+ padding-right: 14px;
+ padding-top: 6px;
+ padding-bottom: 15px;
+ background-color: #F8F3E4;
+ border-right: 1px solid #bbb;
+ border-bottom: 1px solid #bbb;
+ font-size: 10pt;
+ border-bottom-right-radius: 20px;
+ box-shadow: 0 0 5px #aaa;
+}
+
+#mainLeft h2 {
+ margin-bottom: 0.2em;
+ font-size: 1.2em;
+}
+
+#mainLeft ul {
+ padding: 0;
+ margin: 0;
+ list-style-type: none;
+}
+
+#mainLeft ul a {
+ text-indent: -0.6em;
+ padding-left: 1.4em;
+ display: block;
+ text-decoration: none;
+ color: #444;
+}
+#mainLeft ul a:hover {
+ color: #000;
+ background-color: #D1c9b9;
+}
+
+#mainRight {
+ padding-left: 14px;
+ padding-right: 20px;
+
+}
+
+#footer {
+ margin-top: 30px;
+ padding-top: 20px;
+ padding-bottom: 20px;
+ padding-left: 20px;
+ padding-right: 20px;
+ border-top: 1px solid #ccc;
+ color: #444;
+ text-align: center;
+ /* font-style: italic; */
+ font-size: 9pt;
+}
+
+
+/* Content */
+
+#content div.text {
+ padding-left: 1em;
+ padding-left: 1em;
+}
+
+#content h3, #content h4, #content h5, #content h6 {
+ padding-left: 5px;
+ padding-right: 5px;
+ background-color: #eaeaea;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+}
+
+#content h4, #content h5, #content h6 {
+ background-color: #f6f6f6;
+}
+
+code {
+ background-color: rgb(224,255,255);
+}
+
+div.codeBox pre code, code.attributeName, code.propertyName, code.noHighlight {
+ background-color: transparent;
+}
+div.codeBox {
+ overflow: auto;
+ margin: 1em 0;
+}
+div.codeBox pre {
+ margin: 0;
+ padding: 4px;
+ border: 1px solid #999;
+ border-radius: 5px;
+ background-color: #eff8ff;
+ display: table; /* To prevent <pre>s from taking the complete available width. */
+ /*
+ When it is officially supported, use the following CSS instead of display: table
+ to prevent big <pre>s from exceeding the browser window:
+ max-width: available;
+ width: min-content;
+ */
+}
+
+div.codeBox pre.wrap {
+ white-space: pre-wrap;
+}
+
+
+table.defaultTable tr, table.detail-table tr {
+ border: 1px solid #CCC;
+}
+
+table.defaultTable tr:nth-child(even), table.detail-table tr:nth-child(even) {
+ background-color: #FAFBFF;
+}
+
+table.defaultTable tr:nth-child(odd), table.detail-table tr:nth-child(odd) {
+ background-color: #EEEFFF;
+}
+
+table.defaultTable th, table.detail-table th {
+ background-color: #88b;
+ color: #fff;
+}
+
+table.defaultTable th, table.defaultTable td, table.detail-table th, table.detail-table td {
+ padding: 5px 8px;
+}
+
+
+
.searchbox {
- position: relative;
- left: -50px;
- top: 20px;
- height: 42px;
- white-space: nowrap;
text-align: right;
- z-index:0;
- bottom: -1px; /* compensate for IE rendering issue */
+ margin-top: 8px;
+ margin-right: 10px;
+ margin-bottom: 6px;
}
.searchbox form {
padding: 5px 10px;
margin: 0;
}
-
-code {background-color:rgb(224,255,255);padding:0 0.1em;}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org