You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fu...@apache.org on 2010/11/01 16:30:48 UTC

svn commit: r1029708 - in /tomcat/trunk/webapps/ROOT: asf-logo.png bg-button.png bg-middle.png bg-nav-item.png bg-nav.png bg-upper.png border-radius.htc index.jsp tomcat.css tomcat.png

Author: funkman
Date: Mon Nov  1 15:30:48 2010
New Revision: 1029708

URL: http://svn.apache.org/viewvc?rev=1029708&view=rev
Log:
redesign of home page
by Pid (pidster at apache )


Added:
    tomcat/trunk/webapps/ROOT/asf-logo.png   (with props)
    tomcat/trunk/webapps/ROOT/bg-button.png   (with props)
    tomcat/trunk/webapps/ROOT/bg-middle.png   (with props)
    tomcat/trunk/webapps/ROOT/bg-nav-item.png   (with props)
    tomcat/trunk/webapps/ROOT/bg-nav.png   (with props)
    tomcat/trunk/webapps/ROOT/bg-upper.png   (with props)
    tomcat/trunk/webapps/ROOT/border-radius.htc   (with props)
    tomcat/trunk/webapps/ROOT/tomcat.css   (with props)
    tomcat/trunk/webapps/ROOT/tomcat.png   (with props)
Modified:
    tomcat/trunk/webapps/ROOT/index.jsp

