View | Details | Raw Unified | Return to bug 49122
Collapse All | Expand All

(-)webapps/ROOT/index.jsp (-15 / +7 lines)
Lines 20-25 Link Here
20
request.setAttribute("year", sdf.format(new java.util.Date()));
20
request.setAttribute("year", sdf.format(new java.util.Date()));
21
request.setAttribute("tomcat7Url", "http://tomcat.apache.org/");
21
request.setAttribute("tomcat7Url", "http://tomcat.apache.org/");
22
request.setAttribute("tomcat7DocUrl", "/docs/");
22
request.setAttribute("tomcat7DocUrl", "/docs/");
23
request.setAttribute("tomcat7DocExamples", "/examples/");
23
%>
24
%>
24
<!-- License must be after DOCTYPE to ensure IE Standards Mode fires -->
25
<!-- License must be after DOCTYPE to ensure IE Standards Mode fires -->
25
<html lang="en">
26
<html lang="en">
Lines 39-58 Link Here
39
            <div id="navigation" class="curved container">
40
            <div id="navigation" class="curved container">
40
                <span id="nav-home"><a href="${tomcat7Url}">Home</a></span>
41
                <span id="nav-home"><a href="${tomcat7Url}">Home</a></span>
41
                <span id="nav-hosts"><a href="${tomcat7DocUrl}">Documentation</a></span>
42
                <span id="nav-hosts"><a href="${tomcat7DocUrl}">Documentation</a></span>
42
                <span id="nav-hosts"><a href="${tomcat7DocUrl}config/">Configuration</a></span>
43
                <span id="nav-config"><a href="${tomcat7DocUrl}config/">Configuration</a></span>
44
                <span id="nav-examples"><a href="${tomcat7DocExamples}">Examples</a></span>
43
                <span id="nav-wiki"><a href="http://wiki.apache.org/tomcat/FrontPage">Wiki</a></span>
45
                <span id="nav-wiki"><a href="http://wiki.apache.org/tomcat/FrontPage">Wiki</a></span>
44
                <span id="nav-lists"><a href="${tomcat7Url}lists.html">Mailing Lists</a></span>
46
                <span id="nav-lists"><a href="${tomcat7Url}lists.html">Mailing Lists</a></span>
45
                <span id="nav-help"><a href="${tomcat7Url}findhelp.html">Find Help</a></span>
47
                <span id="nav-help"><a href="${tomcat7Url}findhelp.html">Find Help</a></span>
46
                <br class="separator" />
48
                <br class="separator" />
47
            </div>
49
            </div>
48
            <div id="asf-box">
50
            <div id="asf-box">
49
                <div id="version">
51
                <h1>${pageContext.servletContext.serverInfo}</h1>
50
                    <h1><%=request.getServletContext().getServerInfo() %></h1>
51
                </div>
52
                <div id="upper-asf">
53
                    <a href="http://www.apache.org/"><img src="asf-logo.png" /></a>
54
                </div>
55
                <br class="separator" />
56
            </div>
52
            </div>
57
            <div id="upper" class="curved container">
53
            <div id="upper" class="curved container">
58
                <div id="congrats" class="curved container">
54
                <div id="congrats" class="curved container">
Lines 118-130 Link Here
118
                        <p>For security, access to the <a href="/manager/html">manager webapp</a> is restricted.
114
                        <p>For security, access to the <a href="/manager/html">manager webapp</a> is restricted.
119
                        Users are defined in:</p>
115
                        Users are defined in:</p>
120
                        <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
116
                        <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
121
                        <p>In Tomcat 7.0 access to the manager application is split between different users.</p>
117
                        <p>In Tomcat 7.0 access to the manager application is split between 
122
                        <p><a href="${tomcat7DocUrl}manager-howto.html">Read more...</a></p>
118
                           different users. &nbsp; <a href="${tomcat7DocUrl}manager-howto.html">Read more...</a></p>
123
                        <br />
119
                        <br />
124
                        <h4><a href="${tomcat7DocUrl}RELEASE-NOTES.txt">Release Notes</a></h4>
120
                        <h4><a href="${tomcat7DocUrl}RELEASE-NOTES.txt">Release Notes</a></h4>
125
                        <h4><a href="${tomcat7DocUrl}changelog.html">Changelog</a></h4>
