Skip to content

Commit 1e7d050

Browse files
jbamptonjbampton
committed
Standardize the HTML, CSS and JSP in the webapps folder.
Use lowercase HTML tags and attributes. Add quotes around attributes. Fix some HTML errors. Use HTML5 and CSS. Indent HTML and JSP. Remove whitespace. Remove blank lines. Standardize quotes.
1 parent eed9426 commit 1e7d050

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1529
-1153
lines changed

‎webapps/ROOT/index.jsp

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
2525
<!DOCTYPE html>
2626
<html lang="en">
2727
<head>
28-
<meta charset="UTF-8" />
28+
<meta charset="UTF-8">
2929
<title><%=request.getServletContext().getServerInfo() %></title>
30-
<link href="favicon.ico" rel="icon" type="image/x-icon" />
31-
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
32-
<link href="tomcat.css" rel="stylesheet" type="text/css" />
30+
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon">
31+
<link href="tomcat.css" rel="stylesheet" type="text/css">
3332
</head>
3433

3534
<body>
@@ -42,7 +41,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
4241
<span id="nav-wiki"><a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a></span>
4342
<span id="nav-lists"><a href="${tomcatUrl}lists.html">Mailing Lists</a></span>
4443
<span id="nav-help"><a href="${tomcatUrl}findhelp.html">Find Help</a></span>
45-
<br class="separator" />
44+
<br class="separator">
4645
</div>
4746
<div id="asf-box">
4847
<h1>${pageContext.servletContext.serverInfo}</h1>
@@ -52,7 +51,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
5251
<h2>If you're seeing this, you've successfully installed Tomcat. Congratulations!</h2>
5352
</div>
5453
<div id="notice">
55-
<img src="tomcat.png" alt="[tomcat logo]" />
54+
<img src="tomcat.png" alt="[tomcat logo]">
5655
<div id="tasks">
5756
<h3>Recommended Reading:</h3>
5857
<h4><a href="${tomcatDocUrl}security-howto.html">Security Considerations How-To</a></h4>
@@ -71,7 +70,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
7170
<a class="container shadow" href="/host-manager/html"><span>Host Manager</span></a>
7271
</div>
7372
</div>
74-
<br class="separator" />
73+
<br class="separator">
7574
</div>
7675
<div id="middle" class="curved container">
7776
<h3>Developer Quick Start</h3>
@@ -98,7 +97,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
9897
<p><a href="https://wiki.apache.org/tomcat/TomcatVersions">Tomcat Versions</a></p>
9998
</div>
10099
</div>
101-
<br class="separator" />
100+
<br class="separator">
102101
</div>
103102
<div id="lower">
104103
<div id="low-manage" class="">
@@ -109,7 +108,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
109108
<pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
110109
<p>In Tomcat @VERSION_MAJOR_MINOR@ access to the manager application is split between
111110
different users. &nbsp; <a href="${tomcatDocUrl}manager-howto.html">Read more...</a></p>
112-
<br />
111+
<br>
113112
<h4><a href="${tomcatDocUrl}RELEASE-NOTES.txt">Release Notes</a></h4>
114113
<h4><a href="${tomcatDocUrl}changelog.html">Changelog</a></h4>
115114
<h4><a href="${tomcatUrl}migration.html">Migration Guide</a></h4>
@@ -138,22 +137,22 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
138137
<h4><a href="${tomcatUrl}faq/">FAQ</a> and <a href="${tomcatUrl}lists.html">Mailing Lists</a></h4>
139138
<p>The following mailing lists are available:</p>
140139
<ul>
141-
<li id="list-announce"><strong><a href="${tomcatUrl}lists.html#tomcat-announce">tomcat-announce</a><br />
140+
<li id="list-announce"><strong><a href="${tomcatUrl}lists.html#tomcat-announce">tomcat-announce</a><br>
142141
Important announcements, releases, security vulnerability notifications. (Low volume).</strong>
143142
</li>
144-
<li><a href="${tomcatUrl}lists.html#tomcat-users">tomcat-users</a><br />
143+
<li><a href="${tomcatUrl}lists.html#tomcat-users">tomcat-users</a><br>
145144
User support and discussion
146145
</li>
147-
<li><a href="${tomcatUrl}lists.html#taglibs-user">taglibs-user</a><br />
146+
<li><a href="${tomcatUrl}lists.html#taglibs-user">taglibs-user</a><br>
148147
User support and discussion for <a href="${tomcatUrl}taglibs/">Apache Taglibs</a>
149148
</li>
150-
<li><a href="${tomcatUrl}lists.html#tomcat-dev">tomcat-dev</a><br />
149+
<li><a href="${tomcatUrl}lists.html#tomcat-dev">tomcat-dev</a><br>
151150
Development mailing list, including commit messages
152151
</li>
153152
</ul>
154153
</div>
155154
</div>
156-
<br class="separator" />
155+
<br class="separator">
157156
</div>
158157
<div id="footer" class="curved container">
159158
<div class="col20">
@@ -211,7 +210,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
211210
</ul>
212211
</div>
213212
</div>
214-
<br class="separator" />
213+
<br class="separator">
215214
</div>
216215
<p class="copyright">Copyright &copy;1999-${year} Apache Software Foundation. All Rights Reserved</p>
217216
</div>