Added: tomcat/trunk/webapps/ROOT/asf-logo.png
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/asf-logo.png?rev=1029708&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/webapps/ROOT/asf-logo.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tomcat/trunk/webapps/ROOT/asf-logo.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: tomcat/trunk/webapps/ROOT/bg-button.png
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/bg-button.png?rev=1029708&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/webapps/ROOT/bg-button.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tomcat/trunk/webapps/ROOT/bg-button.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: tomcat/trunk/webapps/ROOT/bg-middle.png
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/bg-middle.png?rev=1029708&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/webapps/ROOT/bg-middle.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tomcat/trunk/webapps/ROOT/bg-middle.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: tomcat/trunk/webapps/ROOT/bg-nav-item.png
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/bg-nav-item.png?rev=1029708&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/webapps/ROOT/bg-nav-item.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tomcat/trunk/webapps/ROOT/bg-nav-item.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: tomcat/trunk/webapps/ROOT/bg-nav.png
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/bg-nav.png?rev=1029708&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/webapps/ROOT/bg-nav.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tomcat/trunk/webapps/ROOT/bg-nav.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: tomcat/trunk/webapps/ROOT/bg-upper.png
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/bg-upper.png?rev=1029708&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/webapps/ROOT/bg-upper.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tomcat/trunk/webapps/ROOT/bg-upper.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: tomcat/trunk/webapps/ROOT/border-radius.htc
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/border-radius.htc?rev=1029708&view=auto
==============================================================================
--- tomcat/trunk/webapps/ROOT/border-radius.htc (added)
+++ tomcat/trunk/webapps/ROOT/border-radius.htc Mon Nov  1 15:30:48 2010
@@ -0,0 +1,142 @@
+--Do not remove this if you are using--
+Original Author: Remiz Rahnas
+Original Author URL: http://www.htmlremix.com
+Published date: 2008/09/24
+
+Changes by Nick Fetchak:
+- IE8 standards mode compatibility
+- VML elements now positioned behind original box rather than inside of it - should be less prone to breakage
+Published date : 2009/11/18
+
+<public:attach event="oncontentready" onevent="oncontentready('v08vnSVo78t4JfjH')" />
+<script type="text/javascript">
+
+// findPos() borrowed from http://www.quirksmode.org/js/findpos.html
+function findPos(obj) {
+    var curleft = curtop = 0;
+
+    if (obj.offsetParent) {
+        do {
+            curleft += obj.offsetLeft;
+            curtop += obj.offsetTop;
+        } while (obj = obj.offsetParent);
+    }
+
+    return({
+        'x': curleft,
+        'y': curtop
+    });
+}
+
+function oncontentready(classID) {
+  if (this.className.match(classID)) { return(false); }
+
+    if (!document.namespaces.v) { document.namespaces.add("v", "urn:schemas-microsoft-com:vml"); }
+
+    this.className = this.className.concat(' ', classID);
+    var arcSize = Math.min(parseInt(this.currentStyle['-moz-border-radius'] ||
+                                    this.currentStyle['-webkit-border-radius'] ||
+                                    this.currentStyle['border-radius'] ||
+                                    this.currentStyle['-khtml-border-radius']) /
+                           Math.min(this.offsetWidth, this.offsetHeight), 1);
+    var fillColor = this.currentStyle.backgroundColor;
+    var fillSrc = this.currentStyle.backgroundImage.replace(/^url\("(.+)"\)$/, '$1');
+    var strokeColor = this.currentStyle.borderColor;
+    var strokeWeight = parseInt(this.currentStyle.borderWidth);
+    var stroked = 'true';
+    if (isNaN(strokeWeight)) {
+        strokeWeight = 0;
+        strokeColor = fillColor;
+        stroked = 'false';
+    }
+
+    this.style.background = 'transparent';
+    this.style.borderColor = 'transparent';
+
+    // Find which element provides position:relative for the target element (default to BODY)
+    var el = this;
+    var limit = 100, i = 0;
+    while ((typeof(el) != 'unknown') && (el.currentStyle.position != 'relative') && (el.tagName != 'BODY')) {
+        el = el.parentElement;
+        i++;
+        if (i >= limit) { return(false); }
+    }
+    var el_zindex = parseInt(el.currentStyle.zIndex);
+    if (isNaN(el_zindex)) { el_zindex = 0; }
+    //alert('got tag '+ el.tagName +' with pos '+ el.currentStyle.position);
+
+    var rect_size = {
+        'width': this.offsetWidth - strokeWeight,
+        'height': this.offsetHeight - strokeWeight
+    };
+    var el_pos = findPos(el);
+    var this_pos = findPos(this);
+    this_pos.y = this_pos.y + (0.5 * strokeWeight) - el_pos.y;
+    this_pos.x = this_pos.x + (0.5 * strokeWeight) - el_pos.x;
+
+    var rect = document.createElement('v:roundrect');
+    rect.arcsize = arcSize +'px';
+    rect.strokecolor = strokeColor;
+    rect.strokeWeight = strokeWeight +'px';
+    rect.stroked = stroked;
+    rect.style.display = 'block';
+    rect.style.position = 'absolute';
+    rect.style.top = this_pos.y +'px';
+    rect.style.left = this_pos.x +'px';
+    rect.style.width = rect_size.width +'px';
+    rect.style.height = rect_size.height +'px';
+    rect.style.antialias = true;
+    rect.style.zIndex = el_zindex - 1;
+
+    var fill = document.createElement('v:fill');
+    fill.color = fillColor;
+    fill.src = fillSrc;
+    fill.type = 'tile';
+
+    rect.appendChild(fill);
+    el.appendChild(rect);
+
+    var css = el.document.createStyleSheet();
+    css.addRule("v\\:roundrect", "behavior: url(#default#VML)");
+    css.addRule("v\\:fill", "behavior: url(#default#VML)");
+
+    isIE6 = /msie|MSIE 6/.test(navigator.userAgent);
+    // IE6 doesn't support transparent borders, use padding to offset original element
+    if (isIE6 && (strokeWeight > 0)) {
+        this.style.borderStyle = 'none';
+        this.style.paddingTop = parseInt(this.currentStyle.paddingTop || 0) + strokeWeight;
+        this.style.paddingBottom = parseInt(this.currentStyle.paddingBottom || 0) + strokeWeight;
+    }
+
+    if (typeof(window.rounded_elements) == 'undefined') {
+        window.rounded_elements = new Array();
+
+        if (typeof(window.onresize) == 'function') { window.previous_onresize = window.onresize; }
+        window.onresize = window_resize;
+    }
+    this.element.vml = rect;
+    window.rounded_elements.push(this.element);
+}
+
+function window_resize() {
+    if (typeof(window.rounded_elements) == 'undefined') { return(false); }
+
+    for (var i in window.rounded_elements) {
+        var el = window.rounded_elements[i];
+
+        var strokeWeight = parseInt(el.currentStyle.borderWidth);
+        if (isNaN(strokeWeight)) { strokeWeight = 0; }
+
+        var parent_pos = findPos(el.vml.parentNode);
+        var pos = findPos(el);
+        pos.y = pos.y + (0.5 * strokeWeight) - parent_pos.y;
+        pos.x = pos.x + (0.5 * strokeWeight) - parent_pos.x;
+
+        el.vml.style.top = pos.y +'px';
+        el.vml.style.left = pos.x +'px';
+    }
+
+    if (typeof(window.previous_onresize) == 'function') { window.previous_onresize(); }
+}
+</script>
+

