Attachment 26308 Details for Bug 49122 – Layout improvements and fixes.

[patch] Layout improvements and fixes.

ROOT-index.jsp-1.patch (text/plain), 5.70 KB, created by Pid on 2010-11-18 05:55:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pid

Created: 2010-11-18 05:55:40 UTC

Size: 5.70 KB

patch

obsolete

>Index: webapps/ROOT/index.jsp
>===================================================================
>--- webapps/ROOT/index.jsp	(revision 1036385)
>+++ webapps/ROOT/index.jsp	(working copy)
>@@ -20,6 +20,7 @@
> request.setAttribute("year", sdf.format(new java.util.Date()));
> request.setAttribute("tomcat7Url", "http://tomcat.apache.org/");
> request.setAttribute("tomcat7DocUrl", "/docs/");
>+request.setAttribute("tomcat7DocExamples", "/examples/");
> %>
> 
> <html lang="en">
>@@ -39,20 +40,15 @@
>             <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="${tomcat7DocExamples}">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">
>@@ -118,13 +114,12 @@
>                         <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>
> 
>                     </div>
>                 </div>
>@@ -141,16 +136,13 @@
>                             <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>
>+                        <h4><a href="${tomcat7Url}faq/">FAQ</a> and <a href="${tomcat7Url}lists.html">Mailing Lists</a></h4>
>                         <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>
>Index: webapps/ROOT/tomcat.css
>===================================================================
>--- webapps/ROOT/tomcat.css	(revision 1029836)
>+++ webapps/ROOT/tomcat.css	(working copy)
>@@ -128,25 +128,13 @@
> }
> 
> #asf-box {
>-    padding: 0 20px;
>-    margin: 0 0 20px;
>-    text-align: left;
>-}
>-
>-#version {
>-    padding: 6px top left;
>-    float: left;
>-    width: 30%;
>+	height: 40px;
>+    background: #fff url(asf-logo.png) no-repeat top right;
> }
>-#version h2 {
>+#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 +278,10 @@
> #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 +310,7 @@
> #low-manage div,
> #low-docs div,
> #low-help div {
>-    min-height: 300px;
>+    min-height: 280px;
>     border: 3px solid #ffdc75;
>     background-color: #fff1c8;
>     padding: 10px;

Actions: View | Diff

Attachments on bug 49122: 25295 | 25357 | 26308