diff --git a/docs/dev/web/controller.rst b/docs/dev/web/controller.rst index 3f63ef01..2f0ab733 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/docs/site-example/i18n/de.po b/docs/site-example/i18n/de.po index 51b8e71c..f2db6eef 100644 --- 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." "

" "
" -"# <%= pcdata(hostname) %>
" +"# <%= pcdata(hostname) %>
" "<%= pubkey %>" "
" "

Dein Knoten startet gerade neu und wird anschließend versuchen, sich mit " diff --git a/docs/site-example/i18n/en.po b/docs/site-example/i18n/en.po index eef8bd08..4f393860 100644 --- a/docs/site-example/i18n/en.po +++ b/docs/site-example/i18n/en.po @@ -41,7 +41,7 @@ msgstr "" "\">keys@alpha-centauri.freifunk.net. Of course, your e-mail address will " "be treated confidentially and will not be passed on.

" "
" -" # <%= pcdata(hostname) %>
" +" # <%= pcdata(hostname) %>
" "<%= pubkey %>" "
" "

Your node <%= pcdata(hostname) %> is currently rebooting and will " diff --git a/docs/site-example/i18n/fr.po b/docs/site-example/i18n/fr.po index ba0f43a4..e9c259f8 100644 --- 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." "

" "
" -" # <%= pcdata(hostname) %>
" +" # <%= pcdata(hostname) %>
" "<%= pubkey %>" "
" 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 292129f6..e42b9eed 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,10 +1,10 @@ - + - - - - + + + + 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 c80cd4b3..865ec2aa 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 @@ -82,7 +82,7 @@ You may obtain a copy of the License at end %> -
+
<% 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") -%> - + - - + + <%| hostname .. ((rnode and rnode.title) and ' - ' .. title(rnode) or '') %> @@ -134,7 +134,7 @@ You may obtain a copy of the License at
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 11969ddc..6b960207 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,15 +1,15 @@ <%- - http:prepare_content("application/xhtml+xml") + http:prepare_content("text/html") -%> - + - - + + <%:Error%> - +
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 6957599f..703cf436 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 @@ -111,24 +111,24 @@ end local function statisticsTraffic(key) - return string.format('%s
%s
%s', + return string.format('%s
%s
%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") -%> - + - - + + <%| nodeinfo.hostname %> - <%:Status%> - +
<%:Model%>
<%| nodeinfo.hardware.model %>
<%:Primary MAC address%>
<%| nodeinfo.network.mac %>
-
<%:IP address%>
<%= pcdata(table.concat(sorted(nodeinfo.network.addresses), '\n')):gsub('\n', '
') %>
+
<%:IP address%>
<%= pcdata(table.concat(sorted(nodeinfo.network.addresses), '\n')):gsub('\n', '
') %>
<%:Firmware%>
<%| nodeinfo.software.firmware.release %>
<% if nodeinfo.network.mesh_vpn then -%>
<%:Mesh VPN%>
<%| enabled(nodeinfo.network.mesh_vpn.enabled) %> <% if nodeinfo.network.mesh_vpn.provider then -%> -
<%| nodeinfo.network.mesh_vpn.provider %> +
<%| nodeinfo.network.mesh_vpn.provider %> <%- end %>
<% if nodeinfo.network.mesh_vpn.bandwidth_limit.enabled then -%>
<%:Bandwidth limit%>
<% if nodeinfo.network.mesh_vpn.bandwidth_limit.ingress then -%> - ▼ <%| formatBits(nodeinfo.network.mesh_vpn.bandwidth_limit.ingress*1000) %>/s <%:downstream%>
+ ▼ <%| formatBits(nodeinfo.network.mesh_vpn.bandwidth_limit.ingress*1000) %>/s <%:downstream%>
<%- 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 @@ <%:Load average%><%= statistics('loadavg', 'decimal') %> <%:RAM%><%= statistics('memory', 'memory') %> <%:Filesystem%><%= statistics('rootfs_usage', 'percent') %> - <%:Gateway%><%= statistics('gateway') %>
<%= statistics('gateway_nexthop', 'neighbour') %> + <%:Gateway%><%= statistics('gateway') %>
<%= statistics('gateway_nexthop', 'neighbour') %>

<%:Clients%>

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 cc209cec..03e08420 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,10 +1,10 @@ - + - - - - + + + + diff --git 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 index 7778be4a..6791c2c0 100644 --- 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%>
- +
@@ -36,14 +36,14 @@ $Id$
- +
- - + +
diff --git 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 index 9733132f..b45012ef 100644 --- 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

- - " /> - + + "> +
- - " /> - + + "> +
diff --git a/package/gluon-web-admin/i18n/de.po b/package/gluon-web-admin/i18n/de.po index c6511012..33b459a0 100644 --- 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.

If you set an empty " +"secure password you don't use anywhere else.

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.

Beim Setzen eines " +"Passwort, das du nirgendwo anders verwendest.

Beim Setzen eines " "leeren Passworts wird der Login per Passwort gesperrt (dies ist die Standard-" "Einstellung)." diff --git a/package/gluon-web-admin/i18n/fr.po b/package/gluon-web-admin/i18n/fr.po index 4e16238d..dcae406e 100644 --- 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.

If you set an empty " +"secure password you don't use anywhere else.

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.

Si vous n'entrez pas de mot de passe, la connexion " +"ailleurs.

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." diff --git a/package/gluon-web-admin/i18n/gluon-web-admin.pot b/package/gluon-web-admin/i18n/gluon-web-admin.pot index 084182e5..48c5f2bb 100644 --- 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.

If you set an empty " +"secure password you don't use anywhere else.

If you set an empty " "password, login via password will be disabled. This is the default." msgstr "" diff --git 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 index 5d614acf..226969c0 100644 --- 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.

If you set an empty " + .. "secure password you don't use anywhere else.

If you set an empty " .. "password, login via password will be disabled. This is the default." ), 'password' ) diff --git 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 index 5bb5f069..e0ef55dd 100644 --- 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 @@ -1,34 +1,34 @@
- /> + > >
class="gluon-value-title"><%:Security mode%> -
+
<%| 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.' ) %> -
+
- /> + > >
class="gluon-value-title"><%:Performance mode%> -
+
<%| 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.' ) %> -
+
diff --git 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 index b0cd9d0a..bbc65734 100644 --- 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) - %> />
+ %>>
<% end %> diff --git 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 index d222dde2..6b35fe89 100644 --- 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 @@ -1,5 +1,5 @@
- +
<% if self.title and #self.title > 0 then %>

<%|self.title%>

<% end %> @@ -16,12 +16,12 @@ <%- if self.submit ~= false then %> + "> <% end %> <%- if self.reset ~= false then %> + "> <% end %>
diff --git 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 index 5662df99..a244bb02 100644 --- 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 @@ -1,5 +1,5 @@ /> +%>> > diff --git 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 index e63d33ee..b0110904 100644 --- 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 @@ -1,5 +1,5 @@ <% - local br = self.orientation == "horizontal" and '   ' or '
' + local br = self.orientation == "horizontal" and '   ' or '
' local entries = self:entries() %> @@ -35,7 +35,7 @@ attr("name", id) .. attr("value", entry.key) .. attr("checked", (self:cfgvalue() == entry.key) and "checked") - %> /> + %>> > <%|entry.value%> diff --git a/package/gluon-web-model/files/lib/gluon/web/view/model/value.html b/package/gluon-web-model/files/lib/gluon/web/view/model/value.html index fc8b8de6..250c8ce0 100644 --- a/package/gluon-web-model/files/lib/gluon/web/view/model/value.html +++ b/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) -%> /> +%>> diff --git a/package/gluon-web-model/files/lib/gluon/web/view/model/valuewrapper.html b/package/gluon-web-model/files/lib/gluon/web/view/model/valuewrapper.html index 1a1a63d1..b4a331e5 100644 --- a/package/gluon-web-model/files/lib/gluon/web/view/model/valuewrapper.html +++ b/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 -%> -
+
<%=self.description%>
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 a2822cd4..2caa3f37 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 @@ diff --git a/package/gluon-web-wifi-config/i18n/de.po b/package/gluon-web-wifi-config/i18n/de.po index d2ddeb8b..f0883ad6 100644 --- a/package/gluon-web-wifi-config/i18n/de.po +++ b/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.

It is also possible to configure the WLAN " +"can mesh with yours.

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.

Außerdem kann hier die Sendeleistung des WLAN-Adapters konfiguriert " +"Netzes aktiviert, damit sich andere Knoten mit deinem verbinden können.
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." diff --git a/package/gluon-web-wifi-config/i18n/fr.po b/package/gluon-web-wifi-config/i18n/fr.po index faf6d47d..eb09694f 100644 --- a/package/gluon-web-wifi-config/i18n/fr.po +++ b/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.

It is also possible to configure the WLAN " +"can mesh with yours.

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.

Ici vous pouvez aussi configurer la puissance " +"connecter.

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." diff --git a/package/gluon-web-wifi-config/i18n/gluon-web-wifi-config.pot b/package/gluon-web-wifi-config/i18n/gluon-web-wifi-config.pot index 19536e30..2af9b5f3 100644 --- a/package/gluon-web-wifi-config/i18n/gluon-web-wifi-config.pot +++ b/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.

It is also possible to configure the WLAN " +"can mesh with yours.

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." diff --git a/package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua b/package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua index 13ac6434..49009eaf 100644 --- a/package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua +++ b/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.

" + .. "a good reason, so other nodes can mesh with yours.

" .. "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." 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 c77d4ace..eae38bff 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