Propchange: tomcat/trunk/webapps/ROOT/border-radius.htc
------------------------------------------------------------------------------
    svn:executable = *

Modified: tomcat/trunk/webapps/ROOT/index.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.jsp?rev=1029708&r1=1029707&r2=1029708&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/trunk/webapps/ROOT/index.jsp Mon Nov  1 15:30:48 2010
@@ -1,176 +1,234 @@
+<!DOCTYPE html>
 <!--
-  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
+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
+    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.
+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.
 -->
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<%
+java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy");
+request.setAttribute("year", sdf.format(new java.util.Date()));
+request.setAttribute("tomcat7Url", "http://tomcat.apache.org/");
+request.setAttribute("tomcat7DocUrl", "http://tomcat.apache.org/tomcat-7.0-doc/");
+%>
+<!-- License must be after DOCTYPE to ensure IE Standards Mode fires -->
+<html lang="en">
     <head>
-    <title>Apache Tomcat</title>
-    <style type="text/css">
-    /*<![CDATA[*/
-    body {
-        color: #000;
-        background-color: #fff;
-        color: #333;
-        font-family: Arial, "Times New Roman", Times, serif;
-        margin: 0;
-        padding: 10px;
-        min-width: 700px;
-    }
-    img {
-       border: none;
-    }
-    a:link, a:visited {
-        color: blue;
-    }
-    code {
-        display: block;
-        font-size: 120%;
-        color: #090;
-        margin: 0.5em 0.5em 0;
-    }
-    h1, h2 {
-        font-size: 110%;
-        margin-top: 0;
-    }
-    p#footer {
-        text-align: right;
-        font-size: 80%;
-    }
-    div#header {
-        min-width: 700px;
-    }
-    div#header h1 {
-        margin: 0;
-    }
-    div.fl {
-        float: left;
-    }
-    div.fr {
-        float: right;
-    }
-    #content div.fl {
-        width: 20%;
-        margin-right: 2%;
-    }
-    div#main {
-        float: left;
-        width: 77%;
-    }
-    .clear {
-        display: block;
-        clear: both;
-    }
-    .panel {
-        border: 2px solid #000;
-        background-color: #FFDC75;
-        padding: 0 0 20px;
-        margin: 0 0 20px;
-    }
-    .panel h3 {
-        border-bottom: 2px solid #000;
-        background-color: #D2A41C;
-        margin: 0 0 2px;
-        padding: 4px 4px 2px;
-        font: normal 110% Verdana, "Times New Roman", Times, serif;
-        font-style: italic;
-    }
-    .panel p {
-        margin: 0;
-        padding: 2px 4px 0;
-    }
-    /*]]>*/
-    </style>
-</head>
+        <title><%=request.getServletContext().getServerInfo() %></title>
+        <link href="favicon.ico" rel="icon" type="image/x-icon" />
+        <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
+        <link href="tomcat.css" rel="stylesheet" type="text/css" />
+        <!--[if lte IE 8]> <style type="text/css">
+         div.curved { behavior: url(border-radius.htc); }
+         br.separator { margin: 0 0 1px; padding: 0; line-height: 5px; }
+        </style> <![endif]-->
+    </head>
 
