Merge pull request #2399 from MyIgel/remove-xhtml

treewide: Replace xhtml content type with html, remove xhtml workaround, replace self closing tags

Merge pull request #2399 from MyIgel/remove-xhtml
26b26395 · Matthias Schiffer · GitHub · eea49a28 · f033fcfc · 26b26395
Unverified Commit 26b26395 authored 3 years ago by Matthias Schiffer Committed by GitHub 3 years ago
--- 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.


--- a/docs/site-example/i18n/de.po
+++ b/docs/site-example/i18n/de.po
@@ -45,7 +45,7 @@ msgstr ""
 "selbstverständlich vertraulich behandelt und nicht weitergegeben."
 "</p>"
 "<div class=\"the-key\">"
-"# <%= pcdata(hostname) %><br />"
+"# <%= pcdata(hostname) %><br>"
 "<%= pubkey %>"
 "</div>"
 "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, sich mit "

--- a/docs/site-example/i18n/en.po
+++ b/docs/site-example/i18n/en.po
@@ -41,7 +41,7 @@ msgstr ""
 "\">keys@alpha-centauri.freifunk.net</a>. Of course, your e-mail address will "
 "be treated confidentially and will not be passed on.</p>"
 "<div class=\"the-key\">"
-" # <%= pcdata(hostname) %><br />"
+" # <%= pcdata(hostname) %><br>"
 "<%= pubkey %>"
 "</div>"
 "<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "

--- a/docs/site-example/i18n/fr.po
+++ b/docs/site-example/i18n/fr.po
@@ -36,7 +36,7 @@ msgstr ""
 "body=<%= urlencode('# ' .. hostname .. '\n' .. pubkey) %>\">keys@alpha-centauri.freifunk.net</a>."
 "</p>"
 "<div class=\"the-key\">"
-" # <%= pcdata(hostname) %><br />"
+" # <%= pcdata(hostname) %><br>"
 "<%= pubkey %>"
 "</div>"


--- 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
 <!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" />
-		<meta http-equiv="Expires" content="0" />
-		<meta http-equiv="refresh" content="0; URL=/cgi-bin/config" />
+		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+		<meta http-equiv="Pragma" content="no-cache">
+		<meta http-equiv="Expires" content="0">
+		<meta http-equiv="refresh" content="0; URL=/cgi-bin/config">
 	</head>
 	<body>
 	</body>

--- 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
@@ -82,7 +82,7 @@ You may obtain a copy of the License at
 				end
 			%>
 		</ul>
-		<br style="clear:both" />
+		<br style="clear:both">
 		<%
 			subtree(append(prefix, name), node.nodes[name], ...)
 		%>
@@ -94,13 +94,13 @@ 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" />
+		<meta charset="UTF-8">
+		<link rel="stylesheet" type="text/css" media="screen" href="/static/gluon.css">
 		<title><%| hostname .. ((rnode and rnode.title) and ' - ' .. title(rnode) or '') %></title>
 	</head>
 	<body>
@@ -134,7 +134,7 @@ You may obtain a copy of the License at
 		<div id="maincontent">
 			<noscript>
 				<div class="errorbox">
-					<strong><%:JavaScript required!%></strong><br />
+					<strong><%:JavaScript required!%></strong><br>
 					<%:You must enable JavaScript in your browser or the web interface will not work properly.%>
 				</div>
 			</noscript>

--- 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
 <%-
-	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" />
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, user-scalable=no">

 		<title><%:Error%></title>

-		<link rel="stylesheet" href="/static/status-page.css" type="text/css" />
+		<link rel="stylesheet" href="/static/status-page.css" type="text/css">
 	</head>
 	<body>
 		<header>

--- 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
@@ -111,24 +111,24 @@
 	end

 	local function statisticsTraffic(key)