121
                        <h4><a href="${tomcat7DocUrl}changelog.html">Changelog</a></h4>
126
                        <h4><a href="${tomcat7Url}migration.html">Migration Guide</a></h4>
122
                        <h4><a href="${tomcat7Url}migration.html">Migration Guide</a></h4>
127
                        <h4><a href="${tomcat7Url}security.html">Security Updates</a></h4>
128
123
129
                    </div>
124
                    </div>
130
                </div>
125
                </div>
Lines 141-156 Link Here
141
                            <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>
136
                            <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>
142
                            <li><a href="${tomcat7DocUrl}api/index.html">Tomcat 7.0 JavaDocs</a></li>
137
                            <li><a href="${tomcat7DocUrl}api/index.html">Tomcat 7.0 JavaDocs</a></li>
143
                            <li><a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x/">Tomcat 7.0 SVN Repository</a></li>
138
                            <li><a href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x/">Tomcat 7.0 SVN Repository</a></li>
144
                            <li><a href="/examples/">Tomcat 7.0 Examples</a></li>
145
                        </ul>
139
                        </ul>
146
                    </div>
140
                    </div>
147
                </div>
141
                </div>
148
                <div id="low-help" class="">
142
                <div id="low-help" class="">
149
                    <div class="curved container">
143
                    <div class="curved container">
150
                        <h3>Getting Help</h3>
144
                        <h3>Getting Help</h3>
151
                        <h4><a href="${tomcat7Url}faq/">FAQ</a></h4>
145
                        <h4><a href="${tomcat7Url}faq/">FAQ</a> and <a href="${tomcat7Url}lists.html">Mailing Lists</a></h4>
152
                        <h4><a href="${tomcat7Url}lists.html">Mailing Lists</a></h4>
153
                        <p>The following mailing lists are available:</p>
154
                        <ul>
146
                        <ul>
155
                            <li id="list-announce"><strong><a href="mailto:announce-subscribe@tomcat.apache.org">announce@tomcat.apache.org</a><br />
147
                            <li id="list-announce"><strong><a href="mailto:announce-subscribe@tomcat.apache.org">announce@tomcat.apache.org</a><br />
156
                                Important announcements, releases, security vulnerability notifications. (Low volume).</strong>
148
                                Important announcements, releases, security vulnerability notifications. (Low volume).</strong>
(-)webapps/ROOT/tomcat.css (-18 / +6 lines)
Lines 128-152 Link Here
128
}
128
}
129
129
130
#asf-box {
130
#asf-box {
131
    padding: 0 20px;
131
	height: 40px;
132
    margin: 0 0 20px;
132
    background: #fff url(asf-logo.png) no-repeat top right;
133
    text-align: left;
134
}
135
136
#version {
137
    padding: 6px top left;
138
    float: left;
139
    width: 30%;
140
}
133
}
141
#version h2 {
134
#asf-box h1 {
142
    padding: 0;
135
    padding: 0;
143
    margin: 0;
136
    margin: 0;
144
}
137
}
145
#upper-asf {
146
    float: right;
147
    width: 60%;
148
    text-align: right;
149
}
150
138
151
#upper {
139
#upper {
152
    background: #fff url(bg-upper.png) repeat-x top left;
140
    background: #fff url(bg-upper.png) repeat-x top left;
Lines 290-299 Link Here
290
#lower li {
278
#lower li {
291
    font-size: 9pt;
279
    font-size: 9pt;
292
    color: #753;
280
    color: #753;
293
    margin: 0 0 0.25em;
281
    margin: 0 0 0.1em;
294
}
282
}
295
#lower li {
283
#lower li {
296
    padding: 5px;
284
    padding: 3px 5px;
297
}
285
}
298
#lower li strong {
286
#lower li strong {
299
    color: #a53;
287
    color: #a53;
Lines 322-328 Link Here
322
#low-manage div,
310
#low-manage div,
323
#low-docs div,
311
#low-docs div,
324
#low-help div {
312
#low-help div {
325
    min-height: 300px;
313
    min-height: 280px;
326
    border: 3px solid #ffdc75;
314
    border: 3px solid #ffdc75;
327
    background-color: #fff1c8;
315
    background-color: #fff1c8;
328
    padding: 10px;
316
    padding: 10px;

Return to bug 49122