-<body>
+    <body>
+        <div id="wrapper">
+            <div id="navigation" class="curved container">
+                <span id="nav-home"><a href="${tomcat7Url}">Home</a></span>
+                <span id="nav-hosts"><a href="${tomcat7DocUrl}">Documentation</a></span>
+                <span id="nav-hosts"><a href="${tomcat7DocUrl}config/">Configuration</a></span>
+                <span id="nav-wiki"><a href="http://wiki.apache.org/tomcat/FrontPage">Wiki</a></span>
+                <span id="nav-lists"><a href="${tomcat7Url}lists.html">Mailing Lists</a></span>
+                <span id="nav-help"><a href="${tomcat7Url}findhelp.html">Find Help</a></span>
+                <br class="separator" />
+            </div>
+            <div id="asf-box">
+                <div id="version">
+                    <h1><%=request.getServletContext().getServerInfo() %></h1>
+                </div>
+                <div id="upper-asf">
+                    <a href="http://www.apache.org/"><img src="asf-logo.png" /></a>
+                </div>
+                <br class="separator" />
+            </div>
+            <div id="upper" class="curved container">
+                <div id="congrats" class="curved container">
+                    <h2>If you're seeing this, you've successfully installed Tomcat. Congratulations!</h2>
+                </div>
+                <div id="notice">
+                    <img src="tomcat.png" alt="[tomcat logo]" />
+                    <div id="tasks">
+                        <h3>Recommended Reading:</h3>
+                        <h4><a href="${tomcat7DocUrl}security-howto.html">Security Considerations HOW-TO</a></h4>
+                        <h4><a href="${tomcat7DocUrl}manager-howto.html">Manager Application HOW-TO</a></h4>
+                        <h4><a href="${tomcat7DocUrl}cluster-howto.html">Clustering/Session Replication HOW-TO</a></h4>
+                    </div>
+                </div>
+                <div id="actions">
+                    <div class="button">
+                        <a class="container shadow" href="/manager/status"><span>Server Status</span></a>
+                    </div>
+                    <div class="button">
+                        <a class="container shadow" href="/manager/html"><span>Manager App</span></a>
+                    </div>
+                    <div class="button">
+                        <a class="container shadow" href="/host-manager/html"><span>Host Manager</span></a>
+                    </div>
+                </div>
+                <!--
+                <br class="separator" />
+                -->
+                <br class="separator" />
+            </div>
+            <div id="middle" class="curved container">
+                <h3>Developer Quick Start</h3>
+                <div class="col25">
+                    <div class="container">
+                        <p><a href="${tomcat7DocUrl}setup.html">Tomcat Setup</a></p>
+                        <p><a href="${tomcat7DocUrl}appdev/">First Web Application</a></p>
+                    </div>
+                </div>
+                <div class="col25">
+                    <div class="container">
+                        <p><a href="${tomcat7DocUrl}realm-howto.html">Realms &amp; AAA</a></p>
+                        <p><a href="${tomcat7DocUrl}jndi-datasource-examples-howto.html">JDBC DataSources</a></p>
+                    </div>
+                </div>
+                <div class="col25">
+                    <div class="container">
+                        <p><a href="/examples/servlets/">Servlet Examples</a></p>
+                        <p><a href="/examples/jsp/">JSP Examples</a></p>
+                    </div>
+                </div>
+                <div class="col25">
+                    <div class="container">
+                        <p><a href="http://wiki.apache.org/tomcat/Specifications">Servlet Specifications</a></p>
+                        <p><a href="http://wiki.apache.org/tomcat/TomcatVersions">Tomcat Versions</a></p>
+                    </div>
+                </div>
+                <br class="separator" />
+            </div>
+            <div id="lower">
+                <div id="low-manage" class="">
+                    <div class="curved container">
+                        <h3>Managing Tomcat</h3>
+                        <p>For security, access to the <a href="/manager/html">manager webapp</a> is restricted.
+                        Users are defined in:</p>
+                        <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
+                        <p>In Tomcat 7.0 access to the manager application is split between different users.</p>
+                        <p><a href="${tomcat7DocUrl}manager-howto.html">Read more...</a></p>
+                        <br />
+                        <h4><a href="${tomcat7DocUrl}RELEASE-NOTES.txt">Release Notes</a></h4>
+                        <h4><a href="${tomcat7DocUrl}changelog.html">Changelog</a></h4>
+                        <h4><a href="${tomcat7Url}migration.html">Migration Guide</a></h4>
+                        <h4><a href="${tomcat7Url}security.html">Security Updates</a></h4>
 