-		return string.format('%s<br />%s<br />%s',
+		return string.format('%s<br>%s<br>%s',
 			statistics(key .. '/packets', 'packetsDiff'),
 			statistics(key .. '/bytes', 'bytesDiff'),
 			statistics(key .. '/bytes', 'bytes')
 		)
 	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" />
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, user-scalable=no">

 		<title><%| nodeinfo.hostname %> - <%:Status%></title>

-		<link rel="stylesheet" href="/static/status-page.css" type="text/css" />
+		<link rel="stylesheet" href="/static/status-page.css" type="text/css">
 	</head>
 	<body data-node-address="<%| http:getenv('SERVER_ADDR') %>"<%=
 		attr('data-translations', translations) ..
@@ -154,21 +154,21 @@
 					<%- end %>
 					<dt><%:Model%></dt><dd><%| nodeinfo.hardware.model %></dd>
 					<dt><%:Primary MAC address%></dt><dd><%| nodeinfo.network.mac %></dd>
-					<dt><%:IP address%></dt><dd><%= pcdata(table.concat(sorted(nodeinfo.network.addresses), '\n')):gsub('\n', '<br />') %></dd>
+					<dt><%:IP address%></dt><dd><%= pcdata(table.concat(sorted(nodeinfo.network.addresses), '\n')):gsub('\n', '<br>') %></dd>
 					<dt><%:Firmware%></dt><dd><%| nodeinfo.software.firmware.release %></dd>
 					<% if nodeinfo.network.mesh_vpn then -%>
 						<dt><%:Mesh VPN%></dt>
 						<dd>
 							<%| enabled(nodeinfo.network.mesh_vpn.enabled) %>
 							<% if nodeinfo.network.mesh_vpn.provider then -%>
-							<br /><%| nodeinfo.network.mesh_vpn.provider %>
+							<br><%| nodeinfo.network.mesh_vpn.provider %>
 							<%- end %>
 						</dd>
 						<% if nodeinfo.network.mesh_vpn.bandwidth_limit.enabled then -%>
 						<dt><%:Bandwidth limit%></dt>
 						<dd>
 							<% if nodeinfo.network.mesh_vpn.bandwidth_limit.ingress then -%>
-								▼ <%| formatBits(nodeinfo.network.mesh_vpn.bandwidth_limit.ingress*1000) %>/s <%:downstream%><br />
+								▼ <%| formatBits(nodeinfo.network.mesh_vpn.bandwidth_limit.ingress*1000) %>/s <%:downstream%><br>
 							<%- end %>
 							<% if nodeinfo.network.mesh_vpn.bandwidth_limit.egress then -%>
 								▲ <%| formatBits(nodeinfo.network.mesh_vpn.bandwidth_limit.egress*1000) %>/s <%:upstream%>
@@ -213,7 +213,7 @@
 					<tr><th><%:Load average%></th><td><%= statistics('loadavg', 'decimal') %></td></tr>
 					<tr><th><%:RAM%></th><td><%= statistics('memory', 'memory') %></td></tr>
 					<tr><th><%:Filesystem%></th><td><%= statistics('rootfs_usage', 'percent') %></td></tr>
-					<tr><th><%:Gateway%></th><td><%= statistics('gateway') %><br /><%= statistics('gateway_nexthop', 'neighbour') %></td></tr>
+					<tr><th><%:Gateway%></th><td><%= statistics('gateway') %><br><%= statistics('gateway_nexthop', 'neighbour') %></td></tr>
 				</table>

 				<h3><%:Clients%></h3>

--- 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
 <!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" />
-		<meta http-equiv="Expires" content="0" />
-		<meta http-equiv="refresh" content="0; URL=/cgi-bin/status" />
+		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+		<meta http-equiv="Pragma" content="no-cache">
+		<meta http-equiv="Expires" content="0">
+		<meta http-equiv="refresh" content="0; URL=/cgi-bin/status">
 	</head>
 	<body>
 	</body>

--- a/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade.html
+++ b/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade.html
@@ -26,7 +26,7 @@ $Id$
 				<%:Firmware image%>
 			</label>
 			<div class="gluon-value-field">
-				<input type="file" name="image" />
+				<input type="file" name="image">
 			</div>
 		</div>

@@ -36,14 +36,14 @@ $Id$
 			</label>

 			<div class="gluon-value-field">
-				<input id="keepcfg" type="checkbox" name="keepcfg" value="1" checked="checked" />
+				<input id="keepcfg" type="checkbox" name="keepcfg" value="1" checked="checked">
 				<label for="keepcfg"></label>
 			</div>
 		</div>
 	</div>

 	<div class="gluon-page-actions">
-		<input type="hidden" name="step" value="2" />
-		<input class="gluon-button gluon-button-submit" type="submit" value="<%:Upload image%>" />
+		<input type="hidden" name="step" value="2">
+		<input class="gluon-button gluon-button-submit" type="submit" value="<%:Upload image%>">
 	</div>
 </form>
--- a/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade_confirm.html
+++ b/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/upgrade_confirm.html
@@ -47,13 +47,13 @@ You may obtain a copy of the License at
 </p>
 <div class="gluon-page-actions">
  <form method="post" enctype="multipart/form-data" action="<%|url(request)%>" style="display:inline">
-    <input type="hidden" name="step" value="3" />
-    <input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-    <input class="gluon-button gluon-button-submit" type="submit" value="<%:Continue%>" />
+    <input type="hidden" name="step" value="3">
+    <input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>">
+    <input class="gluon-button gluon-button-submit" type="submit" value="<%:Continue%>">
  </form>
  <form method="post" enctype="multipart/form-data" action="<%|url(request)%>" style="display:inline">
-    <input type="hidden" name="step" value="1" />
-    <input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-    <input class="gluon-button gluon-button-reset" type="submit" value="<%:Cancel%>" />
+    <input type="hidden" name="step" value="1">
+    <input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>">
+    <input class="gluon-button gluon-button-reset" type="submit" value="<%:Cancel%>">
  </form>
 </div>
--- a/package/gluon-web-admin/i18n/de.po
+++ b/package/gluon-web-admin/i18n/de.po
@@ -21,11 +21,11 @@ msgstr "Erweiterte Einstellungen"

 msgid ""
 "Alternatively, you can set a password to access your node. Please choose a "
-"secure password you don't use anywhere else.<br /><br />If you set an empty "
+"secure password you don't use anywhere else.<br><br>If you set an empty "
 "password, login via password will be disabled. This is the default."
 msgstr ""
 "Alternativ kannst du auch ein Passwort setzen. Wähle bitte ein sicheres "
-"Passwort, das du nirgendwo anders verwendest.<br /><br />Beim Setzen eines "
+"Passwort, das du nirgendwo anders verwendest.<br><br>Beim Setzen eines "
 "leeren Passworts wird der Login per Passwort gesperrt (dies ist die Standard-"
 "Einstellung)."


--- a/package/gluon-web-admin/i18n/fr.po
+++ b/package/gluon-web-admin/i18n/fr.po
@@ -21,12 +21,12 @@ msgstr "Paramètres avancés"

 msgid ""
 "Alternatively, you can set a password to access your node. Please choose a "
-"secure password you don't use anywhere else.<br /><br />If you set an empty "
+"secure password you don't use anywhere else.<br><br>If you set an empty "
 "password, login via password will be disabled. This is the default."
 msgstr ""
 "Alternativement, vous pouvez mettre un mot de passe pour accéder à votre "
 "nœud, Penseiz à choisir un mot de passe sûr, que vous n'utilisez nulle part "
-"ailleurs. <br /><br /> Si vous n'entrez pas de mot de passe, la connexion "
+"ailleurs. <br><br> Si vous n'entrez pas de mot de passe, la connexion "
 "par mot de passe sera désactivée. La connexion par mot de passe est "
 "désactivée par défaut."


--- a/package/gluon-web-admin/i18n/gluon-web-admin.pot
+++ b/package/gluon-web-admin/i18n/gluon-web-admin.pot
@@ -12,7 +12,7 @@ msgstr ""

 msgid ""
 "Alternatively, you can set a password to access your node. Please choose a "
-"secure password you don't use anywhere else.<br /><br />If you set an empty "
+"secure password you don't use anywhere else.<br><br>If you set an empty "
 "password, login via password will be disabled. This is the default."
 msgstr ""


--- a/package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua
+++ b/package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua
@@ -51,7 +51,7 @@ end

 local f_password = Form(translate("Password"), translate(
 	"Alternatively, you can set a password to access your node. Please choose a "
-	.. "secure password you don't use anywhere else.<br /><br />If you set an empty "
+	.. "secure password you don't use anywhere else.<br><br>If you set an empty "
 	.. "password, login via password will be disabled. This is the default."
 	), 'password'
 )

--- a/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/config-mode/view/mesh-vpn-fastd.html
+++ b/package/gluon-web-mesh-vpn-fastd/files/lib/gluon/config-mode/view/mesh-vpn-fastd.html
 <div class="gluon-value">
  <div class="gluon-value-title">
-    <input data-update="change" type="radio" value="security"<%= attr("id", id..'.1') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "security") and "checked") %> />
+    <input data-update="change" type="radio" value="security"<%= attr("id", id..'.1') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "security") and "checked") %>>
    <label<%= attr("for", id..'.1')%>></label>
  </div>
  <div class="gluon-value-field-long">
    <label<%= attr("for", id..'.1') %> class="gluon-value-title"><%:Security mode%></label>