‎webapps/docs/annotationapi/index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
limitations under the License.
1616
-->
1717
<!DOCTYPE html>
18-
<html>
18+
<html lang="en">
1919
<head>
20-
<meta charset="UTF-8" />
20+
<meta charset="UTF-8">
2121
<title>API docs</title>
2222
</head>
23-
2423
<body>
2524

2625
The Annotation API Javadoc is not installed by default. Download and install

‎webapps/docs/api/index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
limitations under the License.
1616
-->
1717
<!DOCTYPE html>
18-
<html>
19-
<head>
20-
<meta charset="UTF-8" />
18+
<html lang="en">
19+
<head>
20+
<meta charset="UTF-8">
2121
<title>API docs</title>
2222
</head>
23-
2423
<body>
2524

2625
Tomcat's internal javadoc is not installed by default. Download and install

‎webapps/docs/appdev/sample/index.html

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,41 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<html>
18+
<html lang="en">
1919
<head>
20-
<meta charset="UTF-8" />
21-
<meta name="author" content="Ben Souther" />
22-
<title>Sample Application</title>
20+
<meta charset="UTF-8">
21+
<meta name="author" content="Ben Souther">
22+
<title>Sample Application</title>
2323
</head>
2424
<body>
25-
<h2>Sample Application</h2>
26-
<p>
27-
The example app has been packaged as a war file and can be downloaded
28-
<a href="sample.war">here</a> (Note: make sure your browser doesn't
29-
change file extension or append a new one).
30-
</p>
31-
<p>
32-
The easiest way to run this application is simply to move the war file
33-
to your <b>CATALINA_BASE/webapps</b> directory. A default Tomcat install
34-
will automatically expand and deploy the application for you. You can
35-
view it with the following URL (assuming that you're running tomcat on
36-
port 8080 which is the default):
37-
<br />
38-
<a href="http://localhost:8080/sample">http://localhost:8080/sample</a>
39-
</p>
40-
<p>
41-
If you just want to browse the contents, you can unpack the war file
42-
with the <b>jar</b> command.
43-
</p>
44-
<pre>
45-
jar -xvf sample.war
46-
</pre>
47-
<p>
48-
Note: <b>CATALINA_BASE</b> is usually the directory in which you
49-
unpacked the Tomcat distribution. For more information on
50-
<b>CATALINA_HOME</b>, <b>CATALINA_BASE</b> and the difference between
51-
them see <b>RUNNING.txt</b> in the directory you unpacked your Tomcat
52-
distribution.
53-
</p>
25+
<h2>Sample Application</h2>
26+
<p>
27+
The example app has been packaged as a war file and can be downloaded
28+
<a href="sample.war">here</a> (Note: make sure your browser doesn't
29+
change file extension or append a new one).
30+
</p>
31+
<p>
32+
The easiest way to run this application is simply to move the war file
33+
to your <b>CATALINA_BASE/webapps</b> directory. A default Tomcat install
34+
will automatically expand and deploy the application for you. You can
35+
view it with the following URL (assuming that you're running tomcat on
36+
port 8080 which is the default):
37+
<br>
38+
<a href="http://localhost:8080/sample">http://localhost:8080/sample</a>
39+
</p>
40+
<p>
41+
If you just want to browse the contents, you can unpack the war file
42+
with the <b>jar</b> command.
43+
</p>
44+
<pre>
45+
jar -xvf sample.war
46+
</pre>
47+
<p>
48+
Note: <b>CATALINA_BASE</b> is usually the directory in which you
49+
unpacked the Tomcat distribution. For more information on
50+
<b>CATALINA_HOME</b>, <b>CATALINA_BASE</b> and the difference between
51+
them see <b>RUNNING.txt</b> in the directory you unpacked your Tomcat
52+
distribution.
53+
</p>
5454
</body>
5555
</html>