-<!-- Header -->
-<div id="header">
-    <div class="fl">
-        <img src="tomcat.gif" alt="The Mighty Tomcat - MEOW!"/>
-    </div>
-    <div class="fl">
-        <h1>Apache Tomcat <%=request.getServletContext().getServerInfo() %></h1>
-    </div>
-    <div class="fr">
-        <img src="asf-logo-wide.gif" alt="The Apache Software Foundation"/>
-    </div>
-    <span class="clear"></span>
-</div>
-
-<div id="content">
-    <div class="fl">
-        <div class="panel">
-            <h3>Administration</h3>
-            <p><a href="/manager/status">Status</a></p>
-            <p><a href="/manager/html">Tomcat Manager</a></p>
-            <p><a href="/host-manager/html">Host Manager</a></p>
-        </div>
-        <div class="panel">
-            <h3>Documentation</h3>
-            <p><a href="RELEASE-NOTES.txt">Release Notes</a></p>
-            <p><a href="/docs/changelog.html">Change Log</a></p>
-            <p><a href="/docs">Tomcat Documentation</a></p>
-        </div>
-        <div class="panel">
-            <h3>Tomcat Online</h3>
-            <p><a href="http://tomcat.apache.org/">Home Page</a></p>
-            <p><a href="http://tomcat.apache.org/faq/">FAQ</a></p>
-            <p><a href="http://tomcat.apache.org/bugreport.html">Bug Database</a></p>
-            <p><a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=RESOLVED&amp;resolution=LATER&amp;resolution=REMIND&amp;resolution=---&amp;bugidtype=include&amp;product=Tomcat+7&amp;cmdtype=doit&amp;order=Importance">Open Bugs</a></p>
-            <p><a href="http://mail-archives.apache.org/mod_mbox/tomcat-users/">Users Mailing List</a></p>
-            <p><a href="http://mail-archives.apache.org/mod_mbox/tomcat-dev/">Developers Mailing List</a></p>
-            <p><a href="irc://irc.freenode.net/#tomcat">IRC</a></p>
+                    </div>
+                </div>
+                <div id="low-docs" class="">
+                    <div class="curved container">
+                        <h3>Documentation</h3>
+                        <h4><a href="${tomcat7Url}tomcat-7.0-doc">Tomcat 7.0 Documentation</a></h4>
+                        <h4><a href="${tomcat7DocUrl}config/">Tomcat 7.0 Configuration</a></h4>
+                        <h4><a href="http://wiki.apache.org/tomcat/FrontPage">Tomcat Wiki</a></h4>
+                        <p>Find additional important configuration information in:</p>
+                        <pre>$CATALINA_HOME/RUNNING.txt</pre>
+                        <p>Developers may be interested in:</p>
+                        <ul>
+                            <li><a href="https://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=RESOLVED&amp;resolution=LATER&amp;resolution=REMIND&amp;resolution=---&amp;bugidtype=include&amp;product=Tomcat+7&amp;cmdtype=doit&amp;order=Importance">Tomcat 7.0 Bug Database</a></li>
+                            <li><a href="${tomcat7DocUrl}api/index.html">Tomcat 7.0 JavaDocs</a></li>
+                            <li><a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x/">Tomcat 7.0 SVN Repository</a></li>
+                            <li><a href="/examples/">Tomcat 7.0 Examples</a></li>
+                        </ul>
+                    </div>
+                </div>
+                <div id="low-help" class="">
+                    <div class="curved container">
+                        <h3>Getting Help</h3>
+                        <h4><a href="${tomcat7Url}faq/">FAQ</a></h4>
+                        <h4><a href="${tomcat7Url}lists.html">Mailing Lists</a></h4>
+                        <p>The following mailing lists are available:</p>
+                        <ul>
+                            <li id="list-announce"><strong><a href="mailto:announce-subscribe@tomcat.apache.org">announce@tomcat.apache.org</a><br />
+                                Important announcements, releases, security vulnerability notifications. (Low volume).</strong>
+                            </li>
+                            <li><a href="mailto:users-subscribe@tomcat.apache.org">users@tomcat.apache.org</a><br />
+                                User support and discussion
+                            </li>
+                            <li><a href="mailto:taglibs-user-subscribe@tomcat.apache.org">taglibs-user@tomcat.apache.org</a><br />
+                                User support and discussion for <a href="${tomcat7Url}taglibs/">Apache Taglibs</a>
+                            </li>
+                            <li><a href="mailto:dev-subscribe@tomcat.apache.org">dev@tomcat.apache.org</a><br />
+                                Development mailing list, including commit messages
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <br class="separator" />
+            </div>
+            <div id="footer" class="curved container">
+                <div class="col20">
+                    <div class="container">
+                        <h4>Other Downloads</h4>
+                        <ul>
+                            <li><a href="${tomcat7Url}download-connectors.cgi">Tomcat Connectors</a></li>
+                            <li><a href="${tomcat7Url}download-native.cgi">Tomcat Native</a></li>
+                            <li><a href="${tomcat7Url}taglibs/">Taglibs</a></li>
+                            <li><a href="${tomcat7DocUrl}deployer-howto.html">Deployer</a></li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="col20">
+                    <div class="container">
+                        <h4>Other Documentation</h4>
+                        <ul>
+                            <li><a href="${tomcat7Url}connectors-doc/">Tomcat Connectors</a></li>
+                            <li><a href="${tomcat7Url}connectors-doc/">mod_jk Documentation</a></li>
+                            <li><a href="${tomcat7Url}native-doc/">Tomcat Native</a></li>
+                            <li><a href="${tomcat7DocUrl}deployer-howto.html">Deployer</a></li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="col20">
+                    <div class="container">
+                        <h4>Get Involved</h4>
+                        <ul>
+                            <li><a href="${tomcat7Url}getinvolved.html">Overview</a></li>
+                            <li><a href="${tomcat7Url}svn.html">SVN Repositories</a></li>
+                            <li><a href="${tomcat7Url}lists.html">Mailing Lists</a></li>
+                            <li><a href="http://wiki.apache.org/tomcat/FrontPage">Wiki</a></li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="col20">
+                    <div class="container">
+                        <h4>Miscellaneous</h4>
+                        <ul>
+                            <li><a href="${tomcat7Url}contact.html">Contact</a></li>
+                            <li><a href="${tomcat7Url}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>
+                </div>
+                <div class="col20">
+                    <div class="container">
+                        <h4>Apache Software Foundation</h4>
+                        <ul>
+                            <li><a href="${tomcat7Url}whoweare.html">Who We Are</a></li>
+                            <li><a href="${tomcat7Url}heritage.html">Heritage</a></li>
+                            <li><a href="http://www.apache.org">Apache Home</a></li>
+                            <li><a href="${tomcat7Url}resources.html">Resources</a></li>
+                        </ul>
+                    </div>
+                </div>
+                <br class="separator" />
+            </div>
+            <p class="copyright">Copyright &copy;1999-${year} Apache Software Foundation.  All Rights Reserved</p>
         </div>
