Merge pull request #1013 from amagavi/feature/JavaMonitor-closerToHTM…

…LValidation Minor HTML/CSS updates to get closer to passing HTML validation.
wocommunity · Apr 19, 2023 · 1ade826 · 1ade826
2 parents eed3266 + c868870
commit 1ade826
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/Applications/JavaMonitor/Components/Main.wo/Main.html b/Applications/JavaMonitor/Components/Main.wo/Main.html
@@ -1,15 +1,19 @@
+<!DOCTYPE html>
+<html lang = "en">
 <webobject name=LoginSucceeded>
+<head>
+	<title>Monitor for WebObjects 5.4</title>
 	<webobject name=Refresh></webobject>
+</head>
 </webobject>
 
 <webobject name=LoginRequired>
-<html>
 <head>
 	<title>Monitor for WebObjects 5.4</title>
 	<webobject name = "ERXStyleSheet"/>
 </head>
 <body id ="LoginPage" onload="document.getElementById('password').focus()">
-	<h1 style="text-align: center;">JavaMonitor for WebObjects</h1>
+	<h1>JavaMonitor for WebObjects</h1>
 	<webobject name = "HasLoginError">
 		<p class="Box ErrorBox LoginErrorBox"><webobject name="ErrorMsg" /></p>
 	</webobject>
@@ -22,5 +26,5 @@ <h4>A password is required to access this application</h4>
 	</div>
 
 </body>
-</html>
 </webobject> <!-- LoginRequired -->
+</html>
diff --git a/Applications/JavaMonitor/Components/NavigationPage.wo/NavigationPage.html b/Applications/JavaMonitor/Components/NavigationPage.wo/NavigationPage.html
@@ -1,4 +1,5 @@
-<html>
+<!DOCTYPE html>
+<html lang = "en">
   <head>
     <title><webobject name="Title" /></title>
     <webobject name = "ERXStyleSheet"/>

diff --git a/Applications/JavaMonitor/Components/NavigationPage.wo/NavigationPage.wod b/Applications/JavaMonitor/Components/NavigationPage.wo/NavigationPage.wod
@@ -6,8 +6,7 @@ AppleImage: WOImage {
 	filename = "AppleLogo.gif";
 	height = 36;
 	width = 30;
-	align = "right";
-	border = 0;
+	alt = "Apple logo";
 }
 
 Content : WOComponentContent {

diff --git a/Applications/JavaMonitor/WebServerResources/javamonitor.css b/Applications/JavaMonitor/WebServerResources/javamonitor.css
@@ -66,6 +66,10 @@ td {
 	margin-top: 50px;
 }
 
+#LoginPage h1 { 
+	text-align: center; 
+}
+
 .Box {
 	-moz-border-radius: 8px;
 	-webkit-border-radius: 8px;
@@ -201,6 +205,12 @@ label {
 	float: right;
 }
 
+#NavigationLogo img 
+{
+	text-align: right;
+}
+
+
 .Notes {
 	margin-top: 10px;
 }