-    <br />
+    <br>
    <%| translate(
        'In security mode, the mesh VPN uses an encrypted tunnel to connect to the VPN servers. ' ..
        'The encryption ensures that it is impossible for your internet access provider to see what ' ..
        'data is exchanged over your node.'
    ) %>
-    <br />
+    <br>
  </div>
  <div class="gluon-value-field-long-after"></div>
 </div>

 <div class="gluon-value gluon-value-last">
  <div class="gluon-value-title">
-    <input data-update="change" type="radio" value="performance"<%= attr("id", id..'.2') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "performance") and "checked") %> />
+    <input data-update="change" type="radio" value="performance"<%= attr("id", id..'.2') .. attr("name", id) .. attr("checked", ((self:cfgvalue() or self.default) == "performance") and "checked") %>>
    <label<%= attr("for", id..'.2')%>></label>
  </div>
  <div class="gluon-value-field-long">
    <label<%= attr("for", id..'.2') %> class="gluon-value-title"><%:Performance mode%></label>
-    <br />
+    <br>
    <%| translate(
        'In performance mode, no encryption is used. This usually allows for higher throughput, but the data exchanged over your node is not ' ..
        'protected against eavesdropping.'
    ) %>
-    <br />
+    <br>
  </div>
  <div class="gluon-value-field-long-after"></div>
 </div>