-        <div class="panel">
-            <h3>Miscellaneous</h3>
-            <p><a href="http://localhost:8080/examples/servlets/">Servlets Examples</a></p>
-            <p><a href="http://localhost:8080/examples/jsp/">JSP Examples</a></p>
-            <p><a href="http://java.sun.com/products/jsp">Sun's Java Server Pages Site</a></p>
-            <p><a href="http://java.sun.com/products/servlet">Sun's Servlet Site</a></p>
-        </div>
-    </div>
-    <div id="main">
-        <h2>If you're seeing this page via a web browser, it means you've setup Tomcat successfully. Congratulations!</h2>
-        <p>Now join the Tomcat Announce mailing list, which is a low volume mailing list for releases, security vulnerabilities and other project announcements.</p>
-        <ul>
-            <li><strong><a href="mailto:announce-subscribe@tomcat.apache.org">announce-subscribe@tomcat.apache.org</a> for important announcements.</strong></li>
-        </ul>
-        <p>As you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at: 
-            <code>$CATALINA_HOME/webapps/ROOT/index.html</code></p>
-        <p>where &quot;$CATALINA_HOME&quot; is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the <a href="/docs">Tomcat Documentation</a> for more detailed setup and administration information than is found in the INSTALL file.</p>
-        <p><strong>NOTE: For security reasons, using the manager webapp is restricted to users with role "manager-gui".</strong>
-            Users are defined in: <code>$CATALINA_HOME/conf/tomcat-users.xml</code></p>
-        <p>Included with this release are a host of sample Servlets and JSPs (with associated source code), extensive documentation, and an introductory guide to developing web applications.</p>
-        <p>Tomcat mailing lists are available at the Tomcat project web site:</p>
-        <ul>
-            <li><strong><a href="mailto:users@tomcat.apache.org">users@tomcat.apache.org</a></strong> for general questions related to configuring and using Tomcat</li>
-            <li><strong><a href="mailto:dev@tomcat.apache.org">dev@tomcat.apache.org</a></strong> for developers working on Tomcat</li>
-        </ul>
-        <p>Thanks for using Tomcat!</p>
-        <p id="footer">
-            <img src="tomcat-power.gif" width="77" height="80" alt="Powered by Tomcat"/><br/>
-            &nbsp;
-            Copyright &copy; 1999-@YEAR@ Apache Software Foundation<br/>
-            All Rights Reserved
-        </p>
-    </div>
-    <span class="clear"></span>
-</div>
-</body>
+    </body>
+
 </html>

