[Piglit] [PATCH 1/5] summary/html: use html5 instead of xhtml

Tue Jan 22 10:41:07 UTC 2019

It's been a while since XHTML was a thing. Since the release of HTML5 it
has more or less taken over. So let's get with the program.

Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
---
 templates/empty_status.mako | 8 +++-----
 templates/feature.mako      | 9 +++------
 templates/index.mako        | 9 +++------
 templates/test_result.mako  | 8 +++-----
 templates/testrun_info.mako | 8 +++-----
 5 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/templates/empty_status.mako b/templates/empty_status.mako
index 353b08915..989a1402a 100644
--- a/templates/empty_status.mako
+++ b/templates/empty_status.mako
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8">
     <title>Result summary</title>
     <link rel="stylesheet" href="status.css" type="text/css" />
   </head>
diff --git a/templates/feature.mako b/templates/feature.mako
index 7d2c400d9..fa0b19d3e 100644
--- a/templates/feature.mako
+++ b/templates/feature.mako
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <%!
   import posixpath  # this must be posixpath, since we want /'s not \'s
   import re
@@ -27,11 +25,10 @@
       return href.replace('\\', '/')
 %>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8">
     <title>Result summary</title>
     <link rel="stylesheet" href="index.css" type="text/css" />
   </head>
diff --git a/templates/index.mako b/templates/index.mako
index ba483fe9d..f3a027f69 100644
--- a/templates/index.mako
+++ b/templates/index.mako
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <%!
   import os
   import posixpath  # this must be posixpath, since we want /'s not \'s
@@ -59,11 +57,10 @@
       return href.replace('\\', '/')
 %>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8">
     <title>Result summary</title>
     <link rel="stylesheet" href="index.css" type="text/css" />
   </head>
diff --git a/templates/test_result.mako b/templates/test_result.mako
index ad90b3ae5..9a6ffea7e 100644
--- a/templates/test_result.mako
+++ b/templates/test_result.mako
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//END"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8">
     <title>${testname} - Details</title>
     <link rel="stylesheet" href="${css}" type="text/css" />
   </head>
diff --git a/templates/testrun_info.mako b/templates/testrun_info.mako
index f8d86f94a..0af4f1c43 100644
--- a/templates/testrun_info.mako
+++ b/templates/testrun_info.mako
@@ -1,12 +1,10 @@
 <%!
   import six
 %>
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//END"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8">
     <title>${name} - System info</title>
     <link rel="stylesheet" href="../result.css" type="text/css" />
   </head>
-- 
2.20.1