--- a/package/gluon-web-model/files/lib/gluon/web/view/model/dynlist.html
+++ b/package/gluon-web-model/files/lib/gluon/web/view/model/dynlist.html
@@ -15,6 +15,6 @@
 		attr("name", id) ..
 		attr("size", self.size) ..
 		attr("placeholder", self.placeholder)
-	%> /><br />
+	%>><br>
 <% end %>
 </div>
--- a/package/gluon-web-model/files/lib/gluon/web/view/model/form.html
+++ b/package/gluon-web-model/files/lib/gluon/web/view/model/form.html
 <form method="post" enctype="multipart/form-data" action="<%|url(request)%>" data-update="reset">
-	<input type="hidden" name="<%=id%>" value="1" />
+	<input type="hidden" name="<%=id%>" value="1">

 	<div class="gluon-form" id="form-<%=id%>">
 		<% if self.title and #self.title > 0 then %><h2 name="content"><%|self.title%></h2><% end %>
@@ -16,12 +16,12 @@
 	<%- if self.submit ~= false then %>
 		<input class="gluon-button gluon-button-submit" type="submit" value="
 			<%- if not self.submit then -%><%-:Save-%><%-else-%><%|self.submit%><%end-%>
-		" />
+		">
 	<% end %>
 	<%- if self.reset ~= false then %>
 		<input class="gluon-button gluon-button-reset" type="reset" value="
 			<%- if not self.reset then -%><%-:Reset-%><%-else-%><%|self.reset%><%end-%>
-		" />
+		">
 	<% end %>
 	</div>
 </form>
--- a/package/gluon-web-model/files/lib/gluon/web/view/model/fvalue.html
+++ b/package/gluon-web-model/files/lib/gluon/web/view/model/fvalue.html
 <input data-update="click change" type="checkbox" value="1"<%=
 	attr("id", id) .. attr("name", id) ..
 	attr("checked", self:cfgvalue() and "checked")
-%> />
+%>>
 <label<%= attr("for", id)%>></label>
--- a/package/gluon-web-model/files/lib/gluon/web/view/model/lvalue.html
+++ b/package/gluon-web-model/files/lib/gluon/web/view/model/lvalue.html
 <%
-	local br = self.orientation == "horizontal" and '&#160;&#160;&#160;' or '<br />'
+	local br = self.orientation == "horizontal" and '&#160;&#160;&#160;' or '<br>'
 	local entries = self:entries()
 %>

@@ -35,7 +35,7 @@
 					attr("name", id) ..
 					attr("value", entry.key) ..
 					attr("checked", (self:cfgvalue() == entry.key) and "checked")
-				%> />
+				%>>
 				<label<%= attr("for", id.."."..entry.key)%>></label>
 				<%|entry.value%>
 			</label>