Added: tomcat/trunk/webapps/ROOT/tomcat.css
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/tomcat.css?rev=1029708&view=auto
==============================================================================
--- tomcat/trunk/webapps/ROOT/tomcat.css (added)
+++ tomcat/trunk/webapps/ROOT/tomcat.css Mon Nov  1 15:30:48 2010
@@ -0,0 +1,364 @@
+/*
+  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.
+*/
+body {
+    margin: 10px 20px;
+    text-align: center;
+    font-family: Arial, sans-serif;
+}
+
+h1, h2, h3, h4, h5, h6, p, ul, ol {
+    margin: 0 0 0.5em;
+}
+h1 {
+    font-size: 18pt;
+    margin: 0.5em 0 0;
+}
+h2 {
+    font-size: 16pt;
+}
+h3 {
+    font-size: 13pt;
+}
+h4 {
+    font-size: 12pt;
+}
+h5 {
+    font-size: 11pt;
+}
+p {
+    font-size: 11pt
+}
+
+ul {
+    margin: 0;
+    padding: 0 0 0 0.25em;
+    text-indent: 0;
+    list-style: none;
+}
+li {
+    margin: 0;
+    padding: 0 0 0.25em;
+    text-indent: 0;
+    font-size: 80%;
+}
+
+pre {
+    text-indent: 0.25em;
+    width: 90%;
+    font-size: 90%;
+}
+
+br.separator {
+    margin: 0;
+    padding: 0;
+    clear: both;
+}
+
+a img {
+    border: 0 none;
+}
+
+.container {
+    padding: 10px;
+    margin: 0 0 10px;
+}
+
+.col20 {
+    float: left;
+    width: 20%;
+}
+
+.col25 {
+    float: left;
+    width: 25%;
+}
+
+#wrapper {
+    display: block;
+    margin: 0 auto;
+    text-align: left;
+    min-width: 720px;
+    max-width: 1000px;
+}
+.curved {
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    -khtml-border-radius: 10px;    
+}
+
+#navigation {
+    background: #eee url(bg-nav.png) repeat-x top left;
+    margin: 0 0 10px;
+    padding: 0;
+}
+#navigation span {
+    float: left;
+}
+#navigation span a {
+    display: block;
+    padding: 10px;
+    font-weight: bold;
+    text-shadow: 1px 1px 1px #fff;
+}
+#navigation span a:link,
+#navigation span a:visited,
+#navigation span a:hover,
+#navigation span a:active {
+    color: #666;
+    text-decoration: none;
+}
+#navigation span#nav-help {
+    float: right;
+    margin-right: 0;
+}
+
+#asf-box {
+    padding: 0 20px;
+    margin: 0 0 20px;
+    text-align: left;
+}
+
+#version {
+    padding: 6px top left;
+    float: left;
+    width: 30%;
+}
+#version h2 {
+    padding: 0;
+    margin: 0;
+}
+#upper-asf {
+    float: right;
+    width: 60%;
+    text-align: right;
+}
+
+#upper {
+    background: #fff url(bg-upper.png) repeat-x top left;
+}
+
+#congrats {
+    text-align: center;
+    padding: 10px;
+    margin: 0 40px 20px;
+    background-color: #9c9;
+}
+#congrats h2 {
+    font-size: 14pt;
+    padding: 0;
+    margin: 0;
+    color: #fff;
+}
+
+#notice {
+    float: left;
+    width: 560px;
+    color: #696;
+}
+#notice a:link,
+#notice a:visited,
+#notice a:hover,
+#notice a:active {
+    color: #090;
+    text-decoration: none;
+}
+#notice img,
+#notice #tasks {
+    float: left;
+}
+#tasks a:link,
+#tasks a:visited,
+#tasks a:hover,
+#tasks a:active {
+    text-decoration: underline;
+}
+#notice img {
+    margin-right: 20px;
+}
+
+#actions {
+    float: right;
+    width: 140px;
+}
+
+#actions .button {
+    display: block;
+    padding: 0;
+    height: 36px;
+    background: url(bg-button.png) no-repeat top left;
+}
+
+#actions .button a {
+    display: block;
+    padding: 0;
+}
+
+#actions .button a:link,
+#actions .button a:visited,
+#actions .button a:hover,
+#actions .button a:active {
+    color: #696;
+    text-decoration: none;
+}
+
+#actions .button a span {
+    display: block;
+    padding: 6px 10px;
+    color: #666;
+    text-shadow: 1px 1px 1px #fff;
+    font-size: 10pt;
+    font-weight: bold;
+}
+
+#middle {
+    background: #eef url(bg-middle.png) repeat-x top left;
+    margin: 20px 0;
+    padding: 1px 10px;
+}
+#middle h3 {
+    margin: 0 0 10px;
+    color: #033;
+}
+#middle p {
+    font-size: 10pt;
+}
+#middle a:link,
+#middle a:visited,
+#middle a:hover,
+#middle a:active {
+    color: #366;
+    font-weight: bold;
+}
+#middle .col25 .container {
+    padding: 0 0 1px;
+}
+
+#developers {
+    float: left;
+    width: 40%;
+}
+#security {
+    float: right;
+    width: 50%;
+}
+
+#lower {
+    padding: 0;
+}
+
+#lower a:link,
+#lower a:visited,
+#lower a:hover,
+#lower a:active {
+    color: #600;
+}
+
+#lower strong a:link,
+#lower strong a:visited,
+#lower strong a:hover,
+#lower strong a:active {
+    color: #c00;
+}
+
+#lower h3 {
+    color: #963;
+    font-size: 14pt;
+}
+#lower h4 {
+    font-size: 12pt;
+}
+#lower ul {
+	padding: 0;
+	margin: 0.5em 0;
+}
+#lower p,
+#lower li {
+    font-size: 9pt;
+    color: #753;
+    margin: 0 0 0.25em;
+}
+#lower li {
+    padding: 5px;
+}
+#lower li strong {
+    color: #a53;
+}
+#lower li#list-announce {
+	border: 1px solid #f90;
+    background-color: #ffe8c8;
+}
+#lower p {
+    font-size: 10.5pt;
+}
+
+#low-manage,
+#low-docs,
+#low-help {
+    float: left;
+    width: 32%;
+}
+#low-docs {
+    margin: 0 0 0 2.2%;
+}
+#low-help {
+    float: right;
+}
+
+#low-manage div,
+#low-docs div,
+#low-help div {
+    min-height: 300px;
+    border: 3px solid #ffdc75;
+    background-color: #fff1c8;
+    padding: 10px;
+}
+
+#footer {
+    padding: 0;
+    margin: 20px 0;
+    color: #999;
+    background-color: #eee;
+}
+#footer h4 {
+    margin: 0 0 10px;
+    font-size: 10pt;
+}
+#footer p {
+    margin: 0 0 10px;
+    font-size: 10pt;
+}
+#footer ul {
+    margin: 6px 0 1px;
+    padding: 0;
+}
+#footer li {
+    margin: 0;
+    font-size: 9pt;
+}
+
+#footer a:link,
+#footer a:visited,
+#footer a:hover,
+#footer a:active {
+    color: #666;
+}
+
+.copyright {
+    font-size: 10pt;
+    color: #666;
+}
\ No newline at end of file

Propchange: tomcat/trunk/webapps/ROOT/tomcat.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/trunk/webapps/ROOT/tomcat.css
------------------------------------------------------------------------------
    svn:executable = *

Added: tomcat/trunk/webapps/ROOT/tomcat.png
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/tomcat.png?rev=1029708&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/webapps/ROOT/tomcat.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: tomcat/trunk/webapps/ROOT/tomcat.png
------------------------------------------------------------------------------
    svn:mime-type = image/png



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org