4 files changed, 25 insertions, 24 deletions
diff --git a/linhes/linhes-web/website/contents/count.py b/linhes/linhes-web/website/contents/count.py
index f0eee97..ef2a0b1 100644..100755
--- a/linhes/linhes-web/website/contents/count.py
+++ b/linhes/linhes-web/website/contents/count.py
@@ -45,6 +45,14 @@ def main(argv):
     hours_current = grandtotal_current / 60.0
     days_current = hours_current / 24.0
 
+    print('<!DOCTYPE html>')
+    print("<html>")
+    print("    <head>")
+    print('        <meta charset="UTF-8" />')
+    print('        <style type="text/css">@import "frame.css";</style>')
+    print("    </head>")
+    print("<body>")
+    print('        <div id="mainContainer">')
     print('<div id="header">')
     print("<h3>Welcome to</h3>")
     print("<h1>" , verLH , "</h1>")
@@ -97,6 +105,14 @@ def main(argv):
         #print "%16s %16s" %(row[0],row[1])
     print("</table>")
     print("</div>")
+    print("</div>")
+    print('        <div id="footer">')
+    print("            <p>Thank you for choosing LinHES!</p>")
+    print("        </div>")
+    print("    </body>")
+    print("</html>")
+
+
 
 if __name__ == "__main__":
     main(sys.argv[1:])
diff --git a/linhes/linhes-web/website/contents/header.html b/linhes/linhes-web/website/contents/header.html
index a7415f3..3ee6762 100755
--- a/linhes/linhes-web/website/contents/header.html
+++ b/linhes/linhes-web/website/contents/header.html
@@ -1,7 +1,9 @@
+<!DOCTYPE html>
 <html>
-<!--<style type="text/css">@import "mv.css";</style>-->
-<link rel="stylesheet" type="text/css" href="skeleton.css" />
+    <!--<style type="text/css">@import "mv.css";</style>-->
+    <link rel="stylesheet" type="text/css" href="skeleton.css" />
 <head>
+<meta charset="UTF-8" />
 <script type="text/javascript">
 
 function beStatus()
diff --git a/linhes/linhes-web/website/contents/home.shtml b/linhes/linhes-web/website/contents/home.shtml
index a2ef7dd..9494139 100644..100755
--- a/linhes/linhes-web/website/contents/home.shtml
+++ b/linhes/linhes-web/website/contents/home.shtml
@@ -1,19 +1 @@
-<html>
-    <head>
-        <style type="text/css">@import "frame.css";</style>
-    </head>
-    <body>
-        <div id="mainContainer">
-            <!--#exec cmd="/data/srv/httpd/htdocs/count.py" -->
-        </div>
-<!--
-        <div id="netContainer">
-            <img src="/xymon/gifs/network.png" class="center">
-        </div>
--->
-        <div id="footer">
-            <p>Thank you for choosing LinHES!</p>
-        </div>
-    </body>
-</html>
-
+<!--#exec cmd="/data/srv/httpd/htdocs/count.py" -->
diff --git a/linhes/linhes-web/website/contents/index.html b/linhes/linhes-web/website/contents/index.html
index 1168c4a..99f6b37 100644..100755
--- a/linhes/linhes-web/website/contents/index.html
+++ b/linhes/linhes-web/website/contents/index.html
@@ -1,6 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<!DOCTYPE html>
 <html>
 	<head>
+        <meta charset="UTF-8" />
         <link rel="shortcut icon" href="/favicon.ico">
         <title>LinHES: The Linux Home Entertainment System</title>
 	</head>
@@ -12,5 +13,5 @@
 				      There is no frame support on your browser.
 			      </body>
 		      </noframes>
-	      </frameset>
-      </html>
+    </frameset>
+</html>