projects / tomcat7.0 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 43e5f69)
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49122
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 27 Jul 2011 12:23:28 +0000 (12:23 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Wed, 27 Jul 2011 12:23:28 +0000 (12:23 +0000)
Layout improvements and tweaks

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1151444 13f79535-47bb-0310-9956-ffa450edef68

webapps/ROOT/index.jsp patch | blob | history
webapps/ROOT/tomcat.css patch | blob | history
webapps/docs/changelog.xml patch | blob | history

diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 6fe86d3..3d803df 100644 (file)
--- 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/");
 %>
 <html lang="en">
     <head>
@@ -35,20 +36,15 @@ request.setAttribute("tomcat7DocUrl", "/docs/");
             <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-config"><a href="${tomcat7DocUrl}config/">Configuration</a></span>
+                <span id="nav-examples"><a href="${tomcat7ExamplesUrl}">Examples</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" />
+                <h1>${pageContext.servletContext.serverInfo}</h1>
             </div>
             <div id="upper" class="curved container">
                 <div id="congrats" class="curved container">
@@ -95,8 +91,8 @@ request.setAttribute("tomcat7DocUrl", "/docs/");
                 </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>
+                        <p><a href="${tomcat7ExamplesUrl}servlets/">Servlet Examples</a></p>
+                        <p><a href="${tomcat7ExamplesUrl}jsp/">JSP Examples</a></p>
                     </div>
                 </div>
                 <div class="col25">
@@ -114,14 +110,13 @@ request.setAttribute("tomcat7DocUrl", "/docs/");
                         <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>
+                        <p>In Tomcat 7.0 access to the manager application is split between 
+                           different users. &nbsp; <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>
-
+                        <h4><a href="${tomcat7Url}security.html">Security Notices</a></h4>
                     </div>
                 </div>
                 <div id="low-docs" class="">
@@ -137,15 +132,13 @@ request.setAttribute("tomcat7DocUrl", "/docs/");
                             <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>
+                        <h4><a href="${tomcat7Url}faq/">FAQ</a> and <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 />
diff --git a/webapps/ROOT/tomcat.css b/webapps/ROOT/tomcat.css
index e6321ef..308f6c5 100644 (file)
--- 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 6493836..0c45b5c 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -142,6 +142,10 @@
         configuration page in the documentation web application. (markt)
       </fix>
       <fix>
+        <bug>49122</bug>: Improvements and fixes for index page for ROOT web
+        application. Based on a patch provided by pidster. (markt)
+      </fix>
+      <fix>
         <bug>51516</bug>: Correct documentation web application to show correct
         system property name for changing the name of the SSO session cookie.
         (markt)
Unnamed repository; edit this file to name it for gitweb.