From d728f17b8fc848b35e93eebb8e948798a1e4440a Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 20 Feb 2022 12:34:57 +0100
Subject: [PATCH] treewide: Replace xhtml content type with html, remove xhtml
workaround
---
docs/dev/web/controller.rst | 3 +--
.../files/lib/gluon/config-mode/www/index.html | 2 +-
.../files/lib/gluon/config-mode/view/theme/layout.html | 4 ++--
.../files/lib/gluon/status-page/view/layout.html | 4 ++--
.../files/lib/gluon/status-page/view/status-page.html | 4 ++--
.../files/lib/gluon/status-page/www/index.html | 2 +-
.../files/lib/gluon/web/view/model/osm/map.html | 2 --
package/gluon-web/luasrc/usr/lib/lua/gluon/web/http.lua | 7 -------
8 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/docs/dev/web/controller.rst b/docs/dev/web/controller.rst
index 3f63ef01a..2f0ab733a 100644
--- a/docs/dev/web/controller.rst
+++ b/docs/dev/web/controller.rst
@@ -74,8 +74,7 @@ Useful functions:
- *header* (*key*, *value*): Adds an HTTP header to the reply to be sent to
the client. Has no effect when non-header data has already been written.
- *prepare_content* (*mime*): Sets the *Content-Type* header to the given MIME
- type, potentially setting additional headers or modifying the MIME type to
- accommodate browser quirks
+ type
- *write* (*data*, ...): Sends the given data to the client. If headers have not
been sent, it will be done before the data is written.
diff --git a/package/gluon-config-mode-core/files/lib/gluon/config-mode/www/index.html b/package/gluon-config-mode-core/files/lib/gluon/config-mode/www/index.html
index 292129f6e..8b29b2b4b 100644
--- a/package/gluon-config-mode-core/files/lib/gluon/config-mode/www/index.html
+++ b/package/gluon-config-mode-core/files/lib/gluon/config-mode/www/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="">
<head>
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
diff --git a/package/gluon-config-mode-theme/files/lib/gluon/config-mode/view/theme/layout.html b/package/gluon-config-mode-theme/files/lib/gluon/config-mode/view/theme/layout.html
index c80cd4b38..47d66cb6f 100644
--- a/package/gluon-config-mode-theme/files/lib/gluon/config-mode/view/theme/layout.html
+++ b/package/gluon-config-mode-theme/files/lib/gluon/config-mode/view/theme/layout.html
@@ -94,10 +94,10 @@ You may obtain a copy of the License at
subtree({path}, root.nodes[category], ...)
end
- http:prepare_content("application/xhtml+xml")
+ http:prepare_content("text/html")
-%>
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+<html lang="">
<head>
<meta charset="UTF-8" />
<link rel="stylesheet" type="text/css" media="screen" href="/static/gluon.css" />
diff --git a/package/gluon-status-page/files/lib/gluon/status-page/view/layout.html b/package/gluon-status-page/files/lib/gluon/status-page/view/layout.html
index 11969ddc2..7b33bd93b 100644
--- a/package/gluon-status-page/files/lib/gluon/status-page/view/layout.html
+++ b/package/gluon-status-page/files/lib/gluon/status-page/view/layout.html
@@ -1,8 +1,8 @@
<%-
- http:prepare_content("application/xhtml+xml")
+ http:prepare_content("text/html")
-%>
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+<html lang="">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
diff --git a/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html b/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
index 6957599f3..16fbaa5dc 100644
--- a/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
+++ b/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html
@@ -118,10 +118,10 @@
)
end
- http:prepare_content("application/xhtml+xml")
+ http:prepare_content("text/html")
-%>
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+<html lang="">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, user-scalable=no" />
diff --git a/package/gluon-status-page/files/lib/gluon/status-page/www/index.html b/package/gluon-status-page/files/lib/gluon/status-page/www/index.html
index cc209cece..b360a712c 100644
--- a/package/gluon-status-page/files/lib/gluon/status-page/www/index.html
+++ b/package/gluon-status-page/files/lib/gluon/status-page/www/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="">
<head>
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
diff --git a/package/gluon-web-osm/files/lib/gluon/web/view/model/osm/map.html b/package/gluon-web-osm/files/lib/gluon/web/view/model/osm/map.html
index a2822cd44..2caa3f379 100644
--- a/package/gluon-web-osm/files/lib/gluon/web/view/model/osm/map.html
+++ b/package/gluon-web-osm/files/lib/gluon/web/view/model/osm/map.html
@@ -1,7 +1,6 @@
<div id="<%=id%>" class="gluon-osm-map" style="display: none"></div>
<script type="text/javascript" src="/static/gluon-web-osm.js"></script>
<script type="text/javascript">
- //<![CDATA[
(function() {
var elMap = document.getElementById(<%=json(id)%>);
var wrapper = elMap.parentNode;
@@ -42,5 +41,4 @@
});
});
})();
- //]]>
</script>
diff --git a/package/gluon-web/luasrc/usr/lib/lua/gluon/web/http.lua b/package/gluon-web/luasrc/usr/lib/lua/gluon/web/http.lua
index c77d4ace0..eae38bff3 100644
--- a/package/gluon-web/luasrc/usr/lib/lua/gluon/web/http.lua
+++ b/package/gluon-web/luasrc/usr/lib/lua/gluon/web/http.lua
@@ -78,13 +78,6 @@ end
function Http:prepare_content(mime)
if self.headers["content-type"] then return end
- if mime == "application/xhtml+xml" then
- local accept = self:getenv("HTTP_ACCEPT")
- if not accept or not accept:find("application/xhtml+xml", nil, true) then
- mime = "text/html; charset=UTF-8"
- end
- self:header("Vary", "Accept")
- end
self:header("Content-Type", mime)
end
--
GitLab