Merge pull request #2399 from MyIgel/remove-xhtml

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

package/gluon-web-model/files/lib/gluon/web/view/model/value.html

@@ -8,4 +8,4 @@
 	attr("maxlength", self.maxlength) ..
 	attr("data-type", self.datatype) ..
 	attr("data-optional", self.datatype and self.optional)
-%> />
+%>>

package/gluon-web-model/files/lib/gluon/web/view/model/valuewrapper.html

@@ -7,7 +7,7 @@
 	<%- end -%>
 	<% if self.subtemplate then include(self.subtemplate) end %>
 	<% if self.description and #self.description > 0 then -%>
-		<br />
+		<br>
 		<div class="gluon-value-description">
 			<%=self.description%>
 		</div>

package/gluon-web-osm/files/lib/gluon/web/view/model/osm/map.html

 <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>

package/gluon-web-wifi-config/i18n/de.po

@@ -56,15 +56,15 @@ msgstr "WLAN"
 msgid ""
 "You can enable or disable your node's client and mesh network SSIDs here. "
 "Please don't disable the mesh network without a good reason, so other nodes "
-"can mesh with yours.<br /><br />It is also possible to configure the WLAN "
+"can mesh with yours.<br><br>It is also possible to configure the WLAN "
 "adapters transmission power here. Please note that the transmission power "
 "values include the antenna gain where available, but there are many devices "
 "for which the gain is unavailable or inaccurate."
 msgstr ""
 "In diesem Abschnitt hast du die Möglichkeit, die SSIDs des Client- und des "
 "Mesh-Netzes zu aktivieren bzw. deaktivieren. Bitte lass die SSID des Mesh-"
-"Netzes aktiviert, damit sich andere Knoten mit deinem verbinden können.<br /"
-"><br />Außerdem kann hier die Sendeleistung des WLAN-Adapters konfiguriert "
+"Netzes aktiviert, damit sich andere Knoten mit deinem verbinden können.<br"
+"><br>Außerdem kann hier die Sendeleistung des WLAN-Adapters konfiguriert "
 "werden. Wenn möglich, ist in den Werten der Sendeleistung der Antennengewinn "
 "enthalten; diese Werte sind allerdings für viele Geräte nicht verfügbar oder "
 "fehlerhaft."

package/gluon-web-wifi-config/i18n/fr.po

@@ -51,14 +51,14 @@ msgstr "Wi-Fi"
 msgid ""
 "You can enable or disable your node's client and mesh network SSIDs here. "
 "Please don't disable the mesh network without a good reason, so other nodes "
-"can mesh with yours.<br /><br />It is also possible to configure the WLAN "
+"can mesh with yours.<br><br>It is also possible to configure the WLAN "
 "adapters transmission power here. Please note that the transmission power "
 "values include the antenna gain where available, but there are many devices "
 "for which the gain is unavailable or inaccurate."
 msgstr ""
 "Ici vous pouvez activer ou désactiver la SSID du client ou MESH. Pensez a "
 "laisser la SSID du MESH activée pour que les autres nœuds puissent se "
-"connecter. <br /><br />Ici vous pouvez aussi configurer la puissance "
+"connecter. <br><br>Ici vous pouvez aussi configurer la puissance "
 "d'émmission se votre Wi-Fi. Prenez note que les valeurs fournies pour la "
 "puissance de transmission prennent en compte les gains fournis par "
 "l'antenne, et que ces valeurs ne sont pas toujours disponibles ou exactes."

package/gluon-web-wifi-config/i18n/gluon-web-wifi-config.pot

@@ -42,7 +42,7 @@ msgstr ""
 msgid ""
 "You can enable or disable your node's client and mesh network SSIDs here. "
 "Please don't disable the mesh network without a good reason, so other nodes "
-"can mesh with yours.<br /><br />It is also possible to configure the WLAN "
+"can mesh with yours.<br><br>It is also possible to configure the WLAN "
 "adapters transmission power here. Please note that the transmission power "
 "values include the antenna gain where available, but there are many devices "
 "for which the gain is unavailable or inaccurate."

package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua

@@ -29,7 +29,7 @@ local f = Form(translate("WLAN"))
 f:section(Section, nil, translate(
 	"You can enable or disable your node's client and mesh network "
 	.. "SSIDs here. Please don't disable the mesh network without "
-	.. "a good reason, so other nodes can mesh with yours.<br /><br />"
+	.. "a good reason, so other nodes can mesh with yours.<br><br>"
 	.. "It is also possible to configure the WLAN adapters transmission power "
 	.. "here. Please note that the transmission power values include the antenna gain "
 	.. "where available, but there are many devices for which the gain is unavailable or inaccurate."

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