From: markt Date: Wed, 27 Jul 2011 12:23:28 +0000 (+0000) Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49122 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=098c60fa06cbbef2db9ef9ec4a6430b627a8636b;p=tomcat7.0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49122 Layout improvements and tweaks git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1151444 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp index 6fe86d3ba..3d803df1b 100644 --- a/webapps/ROOT/index.jsp +++ b/webapps/ROOT/index.jsp @@ -21,6 +21,7 @@ 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", "/docs/"); +request.setAttribute("tomcat7ExamplesUrl", "/examples/"); %> @@ -35,20 +36,15 @@ request.setAttribute("tomcat7DocUrl", "/docs/");
-
-

<%=request.getServletContext().getServerInfo() %>

-
-
- -
-
+

${pageContext.servletContext.serverInfo}

@@ -95,8 +91,8 @@ request.setAttribute("tomcat7DocUrl", "/docs/");
-

Servlet Examples

-

JSP Examples

+

Servlet Examples

+

JSP Examples

@@ -114,14 +110,13 @@ request.setAttribute("tomcat7DocUrl", "/docs/");

For security, access to the manager webapp is restricted. Users are defined in:

$CATALINA_HOME/conf/tomcat-users.xml
-

In Tomcat 7.0 access to the manager application is split between different users.

-

Read more...

+

In Tomcat 7.0 access to the manager application is split between + different users.   Read more...


Release Notes

Changelog

Migration Guide

-

Security Updates

- +

Security Notices

@@ -137,15 +132,13 @@ request.setAttribute("tomcat7DocUrl", "/docs/");
  • Tomcat 7.0 Bug Database
  • Tomcat 7.0 JavaDocs
  • Tomcat 7.0 SVN Repository
    • -
  • Tomcat 7.0 Examples

    • Getting Help

    -

    FAQ

    -

    Mailing Lists

    +

    FAQ and Mailing Lists

    The following mailing lists are available:

    • announce@tomcat.apache.org
      diff --git a/webapps/ROOT/tomcat.css b/webapps/ROOT/tomcat.css index e6321ef63..308f6c594 100644 --- a/webapps/ROOT/tomcat.css +++ b/webapps/ROOT/tomcat.css @@ -128,25 +128,12 @@ a img { } #asf-box { - padding: 0 20px; - margin: 0 0 20px; - text-align: left; -} - -#version { - padding: 6px top left; - float: left; - width: 30%; -} -#version h2 { + height: 40px; + background: #fff url(asf-logo.png) no-repeat top right;} +#asf-box h1 { padding: 0; margin: 0; } -#upper-asf { - float: right; - width: 60%; - text-align: right; -} #upper { background: #fff url(bg-upper.png) repeat-x top left; @@ -290,10 +277,10 @@ a img { #lower li { font-size: 9pt; color: #753; - margin: 0 0 0.25em; + margin: 0 0 0.1em; } #lower li { - padding: 5px; + padding: 3px 5px; } #lower li strong { color: #a53; @@ -322,7 +309,7 @@ a img { #low-manage div, #low-docs div, #low-help div { - min-height: 300px; + min-height: 280px; border: 3px solid #ffdc75; background-color: #fff1c8; padding: 10px; diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 649383699..0c45b5c28 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -142,6 +142,10 @@ configuration page in the documentation web application. (markt) + 49122: Improvements and fixes for index page for ROOT web + application. Based on a patch provided by pidster. (markt) + + 51516: Correct documentation web application to show correct system property name for changing the name of the SSO session cookie. (markt)