‎webapps/docs/appdev/sample/web/hello.jsp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@
1616
--%>
1717
<%@ page session="false" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
1818
<!DOCTYPE html>
19-
<html>
19+
<html lang="en">
2020
<head>
21-
<meta charset="UTF-8" />
22-
<title>Sample Application JSP Page</title>
21+
<meta charset="UTF-8">
22+
<title>Sample Application JSP Page</title>
2323
</head>
2424
<body>
2525

2626
<div style="float: left; padding: 10px;">
27-
<img src="images/tomcat.gif" alt="" />
27+
<img src="images/tomcat.gif" alt="tomcat">
2828
</div>
2929
<h1>Sample Application JSP Page</h1>
3030
This is the output of a JSP page that is part of the Hello, World
3131
application.
3232

33-
3433
<%= new String("Hello!") %>
3534

3635
</body>

‎webapps/docs/appdev/sample/web/index.html

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,23 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<html>
17+
<html lang="en">
1818
<head>
19-
<meta charset="UTF-8" />
20-
<title>Sample "Hello, World" Application</title>
19+
<meta charset="UTF-8">
20+
<title>Sample "Hello, World" Application</title>
2121
</head>
2222
<body>
23-
24-
<div style="float: left; padding: 10px;">
25-
<img src="images/tomcat.gif" alt="" />
26-
</div>
27-
<h1>Sample "Hello, World" Application</h1>
28-
<p>This is the home page for a sample application used to illustrate the
29-
source directory organization of a web application utilizing the principles
30-
outlined in the Application Developer's Guide.
31-
32-
<p>To prove that they work, you can execute either of the following links:</p>
33-
<ul>
34-
<li>To a <a href="hello.jsp">JSP page</a>.</li>
35-
<li>To a <a href="hello">servlet</a>.</li>
36-
</ul>
37-
23+
<div style="float: left; padding: 10px;">
24+
<img src="images/tomcat.gif" alt="tomcat">
25+
</div>
26+
<h1>Sample "Hello, World" Application</h1>
27+
<p>This is the home page for a sample application used to illustrate the
28+
source directory organization of a web application utilizing the principles
29+
outlined in the Application Developer's Guide.</p>
30+
<p>To prove that they work, you can execute either of the following links:</p>
31+
<ul>
32+
<li>To a <a href="hello.jsp">JSP page</a>.</li>
33+
<li>To a <a href="hello">servlet</a>.</li>
34+
</ul>
3835
</body>
3936
</html>

‎webapps/docs/elapi/index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
limitations under the License.
1616
-->
1717
<!DOCTYPE html>
18-
<html>
19-
<head>
20-
<meta charset="UTF-8" />
18+
<html lang="en">
19+
<head>
20+
<meta charset="UTF-8">
2121
<title>API docs</title>
2222
</head>
23-
2423
<body>
2524

2625
The EL Javadoc is not installed by default. Download and install

‎webapps/docs/jaspicapi/index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
limitations under the License.
1616
-->
1717
<!DOCTYPE html>
18-
<html>
18+
<html lang="en">
1919
<head>
20-
<meta charset="UTF-8" />
20+
<meta charset="UTF-8">
2121
<title>API docs</title>
2222
</head>
23-
2423
<body>
2524

2625
The JASPIC Javadoc is not installed by default. Download and install

‎webapps/docs/jspapi/index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
limitations under the License.
1616
-->
1717
<!DOCTYPE html>
18-
<html>
19-
<head>
20-
<meta charset="UTF-8" />
18+
<html lang="en">
19+
<head>
20+
<meta charset="UTF-8">
2121
<title>API docs</title>
2222
</head>
23-
2423
<body>
2524

2625
The JSP Javadoc is not installed by default. Download and install

‎webapps/docs/servletapi/index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
limitations under the License.
1616
-->
1717
<!DOCTYPE html>
18-
<html>
19-
<head>
20-
<meta charset="UTF-8" />
18+
<html lang="en">
19+
<head>
20+
<meta charset="UTF-8">
2121
<title>API docs</title>
2222
</head>
23-
2423
<body>
2524

2625
The Servlet Javadoc is not installed by default. Download and install

0 commit comments

Comments
 (0)